江河模块修改

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

@@ -21,17 +21,16 @@
           </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-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-date-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-date-picker>
           </a-form-item>
           <a-form-item label="结束日期:">
-            <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.endTime"></a-date-picker>
+            <a-date-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-date-picker>
           </a-form-item>
-
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -45,7 +44,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>
@@ -56,18 +55,15 @@
 
 <script>
   import {
-    autonomyWaterFunctionTotalUrl,
+    listNationalYoy,
   } from "@/api/ecology/river-statis";
   import {
     listInfo
-  } from "@/api/ecology/water/river-autonomous";
+  } from "@/api/ecology/water/river-api-relate";
   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 {
@@ -75,12 +71,40 @@
         locale,
         datasource: {},
         // 表格数据接口
-        url: autonomyWaterFunctionTotalUrl,
+        // url: autonomyWaterFunctionTotalUrl,
         selection: [],
-        tableColumns,
+        // tableColumns,
         // 表格列配置
-        columns: [
-          ...tableColumns,
+        columns: [{
+            title: "监测断面名称",
+            dataIndex: "sectionName",
+            sorter: true,
+          },
+          {
+            title: "时间",
+            dataIndex: "samplingTime",
+            sorter: true,
+          },
+          {
+            title: "水质目标",
+            dataIndex: "waterQualityGoal",
+            sorter: true,
+          },
+          {
+            title: "水质类别",
+            dataIndex: "waterQualityCategory",
+            sorter: true,
+          },
+          {
+            title: "达标情况",
+            dataIndex: "standard",
+            sorter: true,
+          },
+          {
+            title: "达标率",
+            dataIndex: "standardRate",
+            sorter: true,
+          },
         ],
         // 表格搜索条件
         where: {},
@@ -90,13 +114,7 @@
         waterSystemList: [],
       };
     },
-    mounted() {
-      this.loading = true;
-      this.$refs.table.reload({
-        where: this.where,
-      });
-      this.loading = false;
-    },
+
     created() {
       listInfo().then((res) => {
         if (res.data.code == 0) {
@@ -116,12 +134,16 @@
       /* 刷新表格 */
       reload() {
         this.loading = true;
-        console.log(this.where);
-        this.$refs.table.reload({
-        where: this.where,
-      });
-      console.log(this.url);
-      this.loading = false;
+        listNationalYoy(this.where).then((res) => {
+          console.log(res.data.data);
+          if (res.data.code == 0) {
+              this.datasource = res.data.data;
+          } else {
+            this.$message.error(res.data.msg);
+          }
+          this.loading = false;
+        });
+        this.loading = false;
       },
       /* 重置搜索 */
       reset() {