From 72407cc3ef1f12e53c0d91a9f35cd942250a8997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Wed, 19 Jan 2022 08:48:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B9=96=E5=BA=93=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/lake/trend/index.vue | 105 ++++++++++++++++++--------- 1 file changed, 69 insertions(+), 36 deletions(-) diff --git a/src/views/water/lake/trend/index.vue b/src/views/water/lake/trend/index.vue index 07a076c..898befd 100644 --- a/src/views/water/lake/trend/index.vue +++ b/src/views/water/lake/trend/index.vue @@ -315,7 +315,7 @@ export default { let palceOptions = {}; let newPlace = []; res.data.data.forEach((item) => { - palceOptions[item.regionName] = item.regionName; + palceOptions[item.sectionName] = item.sectionName; }); for (let i in palceOptions) { newPlace.push({ @@ -323,13 +323,7 @@ export default { value: palceOptions[i], }); } - this.palceOptions = [...newPlace]; - return res.data.data.map((item) => { - return { - label: item.sectionName, - value: item.sectionName, - }; - }); + return [...newPlace]; }, initChart() { @@ -405,6 +399,9 @@ export default { x: "center", //可设定图例在左、右、居中 y: "bottom", //可设定图例在上、下、居中 padding: [0, 50, 0, 0], //可设定图例[距上方距离，距右方距离，距下方距离，距左方距离] + // formatter: function (name) { + // return name; + // } }, xAxis: this.xAxis, yAxis: { @@ -420,6 +417,7 @@ export default { series: this.series, }; + trendChart.setOption(option); }, @@ -585,22 +583,52 @@ export default { this.indicatorOptions.forEach(single=>{ if(single.value == item){ this.buildYMax(single.limit); - singleLine.push( + + + const name = single.label+'Ⅱ类标准' + singleLine.push( { - name: item, - yAxis: single.limit, + name:name, + type:'line', + symbol:'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5C17.6,3.5,6.8,14.4,6.8,27.6c0,13.3,10.8,24.1,24.101,24.1C44.2,51.7,55,40.9,55,27.6C54.9,14.4,44.1,3.5,30.9,3.5z M36.9,35.8c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H36c0.5,0,0.9,0.4,0.9,1V35.8z M27.8,35.8 c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H27c0.5,0,0.9,0.4,0.9,1L27.8,35.8L27.8,35.8z', + markLine:{ + data:[ + { + name:name, + yAxis: single.limit, + } + ], lineStyle: { type: "dashed", // dotted,solid,dashed - color: single.color, + // color: single.color, width: 2, opacity: 0.9, }, label: { - color: single.color, + // color: single.color, formatter: single.label+"Ⅱ类标准", + position:'insideEndBottom' }, - } - ) + } + } + ) + + // singleLine.push( + // { + // name: item, + // yAxis: single.limit, + // lineStyle: { + // type: "dashed", // dotted,solid,dashed + // color: single.color, + // width: 2, + // opacity: 0.9, + // }, + // label: { + // color: single.color, + // formatter: single.label+"Ⅱ类标准", + // }, + // } + // ) } }) }) @@ -809,32 +837,37 @@ export default { }) } - series[0].markLine = { - lineStyle: { - normal: { - type: "line", - width: 3, - opacity: 0.9, - }, - }, - label: { - padding: [1, 10], - lineHeight: 30, - show: true, - position: this.queryParams.yco=='Yco_1' ? "insideEndBottom" : "end", - borderType: "dashed", - borderWidth: 1, - }, - data: [...this.buildLine()], - symbol: ["none", "none"], - }; + if(this.queryParams.yco=='Yco_1'){ + series = [...series,...this.buildLine()] + }else{ + series[0].markLine = { + lineStyle: { + normal: { + type: "line", + width: 3, + opacity: 0.9, + }, + }, + label: { + padding: [1, 10], + lineHeight: 30, + show: true, + position: this.queryParams.yco=='Yco_1' ? "insideEndBottom" : "end", + borderType: "dashed", + borderWidth: 1, + }, + data: [...this.buildLine()], + symbol: ["none", "none"], + }; + } + // 对指标的名字转成中文 if(singleType){ series = series.map(item=>{ - let name = ''; + let name = item.name; this.indicatorOptions.forEach(single=>{ if(single.value == item.name){ - name = single.label + name = single.label } }) return { From 6504d7aaf9f215acfd4c18554b5d7b720e16ea6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Wed, 19 Jan 2022 09:09:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/lake/trend/index.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/views/water/lake/trend/index.vue b/src/views/water/lake/trend/index.vue index 898befd..02a87f4 100644 --- a/src/views/water/lake/trend/index.vue +++ b/src/views/water/lake/trend/index.vue @@ -107,12 +107,8 @@