江河模块修改

src/api/ecology/river-statis.js

@@ -41,6 +41,15 @@ const listAvgCompositeIndex = function (data) {
     return axios.post("/waterFunctionArea/riverStatic/avgCompositeIndex",data)
 }
 
+//单月水质综合指数统计
+const listAutoStandard = function (data) {
+    return axios.post("/waterFunctionArea/riverStatic/autoStandard",data)
+}
+
+const listNationalStandard = function (data) {
+    return axios.post("/waterFunctionArea/riverStatic/nationalStandard",data)
+}
+
 
 
 
@@ -58,5 +67,7 @@ export {
     listMonthCompositeIndex,
     listTargetInfo,
     listAvgCompositeIndex,
-    listAvgWaterQualitySandard
+    listAvgWaterQualitySandard,
+    listAutoStandard,
+    listNationalStandard
 }

src/api/ecology/river.js

@@ -34,8 +34,8 @@ const getRiverBill = function (id) {
 }
 // -------------------------数据---------------------
 const pageRiverUrl = '/surfaceWaterSection/surfaceWaterSection/page';
-const listAllRiver = function (params) {
+const listAllRiver = function (data) {
-    return axios.get("/surfaceWaterSection/surfaceWaterSection",{params})
+    return axios.post("/surfaceWaterSection/surfaceWaterSection/list",data)
 }
 // 添加
 const saveRiver = function (data) {

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

@@ -226,6 +226,99 @@ const tableColumns = [{
   },
 ];
 
+const tableColumnsBase = [{
+  title: "断面编码",
+  dataIndex: "sectionCode",
+  sorter: true,
+},
+{
+  title: "断面名称",
+  dataIndex: "sectionName",
+  sorter: true,
+},
+{
+  title: "考核省份",
+  dataIndex: "evaluationProvince",
+  sorter: true,
+},
+{
+  title: "断面类型",
+  dataIndex: "sectionType",
+  sorter: true,
+},
+{
+  title: "断面属性",
+  dataIndex: "sectionAttributes",
+  sorter: true,
+},
+{
+  title: "流域",
+  dataIndex: "watershed",
+  sorter: true,
+},
+{
+  title: "水系",
+  dataIndex: "waterSystem",
+  sorter: true,
+},
+// {title: "监测时间",dataIndex: "monitorTime",sorter: true,},
+{
+  title: "所在水体",
+  dataIndex: "waterBody",
+  sorter: true,
+},
+{
+  title: "汇入水体 ",
+  dataIndex: "intoWaterBody",
+  sorter: true,
+},
+{
+  title: "河流级别",
+  dataIndex: "riverLevel",
+  sorter: true,
+},
+{
+  title: "监测年份",
+  dataIndex: "monitoringYear",
+  sorter: true,
+},
+{
+  title: "监测月份",
+  dataIndex: "monitoringMonth",
+  sorter: true,
+},
+{
+  title: "水质类别",
+  dataIndex: "waterQualityCategory",
+  sorter: true,
+},
+{
+  title: "电导率(ms/m)",
+  dataIndex: "conductivity",
+  sorter: true,
+},
+{
+  title: "水温(℃)",
+  dataIndex: "waterTemperature",
+  sorter: true,
+},
+{
+  title: "透明度(cm)",
+  dataIndex: "transparency",
+  sorter: true,
+},
+{
+  title: "盐度(‰)",
+  dataIndex: "salinity",
+  sorter: true,
+},
+{
+  title: "T-N(mg/L)",
+  dataIndex: "tN",
+  sorter: true,
+},
+];
+
 export {
-  tableColumns
+  tableColumns,tableColumnsBase
 }

src/views/water/river/collect/utils.js

@@ -3,11 +3,19 @@
 export default {
     toObjData(excelData) {
         return excelData.map(item => {
-            const monitorTime = new Date();
+            // const monitorTime = new Date();
-            monitorTime.setFullYear(item[12]);
+            // monitorTime.setFullYear();
-            monitorTime.setMonth(item[13] - 1);
+            // monitorTime.setMonth();
+            var flag;
+            if(item[13].length == 1){
+                flag="-0"
+            }else{
+                flag="-"
+            }
+            var monitorTime = item[12]+flag+item[13];
+            console.log(monitorTime);
             const row = {
-                monitorTime: monitorTime.getTime(),
+                monitorTime: monitorTime,
                 sectionCode: item[0],
                 sectionName: item[1],
                 province: item[2],

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

@@ -30,10 +30,7 @@
           </a-col>
         </a-row>
       </a-form> -->
-      <a-form
+      <a-form :model="where" layout="inline">
-      :model="where"
-      layout="inline"
-  >
 
         <a-form-item label="起始日期:">
           <a-date-picker valueFormat="YYYY-MM-DD 00:00:00" v-model:value="where.timeStart"></a-date-picker>
@@ -49,7 +46,7 @@
           </a-select>
         </a-form-item>
         <a-form-item label="河段名称">
-    <a-select v-model:value="where.riverLakeLibrary" allowClear showSearch>
+          <a-select v-model:value="where.waterBody" allowClear showSearch>
             <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
             </a-select-option>
           </a-select>
@@ -76,7 +73,7 @@
         </a-space>
       </a-form>
       <!-- 表格 -->
-      <ele-pro-table ref="table" row-key="surfaceWaterSectionId" :datasource="url" :columns="columns" :where="where"
+      <ele-pro-table ref="table" row-key="surfaceWaterSectionId" :datasource="datasource" :columns="columns" :where="where"
         :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
       </ele-pro-table>
     </a-card>
@@ -87,7 +84,8 @@
 <script>
   import {
     getRiverBill,
-    pageRiverUrl
+    pageRiverUrl,
+    listAllRiver
   } from "@/api/ecology/river";
   import {
     listTargetInfo,
@@ -97,7 +95,7 @@
   } from "@/api/ecology/water/river-plcae";
   import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
   import {
-    tableColumns
+    tableColumnsBase
   } from ".././collect/colums";
   import XLSX from "xlsx";
   export default {
@@ -114,23 +112,49 @@
         // 表格数据接口
         url: pageRiverUrl,
         selection: [],
-        tableColumns,
+        tableColumnsBase,
+        // columnsList: [],
         // 表格列配置
         columns: [
-          ...tableColumns,
+          ...tableColumnsBase,
+          // this.columnsList,
+          {
+            title: "NO₃-(mg/L)",
+            dataIndex: "no3",
+            sorter: true,
+          },
+          {
+            title: "NO₂-(mg/L)",
+            dataIndex: "no2",
+            sorter: true,
+          },
+          {
+            title: "流量(m³/s)",
+            dataIndex: "flow",
+            sorter: true,
+          },
+          {
+            title: "水位",
+            dataIndex: "waterLevel",
+            sorter: true,
+          },
+          {
+            title: "备注",
+            dataIndex: "remark",
+            sorter: true,
+          },
         ],
         // 表格搜索条件
         surfaceWaterSectionBillId: billId,
-        where: {
+        where: {},
-          surfaceWaterSectionBillId: billId,
-        },
         sectionInfo: {},
         loading: false,
         rules: {},
         waterBodyList: [],
         waterSystemList: [],
-        targetInfo:{},
+        targetInfo: {},
-        targetInfoList:[],
+        targetInfoList: [],
+        datasource:{},
       };
     },
     mounted() {
@@ -172,15 +196,177 @@
       loadOptionData() {},
       /* 刷新表格 */
       reload() {
-        this.$refs.table.reload({
+        if (this.where.targetName) {
-          where: this.where,
+          var arr = this.where.targetName
+          arr.forEach((a) => {
+            if (a == 'ph') {
+              this.columns.push({
+                title: "pH值",
+                dataIndex: "ph",
+                sorter: true,
+              }, )
+            }
+            if (a == '汞') {
+              this.columns.push({
+                title: "T-Hg(mg/L)",
+                dataIndex: "tHg",
+                sorter: true,
+              }, )
+            }
+            if (a == '溶解氧') {
+              this.columns.push({
+                title: "溶解氧(mg/L)",
+                dataIndex: "dissolvedOxygen",
+                sorter: true,
+              }, )
+            }
+            if (a == '高锰酸盐指数') {
+              this.columns.push({
+                title: "COD Mn(mg/L)",
+                dataIndex: "codMn",
+                sorter: true,
+              }, )
+            }
+            if (a == '化学需氧量') {
+              this.columns.push({
+                title: "COD Cr(mg/L)",
+                dataIndex: "codCr",
+                sorter: true,
+              }, )
+            }
+            if (a == '氨氮') {
+              this.columns.push({
+                title: "NH₃-N(mg/L)",
+                dataIndex: "nh3N",
+                sorter: true,
+              }, )
+            }
+            if (a == '总磷') {
+              this.columns.push({
+                title: "T-P(mg/L)",
+                dataIndex: "tP",
+                sorter: true,
+              }, )
+            }
+            if (a == '铜') {
+              this.columns.push({
+                title: "Cu(mg/L)",
+                dataIndex: "cu",
+                sorter: true,
+              }, )
+            }
+            if (a == '锌') {
+              this.columns.push({
+                title: "Zn(mg/L)",
+                dataIndex: "zn",
+                sorter: true,
+              }, )
+            }
+            if (a == '铅') {
+              this.columns.push({
+                title: "Pb(mg/L)",
+                dataIndex: "pb",
+                sorter: true,
+              }, )
+            }
+            if (a == '镉') {
+              this.columns.push({
+                title: "Cd(mg/L)",
+                dataIndex: "cd",
+                sorter: true,
+              }, )
+            }
+            if (a == '五日生化需氧量') {
+              this.columns.push({
+                title: "BOD5(mg/L)",
+                dataIndex: "bod5",
+                sorter: true,
+              }, )
+            }
+            if (a == '砷') {
+              this.columns.push({
+                title: "T-As(mg/L)",
+                dataIndex: "tAs",
+                sorter: true,
+              }, )
+            }
+            if (a == '硒') {
+              this.columns.push({
+                title: "T-Se(mg/L)",
+                dataIndex: "tSe",
+                sorter: true,
+              }, )
+            }
+            if (a == '铬') {
+              this.columns.push({
+                title: "Cr6+(mg/L)",
+                dataIndex: "cr6",
+                sorter: true,
+              }, )
+            }
+            if (a == '阴离子表面活性剂') {
+              this.columns.push({
+                title: "Chla(mg/L)",
+                dataIndex: "chla",
+                sorter: true,
+              }, )
+            }
+            if (a == '硫化物') {
+              this.columns.push({
+                title: "S2-(mg/L)",
+                dataIndex: "s2",
+                sorter: true,
+              }, )
+            }
+            if (a == '石油类') {
+              this.columns.push({
+                title: "石油类(mg/L)",
+                dataIndex: "petro",
+                sorter: true,
+              }, )
+            }
+            if (a == '氰化物') {
+              this.columns.push({
+                title: "CN-(mg/L)",
+                dataIndex: "cn",
+                sorter: true,
+              })
+            }
+            if (a == '氟化物') {
+              this.columns.push({
+                title: "F-(mg/L)",
+                dataIndex: "f",
+                sorter: true,
+              }, )
+            }
+            if (a == '挥发酚') {
+              this.columns.push({
+                title: "挥发酚(mg/L)",
+                dataIndex: "volatilePhenol",
+                sorter: true,
+              }, )
+            }
+
+            console.log("bbbb" + this.columns);
+          });
+
+        }
+        // this.$refs.table.reload({
+        //   where: this.where,
+        // });
+        listAllRiver(this.where).then((res) => {
+          console.log(res.data.data);
+          if (res.data.code == 0) {
+            this.$message.success(res.data.msg);
+            this.datasource = res.data.data
+          } else {
+            this.$message.error(res.data.msg);
+          }
         });
       },
       /* 重置搜索 */
       reset() {
-        this.where = {
+        this.where = {};
-          surfaceWaterSectionId: this.surfaceWaterSectionId,
-        };
         this.reload();
       },
       /* 导出 */

src/views/water/water-function-area/statistic/auto-standard.vue

@@ -7,16 +7,26 @@
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
           <a-form-item label="断面名称">
-            <a-select v-model:value="where.name" allowClear showSearch>
+            <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
-              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
+                {{ item.sectionName }}
               </a-select-option>
             </a-select>
           </a-form-item>
-          <a-form-item label="起始日期:">
+          <a-form-item label="河段名称">
-            <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.startTime"></a-date-picker>
+            <a-select v-model:value="where.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
+              <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
-          <a-form-item label="结束日期:">
+          <a-form-item label="监测类型">
-            <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.endTime"></a-date-picker>
+            <a-select v-model:value="where.monitorType" placeholder="请选择监测类型" allowClear showSearch>
+              <a-select-option :value="'1'">全因子</a-select-option>
+              <a-select-option :value="'2'">纳污红线</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="查询日期:">
+            <a-date-picker valueFormat="YYYY" v-model:value="where.startTime"></a-date-picker>
           </a-form-item>
 
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -32,7 +42,7 @@
       </a-form>
       <!-- 表格 -->
       <a-spin :spinning="loading">
-        <ele-pro-table ref="table" :datasource="url" :columns="columns" :where="where"
+        <ele-pro-table ref="table" :datasource="datasource" :columns="columns" :where="where"
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
@@ -43,52 +53,127 @@
 
 <script>
   import {
-    autonomyWaterFunctionTotalUrl,
+    listAutoStandard,
   } from "@/api/ecology/river-statis";
   import {
     listInfo
   } from "@/api/ecology/water/river-autonomous";
   import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
-  import {
-    tableColumns
-  } from "./colums";
   import XLSX from "xlsx";
   export default {
-    name: "RiverCollectWater",
+    name: "AutoCollectWater",
     components: {},
     data() {
       return {
         data: [],
         locale,
-        datasource: {},
+        datasource: [],
         // 表格数据接口
-        url: autonomyWaterFunctionTotalUrl,
+        // url: autonomyWaterFunctionTotalUrl,
         selection: [],
-        tableColumns,
+        // tableColumns,
         // 表格列配置
-        columns: [
+        columns: [{
-          ...tableColumns,
+            title: "监测断面名称",
+            dataIndex: "sectionName",
+            sorter: true,
+          },
+          {
+            title: "水质目标",
+            dataIndex: "waterQualityGoal",
+            sorter: true,
+          },
+          {
+            title: "1月",
+            dataIndex: "january",
+            sorter: true,
+          },
+          {
+            title: "2月",
+            dataIndex: "february",
+            sorter: true,
+          },
+          {
+            title: "3月",
+            dataIndex: "march",
+            sorter: true,
+          },
+          {
+            title: "4月",
+            dataIndex: "april",
+            sorter: true,
+          },
+          {
+            title: "5月",
+            dataIndex: "may",
+            sorter: true,
+          },
+          {
+            title: "6月",
+            dataIndex: "june",
+            sorter: true,
+          },
+          {
+            title: "7月",
+            dataIndex: "july",
+            sorter: true,
+          },
+          {
+            title: "8月",
+            dataIndex: "august",
+            sorter: true,
+          },
+          {
+            title: "9月",
+            dataIndex: "september",
+            sorter: true,
+          },
+          {
+            title: "10月",
+            dataIndex: "october",
+            sorter: true,
+          },
+          {
+            title: "11月",
+            dataIndex: "november",
+            sorter: true,
+          },
+          {
+            title: "12月",
+            dataIndex: "december",
+            sorter: true,
+          },
+          {
+            title: "达标率",
+            dataIndex: "standardRate",
+            sorter: true,
+          },
+          {
+            title: "达标情况",
+            dataIndex: "standard",
+            sorter: true,
+          },
+
         ],
         // 表格搜索条件
         where: {},
         sectionInfo: {},
         loading: false,
         rules: {},
+        waterSystemList: [],
       };
     },
-    mounted() {
+
-      this.loading = true;
-      this.$refs.table.reload({
-        where: this.where,
-      });
-      this.loading = false;
-    },
     created() {
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
           this.visibleWater = true;
           this.sectionInfo = res.data.data
+          res.data.data.forEach((m) => {
+            this.waterSystemList.push(m.waterBody);
+          })
+          this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
           this.$message.error(res.data.msg);
         }
@@ -98,11 +183,76 @@
       /* 刷新表格 */
       reload() {
         this.loading = true;
-        console.log(this.where);
+        listAutoStandard(this.where).then((res) => {
-        this.$refs.table.reload({
+          console.log(res.data.data);
-        where: this.where,
+          if (res.data.code == 0) {
+            this.$message.success(res.data.msg);
+            for (var key in res.data.data) {
+              var arr = res.data.data[key];
+              console.log(arr);
+              var target = {
+                sectionName:'',
+                january:'',
+                february:'',
+                march:'',
+                april:'',
+                may:'',
+                june:'',
+                july:'',
+                august:'',
+                september:'',
+                october:'',
+                november:'',
+                december:'',
+              };
+              arr.forEach(e => {
+                target.sectionName = e.sectionName;
+                var month = e.samplingTime.split("-")[1];
+                if (month == '01') {
+                  target.january = e.waterQualityCategory;
+                }
+                if (month == '02') {
+                  target.february = e.waterQualityCategory;
+                }
+                if (month == '03') {
+                  target.march = e.waterQualityCategory;
+                }
+                if (month == '04') {
+                  target.april = e.waterQualityCategory;
+                }
+                if (month == '05') {
+                  target.may = e.waterQualityCategory;
+                }
+                if (month == '06') {
+                  target.june = e.waterQualityCategory;
+                }
+                if (month == '07') {
+                  target.july = e.waterQualityCategory;
+                }
+                if (month == '08') {
+                  target.august = e.waterQualityCategory;
+                }
+                if (month == '09') {
+                  target.september = e.waterQualityCategory;
+                }
+                if (month == '10') {
+                  target.october = e.waterQualityCategory;
+                }
+                if (month == '11') {
+                  target.november = e.waterQualityCategory;
+                }
+                if (month == '12') {
+                  target.december = e.waterQualityCategory;
+                }
+
+              })
+              this.datasource.push(target);
+            }
+          } else {
+            this.$message.error(res.data.msg);
+          }
+          this.loading = false;
         });
-      console.log(this.url);
         this.loading = false;
       },
       /* 重置搜索 */

src/views/water/water-function-area/statistic/auto-yoy.vue

@@ -7,11 +7,24 @@
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
           <a-form-item label="断面名称">
-            <a-select v-model:value="where.name" allowClear showSearch>
+            <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
-              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
+                {{ item.sectionName }}
               </a-select-option>
             </a-select>
           </a-form-item>
+          <a-form-item label="河段名称">
+            <a-select v-model:value="where.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
+              <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="监测类型">
+            <a-select v-model:value="where.monitorType" placeholder="请选择监测类型" allowClear showSearch>
+                <a-select-option :value="'1'">全因子</a-select-option>
+                <a-select-option :value="'2'">纳污红线</a-select-option>
+            </a-select>
+          </a-form-item>
           <a-form-item label="起始日期:">
             <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.startTime"></a-date-picker>
           </a-form-item>
@@ -74,6 +87,7 @@
         sectionInfo: {},
         loading: false,
         rules: {},
+        waterSystemList: [],
       };
     },
     mounted() {
@@ -89,6 +103,10 @@
           console.log(res.data.data)
           this.visibleWater = true;
           this.sectionInfo = res.data.data
+          res.data.data.forEach((m) => {
+            this.waterSystemList.push(m.waterBody);
+          })
+          this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
           this.$message.error(res.data.msg);
         }

src/views/water/water-function-area/statistic/auto.vue

@@ -7,11 +7,24 @@
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
           <a-form-item label="断面名称">
-            <a-select v-model:value="where.name" allowClear showSearch>
+            <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
-              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
+                {{ item.sectionName }}
               </a-select-option>
             </a-select>
           </a-form-item>
+          <a-form-item label="河段名称">
+            <a-select v-model:value="where.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
+              <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="监测类型">
+            <a-select v-model:value="where.monitorType" placeholder="请选择监测类型" allowClear showSearch>
+                <a-select-option :value="'1'">全因子</a-select-option>
+                <a-select-option :value="'2'">纳污红线</a-select-option>
+            </a-select>
+          </a-form-item>
           <a-form-item label="起始日期:">
             <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.startTime"></a-date-picker>
           </a-form-item>
@@ -74,6 +87,7 @@
         sectionInfo: {},
         loading: false,
         rules: {},
+        waterSystemList: [],
       };
     },
     mounted() {
@@ -89,6 +103,10 @@
           console.log(res.data.data)
           this.visibleWater = true;
           this.sectionInfo = res.data.data
+          res.data.data.forEach((m) => {
+            this.waterSystemList.push(m.waterBody);
+          })
+          this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
           this.$message.error(res.data.msg);
         }

src/views/water/water-function-area/statistic/national-standard.vue

@@ -7,16 +7,26 @@
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
           <a-form-item label="断面名称">
-            <a-select v-model:value="where.name" allowClear showSearch>
+            <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
-              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
+                {{ item.sectionName }}
               </a-select-option>
             </a-select>
           </a-form-item>
-          <a-form-item label="起始日期:">
+          <a-form-item label="河段名称">
-            <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.startTime"></a-date-picker>
+            <a-select v-model:value="where.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
+              <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
-          <a-form-item label="结束日期:">
+          <a-form-item label="监测类型">
-            <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.endTime"></a-date-picker>
+            <a-select v-model:value="where.monitorType" placeholder="请选择监测类型" allowClear showSearch>
+                <a-select-option :value="'1'">全因子</a-select-option>
+                <a-select-option :value="'2'">纳污红线</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="查询日期:">
+            <a-date-picker valueFormat="YYYY" v-model:value="where.startTime"></a-date-picker>
           </a-form-item>
 
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -74,6 +84,7 @@
         sectionInfo: {},
         loading: false,
         rules: {},
+        waterSystemList: [],
       };
     },
     mounted() {
@@ -89,6 +100,11 @@
           console.log(res.data.data)
           this.visibleWater = true;
           this.sectionInfo = res.data.data
+          
+res.data.data.forEach((m) => {
+            this.waterSystemList.push(m.waterBody);
+          })
+          this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
           this.$message.error(res.data.msg);
         }

src/views/water/water-function-area/statistic/national-yoy.vue

@@ -7,11 +7,24 @@
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
           <a-form-item label="断面名称">
-            <a-select v-model:value="where.name" allowClear showSearch>
+            <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
-              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
+                {{ item.sectionName }}
               </a-select-option>
             </a-select>
           </a-form-item>
+          <a-form-item label="河段名称">
+            <a-select v-model:value="where.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
+              <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="监测类型">
+            <a-select v-model:value="where.monitorType" placeholder="请选择监测类型" allowClear showSearch>
+                <a-select-option :value="'1'">全因子</a-select-option>
+                <a-select-option :value="'2'">纳污红线</a-select-option>
+            </a-select>
+          </a-form-item>
           <a-form-item label="起始日期:">
             <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.startTime"></a-date-picker>
           </a-form-item>
@@ -74,6 +87,7 @@
         sectionInfo: {},
         loading: false,
         rules: {},
+        waterSystemList: [],
       };
     },
     mounted() {
@@ -89,6 +103,10 @@
           console.log(res.data.data)
           this.visibleWater = true;
           this.sectionInfo = res.data.data
+          res.data.data.forEach((m) => {
+            this.waterSystemList.push(m.waterBody);
+          })
+          this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
           this.$message.error(res.data.msg);
         }

src/views/water/water-function-area/statistic/national.vue

@@ -7,11 +7,24 @@
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
           <a-form-item label="断面名称">
-            <a-select v-model:value="where.name" allowClear showSearch>
+            <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
-              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
+                {{ item.sectionName }}
               </a-select-option>
             </a-select>
           </a-form-item>
+          <a-form-item label="河段名称">
+            <a-select v-model:value="where.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
+              <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="监测类型">
+            <a-select v-model:value="where.monitorType" placeholder="请选择监测类型" allowClear showSearch>
+                <a-select-option :value="'1'">全因子</a-select-option>
+                <a-select-option :value="'2'">纳污红线</a-select-option>
+            </a-select>
+          </a-form-item>
           <a-form-item label="起始日期:">
             <a-date-picker valueFormat="YYYY-MM-DD " v-model:value="where.startTime"></a-date-picker>
           </a-form-item>
@@ -76,6 +89,7 @@
         sectionInfo: {},
         loading: false,
         rules: {},
+        waterSystemList: [],
       };
     },
     mounted() {
@@ -92,6 +106,10 @@
               console.log(res.data.data)
               this.visibleWater = true;
               this.sectionInfo = res.data.data
+              res.data.data.forEach((m) => {
+            this.waterSystemList.push(m.waterBody);
+          })
+          this.waterSystemList = [...new Set(this.waterSystemList)];
             } else {
               this.$message.error(res.data.msg);
             }