From e8a192c47e034bcf9576bcfef025890fa693e51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Sun, 28 Sep 2025 17:41:13 +0800 Subject: [PATCH] =?UTF-8?q?task=2046154=20=E4=BA=A7=E4=B8=9A=E4=B8=80?= =?UTF-8?q?=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 9 ++ src/components/charts/bar-stack/index.js | 89 ++++------- src/components/charts/lines/index.js | 66 +++++++-- src/views/industry/comps/buttom/1/bg1.png | Bin 0 -> 25074 bytes src/views/industry/comps/buttom/1/bg2.png | Bin 1923 -> 5679 bytes src/views/industry/comps/buttom/1/index.html | 93 ++++++------ src/views/industry/comps/buttom/1/index.js | 41 ++++- src/views/industry/comps/buttom/1/index.scss | 140 ++++++++---------- .../industry/comps/left/top/1/index.html | 2 +- .../industry/comps/right/top/1/index.html | 2 +- src/views/industry/index.html | 2 +- src/views/industry/index.js | 91 +++++++----- src/views/industry/index.scss | 10 +- 13 files changed, 295 insertions(+), 250 deletions(-) create mode 100644 src/views/industry/comps/buttom/1/bg1.png diff --git a/src/api/index.js b/src/api/index.js index 1d992f7..4a96e6e 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -15,3 +15,12 @@ export function getThreeList (query) { params: query }) } + + +export function getIndustry (query) { + return request({ + url: '/api/asset/industry/dataScreen', + method: 'get', + params: query + }) +} diff --git a/src/components/charts/bar-stack/index.js b/src/components/charts/bar-stack/index.js index 9d062d5..40313b5 100644 --- a/src/components/charts/bar-stack/index.js +++ b/src/components/charts/bar-stack/index.js @@ -12,11 +12,13 @@ export default { return [ { name: '1月', - value: '10' + value: '10', + data: [] }, { name: '2月', - value: '19' + value: '19', + data: [] } ]; } @@ -29,10 +31,6 @@ export default { type: Number, default: null }, - rotate: { - type: Number, - default: 0 - }, serverName: { type: String, default: '面积' @@ -52,7 +50,8 @@ export default { }, data () { return { - chart: null + chart: null, + rotate: 0 }; }, watch: { @@ -108,15 +107,30 @@ export default { chartSetOption () { let xAxisData = []; let data = []; - let bgData = []; + this.data[0]?.data.forEach(child =>{ + data.push({ + name: child.dataNum1, + barWidth: 20, + type: 'bar', + stack: 'Ad', + emphasis: { + focus: 'series' + }, + data: [] + }) + }) this.data.forEach(item => { - xAxisData.push(item.name) - data.push(item.value) - bgData.push(100) + xAxisData.push(item.deptName); + item.data.forEach(child =>{ + data.forEach(son =>{ + if (child.dataNum1 == son.name ){ + son.data.push(child.dataNum2) + } + }) + }) }); - const option = { - color: ["#2195fe","#04e26f","#f7cc3a","#f77e3f"], + color: ["#2195fe","#04e26f","#f7cc3a","#e23ff7","#f77e3f"], tooltip: { trigger: "axis", axisPointer: { @@ -127,16 +141,15 @@ export default { } }, legend: { - data: ["村集体", "农民", "公司", "其它"], - top: '3%', - right: '5%', + top: '0%', + right: '2%', textStyle: { color: 'rgba(210, 238, 255, 1)', }, }, grid: { left: "5%", - right: "5%", + right: "2%", bottom: "5%", top: "15%", containLabel: true, @@ -159,7 +172,7 @@ export default { }, type: "category", gridIndex: 0, - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],//xAxisData + data: xAxisData,//xAxisData axisTick: { alignWithLabel: true, }, @@ -222,45 +235,7 @@ export default { } }, ], - series: [ - { - name: '村集体', - barWidth: 20, - type: 'bar', - stack: 'Ad', - emphasis: { - focus: 'series' - }, - data: [320, 332, 301, 334, 390, 330, 320] - }, - { - name: '农民', - type: 'bar', - stack: 'Ad', - emphasis: { - focus: 'series' - }, - data: [120, 132, 101, 134, 90, 230, 210] - }, - { - name: '公司', - type: 'bar', - stack: 'Ad', - emphasis: { - focus: 'series' - }, - data: [220, 182, 191, 234, 290, 330, 310] - }, - { - name: '其它', - type: 'bar', - stack: 'Ad', - emphasis: { - focus: 'series' - }, - data: [150, 232, 201, 154, 190, 330, 410] - }, - ] + series: data }; this.chart.setOption(option); this.initResizeCallBack(); diff --git a/src/components/charts/lines/index.js b/src/components/charts/lines/index.js index 525c506..70ed686 100644 --- a/src/components/charts/lines/index.js +++ b/src/components/charts/lines/index.js @@ -12,11 +12,13 @@ export default { return [ { name: '1月', - value: '10' + value1: '10', + value2: '20', }, { name: '2月', - value: '19' + value1: '19', + value2: '20', } ]; } @@ -36,11 +38,27 @@ export default { }, data () { return { - chart: null + chart: null, + rotate: 0 }; }, + watch: { + data: { + handler: function (val) { + this.$nextTick(function () { + setTimeout(() => { + this.initChart(); + }, 2000) + }); + }, + immediate: true, + deep: true + } + }, mounted () { - this.initChart(); + // setTimeout(()=>{ + // this.initChart(); + // },2000) }, computed: { }, @@ -50,7 +68,20 @@ export default { const erd = elementResizeDetectorMaker(); erd.listenTo(document.getElementById(this.id), () => { this.$nextTick(() => { + if (document.getElementById(this.id).offsetWidth > 500){ + this.rotate = 60; + }else{ + this.rotate = 0; + } this.chart.resize(); + this.chart.setOption({ + // 新的配置项，例如： + xAxis: { + axisLabel: { + rotate: this.rotate + }, + } + }); }); }); }, @@ -60,16 +91,19 @@ export default { }, chartSetOption () { - // let xAxisData = []; - // let data = []; - // this.data.forEach(item => { - // xAxisData.push(item.name) - // data.push(item.value) - // }); + let xAxisData = []; + let data1 = []; + let data2 = []; + let legend = this.data[0]?.legend; + this.data.forEach(item => { + xAxisData.push(item.name) + data1.push(item.value1) + data2.push(item.value2) + }); const option = { grid: { left: "5%", - right: "10%", + right: "2%", top: "15%", bottom: "10%", containLabel: true, @@ -109,7 +143,7 @@ export default { splitLine: { show: false }, - data: ['鸭池镇','梨树镇','岔河镇','田坝镇','长春镇堡','八寨镇','林口镇'] //xAxisData + data: xAxisData }, ], yAxis: [ @@ -143,7 +177,7 @@ export default { ], series: [ { - name: 'Email', + name: legend[0], type: 'line', stack: 'Total', smooth: true, @@ -168,10 +202,10 @@ export default { }, }, }, - data: [120, 132, 101, 134, 90, 230, 210] + data: data1 }, { - name: 'Union Ads', + name: legend[1], type: 'line', stack: 'Total', smooth: true, @@ -196,7 +230,7 @@ export default { }, }, }, - data: [220, 182, 191, 234, 290, 330, 310] + data: data2 }, // { // name: "", diff --git a/src/views/industry/comps/buttom/1/bg1.png b/src/views/industry/comps/buttom/1/bg1.png new file mode 100644 index 0000000000000000000000000000000000000000..fb61b3637563fce067fed6c8dafb499472aaf443 GIT binary patch literal 25074 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 b#vB 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 V+jwHu)yMz<002ovPDHLkV1h`;Gz9 zYjW#0425wZWk>zhC3Jb+O4rd9v>WNQ#M1#lN=oL&*G^=cvhmF%qDb%sQY0<$fwzDD zQ;I+e6(TAuDio#NlLJW=a*$I0?7oyiC?i=06mfgHT^XftT<$3A0vJgX?`q?qovi-T*Iz;@i4UJ zZIDuRP-Fm$l45SA6PP(h8G_>XrVmIFlXE*MDpjR0?TG=Y zfN_UvO*E%4(7mw!TX7qyA_%W7WGgQ#tSGQ>rWd5Jg;PUc!i-%mH{?#^Y68)RhxIocTcnk7mb7-*!)&Wc%+fAO{HA5xMo$j1{DEYHI2+~qHV^S z=}o$7^q#ILE-;eCB{JEHFHy2SBIa!s1vVxu5wn&TTYnxj19Z zIo>63(P$`T_$icFu$pR@l(*k@%vUM~e# zq~`+0`gchF`19{SG@2RisFUO?WC6T`T6-j1;VDUOiVfjaVw{u@><;A9y$?3#)#dkN z@@*dRbU$m!Y5b~V*35(Qj9r~Im0Dkl+&q6-^OMUVM=Wm{Z%YnhlS{Fe&MLBfZ=EC^ z0Q&199KB}dFyZO27PEamIxb&*tg=G)OH|AkEuoJUIxA`?#0&QPWztABbOKt7nIt{o za}C8OPh~Hb^n=Y=<;U5S$(P6{dp~Rrr~-9D<^eO%Q=0SP-VdAXrZEqlhkTQnmEk$D z&*Vy*U4;Dhlk|hPn6YRi>t)gxN+O5uNmp1isq2ErBV<* zbdv1IcWac!JmKugKO;4BAKq&%Wf9AA+r(QK!A(K8q{%<5>qD zIiL!BT{)}aRd}YHUYeJ~H+%p`Iuz>AiOE5+$)JSKgdaMNoU}gFW8eO$AA0) z$DF>NJTZPE#Xe)8Y;LueSDj2bZ^Tmt;vFqF@apan{-C&%5#vJ^o8xg zF6|(wB*RIx-p*cIak8TI17o7Fd^*NF$D<1}2Oy8- zwqIm;+%aahaF6Ad`j1H*%qee4U)bAA&03lChIQh4w4OZ2md{T;fa+MA7iA0o{JKru%T0%7Qo+I!P|( zE)V#!N-{}00`;7qteHs{terRg$iD2%lP+j2Bx#G$`0FhXvgRiDg~Z#xKOn^?46Cqc zJuqNku}?xANDj8lmnK6FQmS2X^C&DPYxg5r!o6^`dnsiUm-DN+`xP?>G4ovBSi>+g z!tYy?w=2v%b7U!R5th3TX3r%KlM}zP#^>qT#!s=Ur!UgxX&C(LSBX4?UF27aZO~}( zNYjaJ*r=`x`gTuotagbWr*7tm_LMWOwxY_9__Ei=xI0eat|oI@{kh%A z!t{H=4+|Fpw+r`o;d(eCm{oDItAz((HnTvch)-sS<<0FZJi8VV537inwow2n)y*s0 zyAMCE-+Cl(*en}pE{oQhc!FOPp*1Dn%ShXrr-0h6{>;NI9bzG z&zRfJyxt6(sshjgs4*{^ZYf*};=`^|Em -
-
- -

集体资源资产统计

-
-

数量

-

{{data.jtzyzc.num}}个

-
-
-

用地面积

-

{{data.jtzyzc.ydmj}}亩

-
-
-

建筑面积

-

{{data.jtzyzc.jzmj}}㎡

-
+ + + + + + + + +
+
+ +
+
{{data.dataNum1}}
+
产业总数（个）
+
-
- -

农业设施设备统计

-
-

数量

-

{{data.nysssb.num}}个

-
-
-

用地面积

-

{{data.nysssb.ydmj}}亩

-
-
-

建筑面积

-

{{data.nysssb.jzmj}}㎡

-
+
+
+ +
+
{{data.dataNum2}}
+
产业占地面积（亩）
+
-
- -

农户资产统计

-
-

数量

-

{{data.nhzc.num}}个

-
-
-

用地面积

-

{{data.nhzc.ydmj}}亩

-
-
-

建筑面积

-

{{data.nhzc.jzmj}}㎡

-
+
+
+ +
+
{{data.dataNum3}}
+
产业投资额（万）
+
- + 		+
+ +
+
{{data.dataNum4}}
+
产业估值（万）
+
+
+ 		+
+ +
+
{{data.dataNum5}}
+
年利润（万）
+
+
+
diff --git a/src/views/industry/comps/buttom/1/index.js b/src/views/industry/comps/buttom/1/index.js index 9a98dec..dcf6abd 100644 --- a/src/views/industry/comps/buttom/1/index.js +++ b/src/views/industry/comps/buttom/1/index.js @@ -1,8 +1,5 @@ -import BlockValue from '@/components/value/index.vue'; +import { mapGetters } from 'vuex' export default { - components: { - BlockValue - }, props: { data: { type: Object, @@ -11,6 +8,26 @@ export default { } } }, + components: { + }, + computed: { + ...mapGetters(['year', 'deptId']) + }, + + watch: { + // year: { + // handler () { + // this.getData(); + // }, + // immediate: true, // 立即执行 + // }, + // deptId: { + // handler () { + // this.getData(); + // }, + // immediate: true, // 立即执行 + // } + }, data () { return { }; @@ -20,5 +37,21 @@ export default { mounted () { }, methods: { + getData () { + if (this.year, this.deptId) { + this.isLoad = false; + // Resources(this.deptId, this.year).then(res => { + // this.data[0][0].value = res.data.nyd + // this.data[0][1].value = res.data.jsyd + // this.data[0][2].value = res.data.wlydjlm + // this.data[0][3].value = res.data.numNyd + // this.data[0][4].value = res.data.numJsyd + // this.data[0][5].value = res.data.numWlydjlm + // + // this.data = data + // this.isLoad = true; + // }) + } + }, } }; diff --git a/src/views/industry/comps/buttom/1/index.scss b/src/views/industry/comps/buttom/1/index.scss index 621f0ff..0944bda 100644 --- a/src/views/industry/comps/buttom/1/index.scss +++ b/src/views/industry/comps/buttom/1/index.scss @@ -1,94 +1,70 @@ .buttom2 { - width: 100%; - display: flex; - justify-content: space-between; - position: absolute; - bottom: 30px; - left: 460px; - z-index: 2; - flex: 1; - .flex_main{ - background: url("bg.png") no-repeat 10px center; - background-size: calc(100% - 10px) 100%; - width: 220px; - height: 150px; - padding: 15px 15px 15px 25px; - display: flex; - flex-direction: column; - justify-content: space-between; - margin-bottom: 15px; - position: relative; - .flex_block{ - display: flex; - align-items: center; - justify-content: space-between; - p:nth-child(1){ - color: #e6f1ff; - } - } - .tt{ - text-shadow: 2px 2px 4px #000000; - font-size: 18px; - font-weight: bold; - } - i{ - display: block; - height: 100%; - width: 5px; - position: absolute; - top: 0; - left: 0; - } - &:nth-child(1){ - i{ - background-color: #00d6f8; - } - .flex_block{ - p:nth-child(2){ - color: #00d6f8; - } - } - } - &:nth-child(2){ - i{ - background-color: #f7cc3a; - } - .flex_block{ - p:nth-child(2){ - color: #f7cc3a; - } - } - } - &:nth-child(3){ - i{ - background-color: #04e26f; - } - .flex_block{ - p:nth-child(2){ - color: #04e26f; - } + width: 960px; + + table { + width: 100%; + + tr { + width: 100%; + + td { + + width: 16.6%; } } } - - .flex_main_right{ - background: url("bg2.png") no-repeat center; - background-size: 100% 100%; - width: 220px; - height: 100px; - margin-bottom: 15px; +} +.block_value { + background: url('./bg1.png'); + background-size: 100% 100%; + width: 130px; + height: 130px; + position: relative; + img{ + height: 90px; + width: 100%; + position: absolute; + z-index: -1; + animation: 2s timeAmXsf1 0.1s infinite; + } + .value_pos { display: flex; flex-direction: column; align-items: center; - justify-content: space-evenly; - p:nth-child(1){ - color: #01d5f8; - font-size: 26px; + height: 70px; + .value { + font-family: Arial; font-weight: bold; - span{ - font-size: 14px; - } + font-size: 24px; + color: #FFFFFF; + line-height: 30px; + text-shadow: 0px 3px 2px #05357D; + } + + .name { + font-weight: 500; + font-size: 14px; + color: #B9D3EB; + text-shadow: 0px 3px 3px rgba(30, 63, 112, 0.6); + background: linear-gradient(180deg, #FEFFFF 17.4072265625%, #e0e9f9 99.6337890625%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; } } } + + +@keyframes timeAmXsf1 { + 0% { + opacity: 0; + } + + 50% { + opacity: 1; + } + + 100% { + opacity: 0; + } +} diff --git a/src/views/industry/comps/left/top/1/index.html b/src/views/industry/comps/left/top/1/index.html index 6e7ef25..c381870 100644 --- a/src/views/industry/comps/left/top/1/index.html +++ b/src/views/industry/comps/left/top/1/index.html @@ -5,7 +5,7 @@ :color="['#f7cc3a', '#f7803f']" :barBorderRadius="[15, 15, 15, 15]" :data="data" - unit="单位：亩" + unit="单位：个" >
diff --git a/src/views/industry/comps/right/top/1/index.html b/src/views/industry/comps/right/top/1/index.html index d72b72f..443d059 100644 --- a/src/views/industry/comps/right/top/1/index.html +++ b/src/views/industry/comps/right/top/1/index.html @@ -4,7 +4,7 @@ diff --git a/src/views/industry/index.html b/src/views/industry/index.html index f0e97c4..3524d0b 100644 --- a/src/views/industry/index.html +++ b/src/views/industry/index.html @@ -2,7 +2,7 @@
-
+
diff --git a/src/views/industry/index.js b/src/views/industry/index.js index 3f91917..a877716 100644 --- a/src/views/industry/index.js +++ b/src/views/industry/index.js @@ -18,7 +18,7 @@ import MainGis from './main-gis/index.vue'; import { comps } from './data.js' -import { getStatistic } from "@/api/index"; +import { getIndustry } from "@/api/index"; import { getInfo } from "@/api/login"; import {mapGetters} from "vuex"; @@ -86,56 +86,75 @@ export default { this.currentComp.left[0].data = []; this.currentComp.left[1].data = []; this.currentComp.left[2].data = []; - getStatistic({deptId: deptId}).then((response) => { - response.data.jtzyzcDeptList.map(rr => { - this.currentComp.right[0].data.push({ + getIndustry({deptId: deptId}).then((response) => { + + // let XArr = response.data.industryRightsDistributionData.map(item => item.deptName).filter((name, index, self) => self.indexOf(name) === index && name !== null); + let json = JSON.parse(response.data.industryRightsDistributionData); + this.currentComp.left[0].data = json; + + let json2 = JSON.parse(response.data.industryTypeDistributionData); + this.currentComp.right[0].data = json2; + // console.log(this.currentComp.left[0].data) + + response.data.industryScaleData.map(rr => { + this.currentComp.left[1].data.push({ name: rr.deptName, - value: rr.ydmj + legend: ['投资金额','产业估值'], + value1:rr.dataNum1, + value2:rr.dataNum2, }) }) - response.data.nysssbDeptList.map(rr => { + + response.data.industryOperateData.map(rr => { this.currentComp.right[1].data.push({ name: rr.deptName, - value: rr.ydmj - }) - }) - response.data.nhzcDeptList.map(rr => { - this.currentComp.right[2].data.push({ - name: rr.deptName, - value: rr.ydmj + legend: ['年销售额','年利润'], + value1:rr.dataNum1, + value2:rr.dataNum2, }) }) - response.data.jtzyzcTypeList.map(rr => { - this.currentComp.left[0].data.push({ - name: rr.threeDetailType, - value: rr.ydmj - }) - }) - response.data.nysssbTypeList.map(rr => { - this.currentComp.left[1].data.push({ - name: rr.threeDetailType, - value: rr.ydmj + response.data.industryTypeData.map(rr => { + this.currentComp.left[2].data.push({ + name: rr.dataNum1, + value: rr.dataNum2, + unit: '万元' }) }) - response.data.nhzcTypeList.map(rr => { - this.currentComp.left[2].data.push({ - name: rr.threeDetailType, - value: rr.ydmj, + + response.data.industryRightsData.map(rr => { + this.currentComp.right[2].data.push({ + name: rr.dataNum1, + value: rr.dataNum2, unit: '万元' }) }) - this.currentComp.buttom[0].data = { - jtzyzc: response.data.jtzyzc,//集体资源资产 - nysssb: response.data.nysssb,//农业设施设备 - nhzc: response.data.nhzc, - } + // response.data.jtzyzcDeptList.map(rr => { + // this.currentComp.right[0].data.push({ + // name: rr.deptName, + // value: rr.ydmj + // }) + // }) + // response.data.nysssbDeptList.map(rr => { + // this.currentComp.right[1].data.push({ + // name: rr.deptName, + // value: rr.ydmj + // }) + // }) + // response.data.nhzcDeptList.map(rr => { + // this.currentComp.right[2].data.push({ + // name: rr.deptName, + // value: rr.ydmj + // }) + // }) - this.currentComp.buttom[1].data = { - xy23: response.data.xy23, - xy24: response.data.xy24 - } + this.currentComp.buttom[0].data = response.data.bottomStatistics[0] + // + // this.currentComp.buttom[1].data = { + // xy23: response.data.xy23, + // xy24: response.data.xy24 + // } console.log(this.currentComp) this.allData = response.data; diff --git a/src/views/industry/index.scss b/src/views/industry/index.scss index 12bb638..8bb69cf 100644 --- a/src/views/industry/index.scss +++ b/src/views/industry/index.scss @@ -5,8 +5,8 @@ right: 0; bottom: 0; } -.buttom_side { - top: 100px; - bottom: auto; - left: 685px; -} +//.buttom_side { +// top: 100px; +// bottom: auto; +// left: 685px; +//}