Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin

src/views/sound/zone/collect/noise-bill.vue

@@ -240,7 +240,7 @@
       },
       detail(record) {
         this.$router.replace({
-          path: "/sound/air/collect/noise/" + record.zoneNoiseBillId
+          path: "/sound/zone/collect/noise/" + record.zoneNoiseBillId
         })
       },
       edit(record) {

src/views/water/drinking-water/statistic/city/waterQuality.vue

@@ -73,15 +73,16 @@ export default {
       columns:[
         {title:"城市名称",dataIndex:"city",},
         {title:"水源地名称",dataIndex:"sourceWaterName",},
-        {title:"期数",dataIndex:"sourceWaterName",},
+        {title:"检测时间",dataIndex:"monitorTime",},
+        // {title:"期数",dataIndex:"monitorTime",},
         {title:"水源地性质",dataIndex:"waterSourceProperty",},
         {title:"断面水质",align: 'center',children: [
               {title: "本月", dataIndex: "waterQualityCategory"},
               {title: "上月", dataIndex: "waterQualityCategoryMom"},
-              {title: "去年同期", dataIndex: "waterQualityCategoryYoy"},
+              {title: "去年同期", dataIndex: "waterQualityCategoryAvg"},
             ]
         },
-        {title:"主要污染指标",dataIndex:"",},
+        {title:"主要污染指标",dataIndex:"waterQualityEvaluate",},
       ],
         
       

src/views/water/drinking-water/statistic/countryside/waterQuality.vue

@@ -70,18 +70,19 @@ export default {
       // 表格数据接口
       datasource:[],
       selection: [],
-      columns:[
+    columns:[
         {title:"城市名称",dataIndex:"city",},
         {title:"水源地名称",dataIndex:"sourceWaterName",},
-        {title:"期数",dataIndex:"sourceWaterName",},
+        {title:"检测时间",dataIndex:"monitorTime",},
+        // {title:"期数",dataIndex:"monitorTime",},
         {title:"水源地性质",dataIndex:"waterSourceProperty",},
         {title:"断面水质",align: 'center',children: [
               {title: "本月", dataIndex: "waterQualityCategory"},
               {title: "上月", dataIndex: "waterQualityCategoryMom"},
-              {title: "去年同期", dataIndex: "waterQualityCategoryYoy"},
+              {title: "去年同期", dataIndex: "waterQualityCategoryAvg"},
             ]
         },
-        {title:"主要污染指标",dataIndex:"",},
+        {title:"主要污染指标",dataIndex:"waterQualityEvaluate",},
       ],
         
       

src/views/water/drinking-water/statistic/county/waterQuality.vue

@@ -70,18 +70,19 @@ export default {
       // 表格数据接口
       datasource:[],
       selection: [],
-      columns:[
+    columns:[
         {title:"城市名称",dataIndex:"city",},
         {title:"水源地名称",dataIndex:"sourceWaterName",},
-        {title:"期数",dataIndex:"sourceWaterName",},
+        {title:"检测时间",dataIndex:"monitorTime",},
+        // {title:"期数",dataIndex:"monitorTime",},
         {title:"水源地性质",dataIndex:"waterSourceProperty",},
         {title:"断面水质",align: 'center',children: [
               {title: "本月", dataIndex: "waterQualityCategory"},
               {title: "上月", dataIndex: "waterQualityCategoryMom"},
-              {title: "去年同期", dataIndex: "waterQualityCategoryYoy"},
+              {title: "去年同期", dataIndex: "waterQualityCategoryAvg"},
             ]
         },
-        {title:"主要污染指标",dataIndex:"",},
+        {title:"主要污染指标",dataIndex:"waterQualityEvaluate",},
       ],
         
       

src/views/water/lake/trend/index.vue

@@ -107,12 +107,8 @@
 <script>
 import * as echarts from "echarts";
 let trendChart;
-// import { getColumnOptions } from "@/api/ecology/noise/function-sound";
+import { getSpecialLakeDropdown,getLakeDropdown,lakeLibrary } from "@/api/ecology/new-lake";
 
-import { getSpecialLakeDropdown } from "@/api/ecology/new-lake";
-import { getLakeDropdown } from "@/api/ecology/new-lake";
-
-import { lakeLibrary } from "@/api/ecology/new-lake";
 export default {
   components: {},
   data() {
@@ -315,7 +311,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 +319,7 @@ export default {
           value: palceOptions[i],
         });
       }
-      this.palceOptions = [...newPlace];
+      return [...newPlace];
-      return res.data.data.map((item) => {
-        return {
-          label: item.sectionName,
-          value: item.sectionName,
-        };
-      });
     },
 
     initChart() {
@@ -405,6 +395,9 @@ export default {
           x: "center", //可设定图例在左、右、居中
           y: "bottom", //可设定图例在上、下、居中
           padding: [0, 50, 0, 0], //可设定图例[距上方距离，距右方距离，距下方距离，距左方距离]
+          // formatter: function (name) {
+          //     return name;
+          // }
         },
         xAxis: this.xAxis,
         yAxis: {
@@ -420,6 +413,7 @@ export default {
 
         series: this.series,
       };
+
       trendChart.setOption(option);
     },
 
@@ -571,13 +565,8 @@ export default {
               },
             ]];
         }
-
-
-
-       
       }
  
- 
   // 在纵坐标选择浓度，那显示指标均线
     if(this.queryParams.yco == "Yco_1"){
       let singleLine = []  
@@ -585,22 +574,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,
+                              name:name,
-                                yAxis: single.limit,
+                              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 +828,37 @@ export default {
         })
     }
 
-      series[0].markLine = {
+      if(this.queryParams.yco=='Yco_1'){
-          lineStyle: {
+        series = [...series,...this.buildLine()]
-            normal: {
+      }else{
-              type: "line",
+            series[0].markLine = {
-              width: 3,
+                lineStyle: {
-              opacity: 0.9,
+                  normal: {
-            },
+                    type: "line",
-          },
+                    width: 3,
-          label: {
+                    opacity: 0.9,
-            padding: [1, 10],
+                  },
-            lineHeight: 30,
+                },
-            show: true,
+                label: {
-            position: this.queryParams.yco=='Yco_1' ? "insideEndBottom" : "end",
+                  padding: [1, 10],
-            borderType: "dashed",
+                  lineHeight: 30,
-            borderWidth: 1,
+                  show: true,
-          },
+                  position: this.queryParams.yco=='Yco_1' ? "insideEndBottom" : "end",
-          data: [...this.buildLine()],
+                  borderType: "dashed",
-          symbol: ["none", "none"],
+                  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 {