diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 7187410..ca12460 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -31,6 +31,7 @@ ? "当日水量分析" : "" }} + {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{ @@ -397,6 +406,7 @@ AllData.regionGrade = item.grade; AllData.regionName = item.Name; AllData.waterRegionCode = item.id; + clearEchartsData(); // debugger; // 视角切换 if (item.sort == 0) { @@ -436,7 +446,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData3(); getData7(); @@ -469,7 +478,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData2(); getData3(); @@ -495,7 +503,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData4(); getData5(); @@ -513,7 +520,6 @@ sort: 4, }; - clearEchartsData(); getData2(); getData4(); getData5(); @@ -610,7 +616,7 @@ : "five"; //分区级别(one:一级 || two:二级 || three:三级 || four:四级) AllData.regionName = AllData.TitleName[res.data.length].Name; AllData.waterRegionCode = AllData.TitleName[res.data.length].id; - // clearEchartsData(); + clearEchartsData(); if (AllData.regionGrade == "two") { // 二级 console.log("二级"); @@ -719,20 +725,33 @@ if (AllData.regionGrade == "one") { // 一级Ecahrts 名称 AllData.chartData2.yAxis_Name = "摸排管网"; + AllData.TjData2 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData2Unit = "km"; } if (AllData.regionGrade == "two") { // 二级Ecahrts 名称 AllData.chartData2.yAxis_Name = "问题管网"; + AllData.TjData2 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData2Unit = "km"; } if (AllData.regionGrade == "three") { // 三级Ecahrts 名称 AllData.chartData2.yAxis_Name = "摸排管网"; + AllData.TjData1 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData1Unit = "km"; } // 数据赋值 AllData.chartData2.xAxis = res.data.regionNameList; AllData.chartData2.yAxis = res.data.pipelineProblemLengthList; AllData.chartData2.yAxis2 = res.data.pipelineLengthList; AllData.chartData2.yAxis2_Name = "总长度"; + AllData.chartData2.y1_Unit = "km"; AllData.refresh2++; } }); @@ -766,6 +785,10 @@ AllData.chartData1.yAxis3_line_Name = ""; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + AllData.TjData1 = res.data.pipelinePointCount + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData1Unit = "个"; } if (AllData.regionGrade == "four") { // AllData.chartData3.xAxis = res.data.regionNameList; @@ -789,6 +812,8 @@ AllData.chartData3.y2_Unit = "万方"; //Y轴单位 AllData.chartData3.y2_show = false; AllData.refresh3++; + AllData.TjData3 = null; + AllData.TjData3Unit = null; } } }); @@ -803,17 +828,21 @@ if (res && res.code == 200) { if (AllData.regionGrade == "one") { AllData.chartData3.xAxis = res.data.partitionName; - AllData.chartData3.yAxis1_bar = res.data.outletsNumber; - AllData.chartData3.yAxis1_bar_Name = "排口"; + AllData.chartData3.yAxis1_bar = res.data.inflowWater; + AllData.chartData3.yAxis1_bar_Name = "进水量"; AllData.chartData3.yAxis2_bar = null; AllData.chartData3.yAxis2_bar_Name = ""; - AllData.chartData3.yAxis3_line = res.data.inflowWater; - AllData.chartData3.yAxis3_line_Name = "进水量"; + AllData.chartData3.yAxis3_line = res.data.outletsNumber; + AllData.chartData3.yAxis3_line_Name = "排口"; AllData.chartData3.yAxis3_line_Index = 1; - AllData.chartData3.y1_Unit = "个"; //Y轴单位 - AllData.chartData3.y2_Unit = "万方"; //Y轴单位 + AllData.chartData3.y1_Unit = "万方"; //Y轴单位 + AllData.chartData3.y2_Unit = "个"; //Y轴单位 AllData.chartData3.y2_show = true; AllData.refresh3++; + AllData.TjData3 = res.data.outletsNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } if (AllData.regionGrade == "two") { AllData.chartData3.xAxis = res.data.partitionName; @@ -831,6 +860,11 @@ // debugger; AllData.refresh3++; // }, 1000); + + AllData.TjData3 = res.data.outletsNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } } }); @@ -856,15 +890,26 @@ AllData.chartData3.y2_Unit = "万方"; //Y轴单位 AllData.chartData3.y2_show = false; AllData.refresh3++; + + AllData.TjData3 = res.data.pointNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } if (AllData.regionGrade == "four") { // AllData.chartData2.xAxis = res.data.partitionName; AllData.chartData2.yAxis = null; AllData.chartData2.yAxis2 = res.data.pointNumber; - AllData.chartData2.yAxis2_Name = "总长度"; + AllData.chartData2.yAxis2_Name = "数量"; AllData.chartData2.yAxis_Name = null; + AllData.chartData2.y1_Unit = "个"; AllData.refresh2++; + + AllData.TjData2 = res.data.pointNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData2Unit = "个"; } } }); @@ -888,19 +933,21 @@ AllData.chartData1.y1_Unit = "m"; //Y轴单位 AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位 AllData.chartData1.y2_show = true; //是否展示右侧的2号轴 - AllData.chartData1.yAxis1_bar = data1; //数据1 - AllData.chartData1.yAxis1_bar_Name = "当前水位"; //数据1的名称 - AllData.chartData1.yAxis1_bar_index = 0; + AllData.chartData1.yAxis1_bar = data3; //数据1 + AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称 + AllData.chartData1.yAxis1_bar_index = 1; AllData.chartData1.yAxis2_bar = null; //数据2 AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称 AllData.chartData1.yAxis2_bar_index = 0; AllData.chartData1.yAxis2_line = data2; - AllData.chartData1.yAxis2_line_Name = "设防水位"; + AllData.chartData1.yAxis2_line_Name = "控制水位"; AllData.chartData1.yAxis2_line_Index = 0; - AllData.chartData1.yAxis3_line = data3; - AllData.chartData1.yAxis3_line_Name = "库容量"; - AllData.chartData1.yAxis3_line_Index = 1; + AllData.chartData1.yAxis3_line = data1; + AllData.chartData1.yAxis3_line_Name = "当前水位"; + AllData.chartData1.yAxis3_line_Index = 0; AllData.refresh1++; + AllData.TjData1 = null; + AllData.TjData1Unit = null; } } }); @@ -939,6 +986,11 @@ AllData.chartData1.yAxis3_line_Name = "出水"; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + + AllData.TjData2 = YData1.reduce( + (accu, curren) => Number(accu) + Number(curren) + ).toFixed(0); + AllData.TjData2Unit = "个"; } if (AllData.regionGrade == "four") { AllData.chartData1.xAxis = XData; //X轴数据 @@ -958,6 +1010,10 @@ AllData.chartData1.yAxis3_line_Name = "出水"; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + AllData.TjData1 = YData1.reduce( + (accu, curren) => Number(accu) + Number(curren) + ).toFixed(0); + AllData.TjData1Unit = "个"; } } }); @@ -1049,6 +1105,7 @@ yAxis2: [], yAxis_Name: "", yAxis2_Name: "", + y1_Unit: "km", }; AllData.refresh2++; }; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 7187410..ca12460 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -31,6 +31,7 @@ ? "当日水量分析" : "" }} + {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{ @@ -397,6 +406,7 @@ AllData.regionGrade = item.grade; AllData.regionName = item.Name; AllData.waterRegionCode = item.id; + clearEchartsData(); // debugger; // 视角切换 if (item.sort == 0) { @@ -436,7 +446,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData3(); getData7(); @@ -469,7 +478,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData2(); getData3(); @@ -495,7 +503,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData4(); getData5(); @@ -513,7 +520,6 @@ sort: 4, }; - clearEchartsData(); getData2(); getData4(); getData5(); @@ -610,7 +616,7 @@ : "five"; //分区级别(one:一级 || two:二级 || three:三级 || four:四级) AllData.regionName = AllData.TitleName[res.data.length].Name; AllData.waterRegionCode = AllData.TitleName[res.data.length].id; - // clearEchartsData(); + clearEchartsData(); if (AllData.regionGrade == "two") { // 二级 console.log("二级"); @@ -719,20 +725,33 @@ if (AllData.regionGrade == "one") { // 一级Ecahrts 名称 AllData.chartData2.yAxis_Name = "摸排管网"; + AllData.TjData2 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData2Unit = "km"; } if (AllData.regionGrade == "two") { // 二级Ecahrts 名称 AllData.chartData2.yAxis_Name = "问题管网"; + AllData.TjData2 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData2Unit = "km"; } if (AllData.regionGrade == "three") { // 三级Ecahrts 名称 AllData.chartData2.yAxis_Name = "摸排管网"; + AllData.TjData1 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData1Unit = "km"; } // 数据赋值 AllData.chartData2.xAxis = res.data.regionNameList; AllData.chartData2.yAxis = res.data.pipelineProblemLengthList; AllData.chartData2.yAxis2 = res.data.pipelineLengthList; AllData.chartData2.yAxis2_Name = "总长度"; + AllData.chartData2.y1_Unit = "km"; AllData.refresh2++; } }); @@ -766,6 +785,10 @@ AllData.chartData1.yAxis3_line_Name = ""; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + AllData.TjData1 = res.data.pipelinePointCount + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData1Unit = "个"; } if (AllData.regionGrade == "four") { // AllData.chartData3.xAxis = res.data.regionNameList; @@ -789,6 +812,8 @@ AllData.chartData3.y2_Unit = "万方"; //Y轴单位 AllData.chartData3.y2_show = false; AllData.refresh3++; + AllData.TjData3 = null; + AllData.TjData3Unit = null; } } }); @@ -803,17 +828,21 @@ if (res && res.code == 200) { if (AllData.regionGrade == "one") { AllData.chartData3.xAxis = res.data.partitionName; - AllData.chartData3.yAxis1_bar = res.data.outletsNumber; - AllData.chartData3.yAxis1_bar_Name = "排口"; + AllData.chartData3.yAxis1_bar = res.data.inflowWater; + AllData.chartData3.yAxis1_bar_Name = "进水量"; AllData.chartData3.yAxis2_bar = null; AllData.chartData3.yAxis2_bar_Name = ""; - AllData.chartData3.yAxis3_line = res.data.inflowWater; - AllData.chartData3.yAxis3_line_Name = "进水量"; + AllData.chartData3.yAxis3_line = res.data.outletsNumber; + AllData.chartData3.yAxis3_line_Name = "排口"; AllData.chartData3.yAxis3_line_Index = 1; - AllData.chartData3.y1_Unit = "个"; //Y轴单位 - AllData.chartData3.y2_Unit = "万方"; //Y轴单位 + AllData.chartData3.y1_Unit = "万方"; //Y轴单位 + AllData.chartData3.y2_Unit = "个"; //Y轴单位 AllData.chartData3.y2_show = true; AllData.refresh3++; + AllData.TjData3 = res.data.outletsNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } if (AllData.regionGrade == "two") { AllData.chartData3.xAxis = res.data.partitionName; @@ -831,6 +860,11 @@ // debugger; AllData.refresh3++; // }, 1000); + + AllData.TjData3 = res.data.outletsNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } } }); @@ -856,15 +890,26 @@ AllData.chartData3.y2_Unit = "万方"; //Y轴单位 AllData.chartData3.y2_show = false; AllData.refresh3++; + + AllData.TjData3 = res.data.pointNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } if (AllData.regionGrade == "four") { // AllData.chartData2.xAxis = res.data.partitionName; AllData.chartData2.yAxis = null; AllData.chartData2.yAxis2 = res.data.pointNumber; - AllData.chartData2.yAxis2_Name = "总长度"; + AllData.chartData2.yAxis2_Name = "数量"; AllData.chartData2.yAxis_Name = null; + AllData.chartData2.y1_Unit = "个"; AllData.refresh2++; + + AllData.TjData2 = res.data.pointNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData2Unit = "个"; } } }); @@ -888,19 +933,21 @@ AllData.chartData1.y1_Unit = "m"; //Y轴单位 AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位 AllData.chartData1.y2_show = true; //是否展示右侧的2号轴 - AllData.chartData1.yAxis1_bar = data1; //数据1 - AllData.chartData1.yAxis1_bar_Name = "当前水位"; //数据1的名称 - AllData.chartData1.yAxis1_bar_index = 0; + AllData.chartData1.yAxis1_bar = data3; //数据1 + AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称 + AllData.chartData1.yAxis1_bar_index = 1; AllData.chartData1.yAxis2_bar = null; //数据2 AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称 AllData.chartData1.yAxis2_bar_index = 0; AllData.chartData1.yAxis2_line = data2; - AllData.chartData1.yAxis2_line_Name = "设防水位"; + AllData.chartData1.yAxis2_line_Name = "控制水位"; AllData.chartData1.yAxis2_line_Index = 0; - AllData.chartData1.yAxis3_line = data3; - AllData.chartData1.yAxis3_line_Name = "库容量"; - AllData.chartData1.yAxis3_line_Index = 1; + AllData.chartData1.yAxis3_line = data1; + AllData.chartData1.yAxis3_line_Name = "当前水位"; + AllData.chartData1.yAxis3_line_Index = 0; AllData.refresh1++; + AllData.TjData1 = null; + AllData.TjData1Unit = null; } } }); @@ -939,6 +986,11 @@ AllData.chartData1.yAxis3_line_Name = "出水"; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + + AllData.TjData2 = YData1.reduce( + (accu, curren) => Number(accu) + Number(curren) + ).toFixed(0); + AllData.TjData2Unit = "个"; } if (AllData.regionGrade == "four") { AllData.chartData1.xAxis = XData; //X轴数据 @@ -958,6 +1010,10 @@ AllData.chartData1.yAxis3_line_Name = "出水"; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + AllData.TjData1 = YData1.reduce( + (accu, curren) => Number(accu) + Number(curren) + ).toFixed(0); + AllData.TjData1Unit = "个"; } } }); @@ -1049,6 +1105,7 @@ yAxis2: [], yAxis_Name: "", yAxis2_Name: "", + y1_Unit: "km", }; AllData.refresh2++; }; diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue index 2d990f7..e421b34 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue @@ -39,6 +39,13 @@ var option; option = { color: ["#3FFFC2", "#FFF21C"], + legend: { + // data: [props.data.yAxis_Name, props.data.yAxis2_Name, props.data.yAxis3_Name], + textStyle: { + color: "#FFFFFF", + fontSize: 12, + }, + }, tooltip: { trigger: "axis", backgroundColor: "#004284", @@ -221,7 +228,7 @@ }, }, { - name: "", + name: props.data.yAxis1_bar_Name, type: "bar", barWidth: barWidth, itemStyle: { @@ -264,7 +271,7 @@ }, }, { - name: "", + name: props.data.yAxis2_bar_Name, type: "bar", barWidth: barWidth, itemStyle: { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 7187410..ca12460 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -31,6 +31,7 @@ ? "当日水量分析" : "" }} + {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{ @@ -397,6 +406,7 @@ AllData.regionGrade = item.grade; AllData.regionName = item.Name; AllData.waterRegionCode = item.id; + clearEchartsData(); // debugger; // 视角切换 if (item.sort == 0) { @@ -436,7 +446,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData3(); getData7(); @@ -469,7 +478,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData2(); getData3(); @@ -495,7 +503,6 @@ }; // 切换时进行数据请求,默认视角请求 - clearEchartsData(); getData1(); getData4(); getData5(); @@ -513,7 +520,6 @@ sort: 4, }; - clearEchartsData(); getData2(); getData4(); getData5(); @@ -610,7 +616,7 @@ : "five"; //分区级别(one:一级 || two:二级 || three:三级 || four:四级) AllData.regionName = AllData.TitleName[res.data.length].Name; AllData.waterRegionCode = AllData.TitleName[res.data.length].id; - // clearEchartsData(); + clearEchartsData(); if (AllData.regionGrade == "two") { // 二级 console.log("二级"); @@ -719,20 +725,33 @@ if (AllData.regionGrade == "one") { // 一级Ecahrts 名称 AllData.chartData2.yAxis_Name = "摸排管网"; + AllData.TjData2 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData2Unit = "km"; } if (AllData.regionGrade == "two") { // 二级Ecahrts 名称 AllData.chartData2.yAxis_Name = "问题管网"; + AllData.TjData2 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData2Unit = "km"; } if (AllData.regionGrade == "three") { // 三级Ecahrts 名称 AllData.chartData2.yAxis_Name = "摸排管网"; + AllData.TjData1 = res.data.pipelineLengthList + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData1Unit = "km"; } // 数据赋值 AllData.chartData2.xAxis = res.data.regionNameList; AllData.chartData2.yAxis = res.data.pipelineProblemLengthList; AllData.chartData2.yAxis2 = res.data.pipelineLengthList; AllData.chartData2.yAxis2_Name = "总长度"; + AllData.chartData2.y1_Unit = "km"; AllData.refresh2++; } }); @@ -766,6 +785,10 @@ AllData.chartData1.yAxis3_line_Name = ""; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + AllData.TjData1 = res.data.pipelinePointCount + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(2); + AllData.TjData1Unit = "个"; } if (AllData.regionGrade == "four") { // AllData.chartData3.xAxis = res.data.regionNameList; @@ -789,6 +812,8 @@ AllData.chartData3.y2_Unit = "万方"; //Y轴单位 AllData.chartData3.y2_show = false; AllData.refresh3++; + AllData.TjData3 = null; + AllData.TjData3Unit = null; } } }); @@ -803,17 +828,21 @@ if (res && res.code == 200) { if (AllData.regionGrade == "one") { AllData.chartData3.xAxis = res.data.partitionName; - AllData.chartData3.yAxis1_bar = res.data.outletsNumber; - AllData.chartData3.yAxis1_bar_Name = "排口"; + AllData.chartData3.yAxis1_bar = res.data.inflowWater; + AllData.chartData3.yAxis1_bar_Name = "进水量"; AllData.chartData3.yAxis2_bar = null; AllData.chartData3.yAxis2_bar_Name = ""; - AllData.chartData3.yAxis3_line = res.data.inflowWater; - AllData.chartData3.yAxis3_line_Name = "进水量"; + AllData.chartData3.yAxis3_line = res.data.outletsNumber; + AllData.chartData3.yAxis3_line_Name = "排口"; AllData.chartData3.yAxis3_line_Index = 1; - AllData.chartData3.y1_Unit = "个"; //Y轴单位 - AllData.chartData3.y2_Unit = "万方"; //Y轴单位 + AllData.chartData3.y1_Unit = "万方"; //Y轴单位 + AllData.chartData3.y2_Unit = "个"; //Y轴单位 AllData.chartData3.y2_show = true; AllData.refresh3++; + AllData.TjData3 = res.data.outletsNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } if (AllData.regionGrade == "two") { AllData.chartData3.xAxis = res.data.partitionName; @@ -831,6 +860,11 @@ // debugger; AllData.refresh3++; // }, 1000); + + AllData.TjData3 = res.data.outletsNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } } }); @@ -856,15 +890,26 @@ AllData.chartData3.y2_Unit = "万方"; //Y轴单位 AllData.chartData3.y2_show = false; AllData.refresh3++; + + AllData.TjData3 = res.data.pointNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData3Unit = "个"; } if (AllData.regionGrade == "four") { // AllData.chartData2.xAxis = res.data.partitionName; AllData.chartData2.yAxis = null; AllData.chartData2.yAxis2 = res.data.pointNumber; - AllData.chartData2.yAxis2_Name = "总长度"; + AllData.chartData2.yAxis2_Name = "数量"; AllData.chartData2.yAxis_Name = null; + AllData.chartData2.y1_Unit = "个"; AllData.refresh2++; + + AllData.TjData2 = res.data.pointNumber + .reduce((accu, curren) => Number(accu) + Number(curren)) + .toFixed(0); + AllData.TjData2Unit = "个"; } } }); @@ -888,19 +933,21 @@ AllData.chartData1.y1_Unit = "m"; //Y轴单位 AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位 AllData.chartData1.y2_show = true; //是否展示右侧的2号轴 - AllData.chartData1.yAxis1_bar = data1; //数据1 - AllData.chartData1.yAxis1_bar_Name = "当前水位"; //数据1的名称 - AllData.chartData1.yAxis1_bar_index = 0; + AllData.chartData1.yAxis1_bar = data3; //数据1 + AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称 + AllData.chartData1.yAxis1_bar_index = 1; AllData.chartData1.yAxis2_bar = null; //数据2 AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称 AllData.chartData1.yAxis2_bar_index = 0; AllData.chartData1.yAxis2_line = data2; - AllData.chartData1.yAxis2_line_Name = "设防水位"; + AllData.chartData1.yAxis2_line_Name = "控制水位"; AllData.chartData1.yAxis2_line_Index = 0; - AllData.chartData1.yAxis3_line = data3; - AllData.chartData1.yAxis3_line_Name = "库容量"; - AllData.chartData1.yAxis3_line_Index = 1; + AllData.chartData1.yAxis3_line = data1; + AllData.chartData1.yAxis3_line_Name = "当前水位"; + AllData.chartData1.yAxis3_line_Index = 0; AllData.refresh1++; + AllData.TjData1 = null; + AllData.TjData1Unit = null; } } }); @@ -939,6 +986,11 @@ AllData.chartData1.yAxis3_line_Name = "出水"; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + + AllData.TjData2 = YData1.reduce( + (accu, curren) => Number(accu) + Number(curren) + ).toFixed(0); + AllData.TjData2Unit = "个"; } if (AllData.regionGrade == "four") { AllData.chartData1.xAxis = XData; //X轴数据 @@ -958,6 +1010,10 @@ AllData.chartData1.yAxis3_line_Name = "出水"; AllData.chartData1.yAxis3_line_Index = 1; AllData.refresh1++; + AllData.TjData1 = YData1.reduce( + (accu, curren) => Number(accu) + Number(curren) + ).toFixed(0); + AllData.TjData1Unit = "个"; } } }); @@ -1049,6 +1105,7 @@ yAxis2: [], yAxis_Name: "", yAxis2_Name: "", + y1_Unit: "km", }; AllData.refresh2++; }; diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue index 2d990f7..e421b34 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue @@ -39,6 +39,13 @@ var option; option = { color: ["#3FFFC2", "#FFF21C"], + legend: { + // data: [props.data.yAxis_Name, props.data.yAxis2_Name, props.data.yAxis3_Name], + textStyle: { + color: "#FFFFFF", + fontSize: 12, + }, + }, tooltip: { trigger: "axis", backgroundColor: "#004284", @@ -221,7 +228,7 @@ }, }, { - name: "", + name: props.data.yAxis1_bar_Name, type: "bar", barWidth: barWidth, itemStyle: { @@ -264,7 +271,7 @@ }, }, { - name: "", + name: props.data.yAxis2_bar_Name, type: "bar", barWidth: barWidth, itemStyle: { diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue index f35f44b..727f6a8 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue @@ -55,7 +55,7 @@ var relVal = "" + params[0].name; for (var i = 0, l = params.length; i < l; i++) { if (params[i].seriesName) { - let unit = "km"; + let unit = props.data.y1_Unit; relVal += "
" + params[i].marker +