From 143cc233e27ce8d1c72e067a731a7a67cb158144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Fri, 24 Dec 2021 09:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F=E9=9B=B7?= =?UTF-8?q?=E8=BE=BE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/information/left2.vue | 24 +++++++++++++++++-- src/views/bigScreen/scientific/tab3/left1.vue | 2 +- src/views/bigScreen/scientific/tab3/left2.vue | 8 +++++++ src/views/chartList/page2/three/right1.vue | 6 ++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/views/bigScreen/information/left2.vue b/src/views/bigScreen/information/left2.vue index b78f07a..5e196e4 100644 --- a/src/views/bigScreen/information/left2.vue +++ b/src/views/bigScreen/information/left2.vue @@ -60,6 +60,8 @@ export default { }) }, setOptions(resData) { + let newList = [] // 新的累计数组 + let newTotal = [] let titList = [] // 标题title let titData = [] // 雷达指标名称 let month = [] // 当月 @@ -67,11 +69,15 @@ export default { for (let i = 0; i < resData.length; i++) { const item = resData[i] titList.push(item.systemName + '系统') + newTotal.push([]) + newList.push([]) titData.push([]) month.push([]) monthTotal.push([]) for (let j = 0; j < item.month.length; j++) { const item2 = item.month[j] + // newList[i] = newList[i].concat(item2.indexName) + newList[i].push(item2.indexName) titData[i].push({ name: item2.indexName, axisLabel: { @@ -80,12 +86,26 @@ export default { }) month[i].push(item2.allount) } + // 对累计数组排序并去除无关指标 + for (let m = 0; m < newList[i].length; m++) { + const item4 = newList[i][m] + for (let k = 0; k < item.total.length; k++) { + const item3 = item.total[k] + if (item4 == item3.indexName) { + newTotal[i].push(item3) + } + } + } + item.total = newTotal[i] for (let j = 0; j < item.total.length; j++) { const item2 = item.total[j] if (titData[i][j]) { - Object.assign(titData[i][j], { max: item2.allount }) + // Object.assign(titData[i][j], { max: item2.allount }) } - monthTotal[i].push(item2.allount) + if (newList[i].indexOf(item2.indexName) !== -1) { + monthTotal[i].push(item2.allount) + } + // monthTotal[i].push(item2.allount) } } this.chart.setOption({ diff --git a/src/views/bigScreen/scientific/tab3/left1.vue b/src/views/bigScreen/scientific/tab3/left1.vue index 6fe1d22..472f26f 100644 --- a/src/views/bigScreen/scientific/tab3/left1.vue +++ b/src/views/bigScreen/scientific/tab3/left1.vue @@ -166,7 +166,7 @@ export default { }, }, grid: { - left: 20, + left: 0, right: 20, top: 30, bottom: 50, diff --git a/src/views/bigScreen/scientific/tab3/left2.vue b/src/views/bigScreen/scientific/tab3/left2.vue index c740a95..3e5878a 100644 --- a/src/views/bigScreen/scientific/tab3/left2.vue +++ b/src/views/bigScreen/scientific/tab3/left2.vue @@ -172,6 +172,14 @@ export default { return dataStr }, }, + dataZoom: { + type: 'slider', + // start: 0, + // end: 50, + textStyle: { + color: '#fff', + }, + }, series: { type: 'bar', barWidth: 20, diff --git a/src/views/chartList/page2/three/right1.vue b/src/views/chartList/page2/three/right1.vue index 0d5da87..6b2463f 100644 --- a/src/views/chartList/page2/three/right1.vue +++ b/src/views/chartList/page2/three/right1.vue @@ -1,7 +1,11 @@