江河版本更新

src/views/water/river-station/collect/colums.js

@@ -1,9 +1,11 @@
+import moment from "moment";
 const tableColumns = [
   // {title: "城区", dataIndex: "area", sorter: true,},
   // {title: "县", dataIndex: "county", sorter: true,},
   {title: "河流名称", dataIndex: "riverName", sorter: true,},
   {title: "站点名称", dataIndex: "stationName", sorter: true,},
   {title: "水质目标", dataIndex: "waterTarget", sorter: true,},
+  {title: "采样时间", dataIndex: "samplingTime", sorter: true,customRender: ({text})=> moment(text,"YYYY/MM/DD").format("YYYY-MM-DD")},
   {title: "水温", dataIndex: "waterTemperature", sorter: true,},
   {title: "pH值", dataIndex: "ph", sorter: true,},
   {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,},

src/views/water/river/statistic/avg-index.vue

@@ -20,7 +20,7 @@
             </a-select>
           </a-form-item>
           <a-form-item label="水系名称">
-            <a-select v-model:value="where.waterSystem" placeholder="请选择水系名称" allowClear showSearch>
+            <a-select v-model:value="where.importWaterBody" placeholder="请选择水系名称" allowClear showSearch>
               <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
               </a-select-option>
             </a-select>
@@ -137,7 +137,7 @@
           this.sectionInfo = res.data.data
           res.data.data.forEach((m) => {
             this.waterSystemList.push(m.waterBody);
-            this.waterBodyList.push(m.riverSystem);
+            this.waterBodyList.push(m.importWaterBody);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
           this.waterBodyList = [...new Set(this.waterBodyList)];

src/views/water/river/statistic/avg-standard.vue

@@ -20,7 +20,7 @@
             </a-select>
           </a-form-item>
           <a-form-item label="水系名称">
-            <a-select v-model:value="where.waterSystem" placeholder="请选择水系名称" allowClear showSearch>
+            <a-select v-model:value="where.importWaterBody" placeholder="请选择水系名称" allowClear showSearch>
               <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
               </a-select-option>
             </a-select>
@@ -140,7 +140,7 @@
           this.sectionInfo = res.data.data
           res.data.data.forEach((m) => {
             this.waterSystemList.push(m.waterBody);
-            this.waterBodyList.push(m.riverSystem);
+            this.waterBodyList.push(m.importWaterBody);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
           this.waterBodyList = [...new Set(this.waterBodyList)];

src/views/water/river/statistic/base-index.vue

@@ -20,7 +20,7 @@
             </a-select>
           </a-form-item>
           <a-form-item label="水系名称">
-            <a-select v-model:value="where.waterSystem" placeholder="请选择水系名称" allowClear showSearch>
+            <a-select v-model:value="where.importWaterBody" placeholder="请选择水系名称" allowClear showSearch>
               <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
               </a-select-option>
             </a-select>
@@ -142,7 +142,7 @@
           this.sectionInfo = res.data.data
           res.data.data.forEach((m) => {
             this.waterSystemList.push(m.waterBody);
-            this.waterBodyList.push(m.riverSystem);
+            this.waterBodyList.push(m.importWaterBody);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
           this.waterBodyList = [...new Set(this.waterBodyList)];

src/views/water/river/statistic/base-standard.vue

@@ -20,7 +20,7 @@
             </a-select>
           </a-form-item>
           <a-form-item label="水系名称">
-            <a-select v-model:value="where.waterSystem" placeholder="请选择水系名称"  allowClear showSearch>
+            <a-select v-model:value="where.importWaterBody" placeholder="请选择水系名称"  allowClear showSearch>
               <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
               </a-select-option>
             </a-select>
@@ -145,7 +145,7 @@
           this.sectionInfo = res.data.data
           res.data.data.forEach((m) => {
             this.waterSystemList.push(m.waterBody);
-            this.waterBodyList.push(m.riverSystem);
+            this.waterBodyList.push(m.importWaterBody);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
           this.waterBodyList = [...new Set(this.waterBodyList)];

src/views/water/river/statistic/base.vue

@@ -35,7 +35,7 @@
           </a-select>
         </a-form-item>
         <a-form-item label="水系名称">
-          <a-select v-model:value="where.waterSystem" allowClear showSearch>
+          <a-select v-model:value="where.importWaterBody" allowClear showSearch>
             <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
             </a-select-option>
           </a-select>
@@ -159,7 +159,7 @@
             this.sectionInfo = res.data.data
             res.data.data.forEach((m) => {
             this.waterSystemList.push(m.waterBody);
-            this.waterBodyList.push(m.riverSystem);
+            this.waterBodyList.push(m.importWaterBody);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
           this.waterBodyList = [...new Set(this.waterBodyList)];

src/views/water/water-function-area/collect/colums.js

@@ -11,6 +11,7 @@ const tableColumns = [
   {title: "化学需氧量", dataIndex: "cod", sorter: true,},
   {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,},
   {title: "氨氮", dataIndex: "ammonia", sorter: true,},
+  {title: "采样时间", dataIndex: "samplingTime", sorter: true,},
   {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,},
   {title: "铜", dataIndex: "cu", sorter: true,},
   {title: "锌", dataIndex: "zn", sorter: true,},