From 7ba88f92492bc817e64c4df17a40a80a44d7a851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Tue, 25 Jan 2022 09:08:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/river/trend/index.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/water/river/trend/index.vue b/src/views/water/river/trend/index.vue
index 398f830..bc4a693 100644
--- a/src/views/water/river/trend/index.vue
+++ b/src/views/water/river/trend/index.vue
@@ -65,7 +65,7 @@
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="监测指标:">
             <a-select
-              mode="multiple"
+              :mode="selectModel"
               v-model:value="queryParams.monitorIndexList"
               :options="indicatorOptions"
               placeholder="请选择监测指标"
@@ -143,6 +143,7 @@ export default {
       yearOptions: [],
       indicatorOptions: [ 
       ],
+      selectModel:'multiple',
       allIndexOptions:[ 
         { label: "全选", value: "全选", limit:"0",color:"#209f53" },
         { label: "五日生化需氧量", value: "五日生化需氧量", limit:"3",color:"#209f53" },
@@ -171,6 +172,13 @@ export default {
         { label: "全因子", value: "全因子", limit:"0.025",color:"#209f53" },
         { label: "纳污红线", value: "纳污红线", limit:"0.5",color:"#209f53" },
       ],
+      waterIndexOption:[
+        { label: "ph", value: "ph", limit:"9",color:"#209f53" },
+        { label: "溶解氧", value: "溶解氧", limit:"6",color:"#bbb443" },
+        { label: "高锰酸盐指数", value: "高锰酸盐指数", limit:"4",color:"#209f53" },
+        { label: "氨氮", value: "氨氮", limit:"0.5",color:"#ad3abe" },
+        { label: "总磷", value: "总磷", limit:"0.025",color:"#20749f" },
+      ],
 
       innerSection: [], // 内湖断面
       specialSection: [], // 专湖断面
@@ -260,8 +268,10 @@ export default {
 
       if(e=='全因子' || e=='纳污红线'){
         this.yDisable = true
+        this.selectModel = 'default'
         this.queryParams.yco = 'Yco_3'
       }else{
+        this.selectModel = 'multiple'
         this.yDisable = false
       }
 
@@ -296,6 +306,9 @@ export default {
   
     handleRiverChange(type){
         this.queryParams.placeList = [];
+        this.queryParams.monitorIndexList = [];
+        this.yDisable = false
+        
         if(type){
             this.sectionOptions = []
             this.indicatorOptions = []
@@ -340,7 +353,7 @@ export default {
                 })
             }
         }
-        console.log('this.sectionOptions',this.sectionOptions)
+        // console.log('this.sectionOptions',this.sectionOptions)
     },
     // 趋势图
     drawTrend() {

From 8257e74ec55a4fa6a38c665704fa5a05a91571c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Tue, 25 Jan 2022 10:39:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/river-trend.js        | 4 ++--
 src/views/water/river/trend/index.vue | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/api/ecology/river-trend.js b/src/api/ecology/river-trend.js
index 9072e5b..bf27367 100644
--- a/src/api/ecology/river-trend.js
+++ b/src/api/ecology/river-trend.js
@@ -22,6 +22,6 @@ export const getRiverStationPoint = function () {
 }
 
 // 统计图表
-export const riverWaterTrend = function () {
-    return axios.get('/api/waterFunctionArea/trendChart/data')
+export const riverWaterTrend = function (data) {
+    return axios.post('/waterFunctionArea/trendChart/data',data)
 }
diff --git a/src/views/water/river/trend/index.vue b/src/views/water/river/trend/index.vue
index bc4a693..10811be 100644
--- a/src/views/water/river/trend/index.vue
+++ b/src/views/water/river/trend/index.vue
@@ -39,7 +39,7 @@
               v-model:value="queryParams.riverType"
               @change="handleRiverChange"
               allowClear
-              placeholder="请选择区域等级"
+              placeholder="请选择江河类别"
             >
               <a-select-option
                 v-for="item in regionLevelOptions"
@@ -173,6 +173,8 @@ export default {
         { label: "纳污红线", value: "纳污红线", limit:"0.5",color:"#209f53" },
       ],
       waterIndexOption:[
+        { label: "全选", value: "全选", limit:"0",color:"#209f53" },
+        { label: "水温", value: "水温", limit:"2",color:"#209f53" },
         { label: "ph", value: "ph", limit:"9",color:"#209f53" },
         { label: "溶解氧", value: "溶解氧", limit:"6",color:"#bbb443" },
         { label: "高锰酸盐指数", value: "高锰酸盐指数", limit:"4",color:"#209f53" },
@@ -308,7 +310,7 @@ export default {
         this.queryParams.placeList = [];
         this.queryParams.monitorIndexList = [];
         this.yDisable = false
-        
+
         if(type){
             this.sectionOptions = []
             this.indicatorOptions = []
@@ -343,7 +345,7 @@ export default {
                 })
             }
             if(type==this.regionLevelOptions[3].value){
-               this.indicatorOptions = [...this.allIndexOptions];
+               this.indicatorOptions = [...this.waterIndexOption];
                 getRiverStationPoint().then((res) => {
                     if (res.data.code == 0) {
                         this.sectionOptions = this.buildSectionSelect(res.data.data)

From 790ca7c739f48b3313703f36e3c047a6f74b5807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Tue, 25 Jan 2022 10:42:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B0=B4=E6=B8=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/river/trend/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/water/river/trend/index.vue b/src/views/water/river/trend/index.vue
index 10811be..d40c5a8 100644
--- a/src/views/water/river/trend/index.vue
+++ b/src/views/water/river/trend/index.vue
@@ -174,7 +174,7 @@ export default {
       ],
       waterIndexOption:[
         { label: "全选", value: "全选", limit:"0",color:"#209f53" },
-        { label: "水温", value: "水温", limit:"2",color:"#209f53" },
+        // { label: "水温", value: "水温", limit:"2",color:"#209f53" },
         { label: "ph", value: "ph", limit:"9",color:"#209f53" },
         { label: "溶解氧", value: "溶解氧", limit:"6",color:"#bbb443" },
         { label: "高锰酸盐指数", value: "高锰酸盐指数", limit:"4",color:"#209f53" },