江河模块修改

src/views/water/river/dict/api-relate.vue

@@ -1,3 +1,4 @@
+<!--国家级水功能区点位信息-->
 <template>
     <div class="ele-body">
         <a-card :bordered="false">

src/views/water/river/dict/autonomous.vue

@@ -1,3 +1,4 @@
+<!--自治区水功能区点位信息-->
 <template>
     <div class="ele-body">
         <a-card :bordered="false">

src/views/water/river/dict/place.vue

@@ -1,22 +1,28 @@
+<!--江河水点位信息-->
 <template>
   <div class="ele-body">
     <a-card :bordered="false">
-            <a-form
+      <a-form :model="where" :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }">
-                :model="where"
-                :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-            >
         <a-row>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="年份:">
               <a-select v-model:value="where.year" allow-clear show-search>
-                                <a-select-option
+                <a-select-option v-for="(item) in yearOptions" :key="item.value">{{ item.label }}
-                                    v-for="(item) in yearOptions"
-                                    :key="item.value"
-                                >{{ item.label }}
                 </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item label="断面类别:">
+              <a-select v-model:value="where.sectionGenre" allow-clear show-search>
+                <a-select-option :value="'1'">国控断面</a-select-option>
+                <a-select-option :value="'2'">省控断面</a-select-option>
+                <a-select-option :value="'3'">市控断面</a-select-option>
+                <a-select-option :value="'4'">水环境功能区监控断面</a-select-option>
+                <a-select-option :value="'5'">重点流域断面</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-space>
               <a-button type="primary" @click="reload">查询</a-button>
@@ -28,40 +34,19 @@
 
         </a-row>
       </a-form>
-            <a-modal
+      <a-modal v-model:visible="showNYear" :title="'批量复制'" :confirm-loading="loading"
-                v-model:visible="showNYear"
+        :body-style="{ paddingBottom: '8px' }" @ok="copyBatch">
-                :title="'批量复制'"
+        <a-form ref="form" :model="form" :rules="rules" :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-                :confirm-loading="loading"
+          :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }">
-                :body-style="{ paddingBottom: '8px' }"
-                @ok="copyBatch"
-            >
-                <a-form
-                    ref="form"
-                    :model="form"
-                    :rules="rules"
-                    :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-                    :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-                >
           <a-form-item label="新年份" name="nYear">
             <a-input-number id="inputNumber" v-model:value="nYear" :min="1970" :max="2050" />
           </a-form-item>
         </a-form>
       </a-modal>
-            <a-modal
+      <a-modal v-model:visible="showEdit" :title="form.surfaceWaterPointId !== undefined ? '修改' : '添加'"
-                v-model:visible="showEdit"
+        :confirm-loading="loading" :width="800" :body-style="{ paddingBottom: '8px' }" @ok="save">
-                :title="form.surfaceWaterPointId !== undefined ? '修改' : '添加'"
+        <a-form ref="form" :model="form" :rules="rules" :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-                :confirm-loading="loading"
+          :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }">
-                :width="800"
-                :body-style="{ paddingBottom: '8px' }"
-                @ok="save"
-            >
-                <a-form
-                    ref="form"
-                    :model="form"
-                    :rules="rules"
-                    :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-                    :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-                >
           <a-form-item label="年份" name="year">
             <a-input-number v-model:value="form.year" :min="1970" :max="2050" />
           </a-form-item>
@@ -86,6 +71,15 @@
           <a-form-item label="断面属性" name="sectionAttribute">
             <a-input v-model:value="form.sectionAttribute" placeholder="请输入断面属性" allow-clear />
           </a-form-item>
+          <a-form-item label="断面类别" name="sectionGenre">
+            <a-select v-model:value="form.sectionGenre" allowClear placeholder="未选择">
+              <a-select-option :value="'1'">国控断面</a-select-option>
+              <a-select-option :value="'2'">省控断面</a-select-option>
+              <a-select-option :value="'3'">市控断面</a-select-option>
+              <a-select-option :value="'4'">水环境功能区监控断面</a-select-option>
+              <a-select-option :value="'5'">重点流域断面</a-select-option>
+            </a-select>
+          </a-form-item>
           <a-form-item label="水质目标" name="waterTarget">
             <a-input v-model:value="form.waterTarget" placeholder="请输入水质目标" allow-clear />
           </a-form-item>
@@ -108,16 +102,8 @@
         </a-form>
       </a-modal>
       <!-- 表格 -->
-            <ele-pro-table
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="surfaceWaterPointId" :datasource="url"
-                v-model:selection="selectionList"
+        :columns="columns" :where="where" :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
-                ref="table"
-                row-key="surfaceWaterPointId"
-                :datasource="url"
-                :columns="columns"
-                :where="where"
-                :scroll="{ x: 'max-content' }"
-                @done="(d) => (data = d.data)"
-            >
         <template #toolbar>
           <a-space>
             <a-button @click="openEdit" type="primary">新增</a-button>
@@ -134,19 +120,9 @@
                 <DownOutlined />
               </a-button>
             </a-dropdown>
-                        <a-popconfirm
+            <a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`"
-                            :disabled="selectionList.length == 0"
+              ok-text="Yes" cancel-text="No" @confirm="removeBatch">
-                            :title="`确认删除${selectionList.length}条数据吗?`"
+              <a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除
-                            ok-text="Yes"
-                            cancel-text="No"
-                            @confirm="removeBatch"
-                        >
-                            <a-button
-                                :disabled="selectionList.length == 0"
-                                type="primary"
-                                ghost
-                                danger
-                            >删除
               </a-button>
             </a-popconfirm>
             <a-button @click="exportData" type="primary">导出</a-button>
@@ -154,22 +130,9 @@
         </template>
         <template #action="{ record }">
           <a-space>
-                        <a-button
+            <a-button @click="openEdit(record)" type="primary" shape="round" size="small">修改</a-button>
-                            @click="openEdit(record)"
+            <a-popconfirm :title="`确认删除这条数据吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
-                            type="primary"
+              <a-button type="primary" danger shape="round" size="small">删除</a-button>
-                            shape="round"
-                            size="small"
-                        >修改</a-button
-                        >
-                        <a-popconfirm
-                            :title="`确认删除这条数据吗?`"
-                            ok-text="Yes"
-                            cancel-text="No"
-                            @confirm="remove(record)"
-                        >
-                            <a-button type="primary" danger shape="round" size="small"
-                            >删除</a-button
-                            >
             </a-popconfirm>
           </a-space>
         </template>
@@ -191,11 +154,15 @@ import {
     getColumnOptions
   } from "@/api/ecology/water/river-plcae";
   import XLSX from "xlsx";
-import {DownOutlined} from '@ant-design/icons-vue';
+  import {
+    DownOutlined
+  } from '@ant-design/icons-vue';
   // import moment from "moment";
   export default {
     name: "WaterPlace",
-    components: {DownOutlined},
+    components: {
+      DownOutlined
+    },
     data() {
       return {
         data: [],
@@ -203,12 +170,31 @@ export default {
         url: listAllUrl,
         selection: [],
         // 表格列配置
-            columns: [
+        columns: [{
-                {title: "年份", dataIndex: "year",sorter: true,},
+            title: "年份",
-                {title: "断面编码",dataIndex: "sectionCode",sorter: true,},
+            dataIndex: "year",
-                {title: "断面名称",dataIndex: "sectionName",sorter: true,},
+            sorter: true,
-                {title: "所属省份",dataIndex: "province",sorter: true,},
+          },
-                {title: "所属城市",dataIndex: "city",sorter: true,},
+          {
+            title: "断面编码",
+            dataIndex: "sectionCode",
+            sorter: true,
+          },
+          {
+            title: "断面名称",
+            dataIndex: "sectionName",
+            sorter: true,
+          },
+          {
+            title: "所属省份",
+            dataIndex: "province",
+            sorter: true,
+          },
+          {
+            title: "所属城市",
+            dataIndex: "city",
+            sorter: true,
+          },
           {
             title: "考核省份",
             dataIndex: "assessmentProvince",
@@ -219,17 +205,46 @@ export default {
             dataIndex: "sectionType",
             sorter: true,
           },
-                {title: "断面属性",dataIndex: "sectionAttribute",sorter: true,},
+          {
+            title: "断面属性",
+            dataIndex: "sectionAttribute",
+            sorter: true,
+          },
+          {
+            title: "断面类别",
+            dataIndex: "sectionGenre",
+            sorter: true,
+          },
           {
             title: "水质目标",
             dataIndex: "waterTarget",
           },
-                {title: "流域",dataIndex: "basin",sorter: true,},
+          {
+            title: "流域",
+            dataIndex: "basin",
+            sorter: true,
+          },
 
-                {title: "水系",dataIndex: "riverSystem",sorter: true,},
+          {
-                {title: "所在水体",dataIndex: "waterBody",sorter: true,},
+            title: "水系",
-                {title: "汇入水体",dataIndex: "importWaterBody",sorter: true,},
+            dataIndex: "riverSystem",
-                {title: "河流级别",dataIndex: "riverLevel",sorter: true,},
+            sorter: true,
+          },
+          {
+            title: "所在水体",
+            dataIndex: "waterBody",
+            sorter: true,
+          },
+          {
+            title: "汇入水体",
+            dataIndex: "importWaterBody",
+            sorter: true,
+          },
+          {
+            title: "河流级别",
+            dataIndex: "riverLevel",
+            sorter: true,
+          },
           {
             title: "操作",
             key: "action",
@@ -252,9 +267,18 @@ export default {
         form: {},
         loading: false,
         rules: {
-                year: [{required: true, message: '请输入年份'}],
+          year: [{
-                sectionCode:[{required: true,message: '请输入断面编码'}],
+            required: true,
-                sectionName:[{required: true,message: '请输入断面名称'}],
+            message: '请输入年份'
+          }],
+          sectionCode: [{
+            required: true,
+            message: '请输入断面编码'
+          }],
+          sectionName: [{
+            required: true,
+            message: '请输入断面名称'
+          }],
         },
         yearOptions: [],
         showNYear: false,
@@ -382,7 +406,10 @@ export default {
       },
       copyBatch() {
         const hide = this.$message.loading('请求中..', 0);
-            copyBatchPlace({cyear:Number(this.cYear),nyear:this.nYear}).then(res=>{
+        copyBatchPlace({
+          cyear: Number(this.cYear),
+          nyear: this.nYear
+        }).then(res => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();
@@ -413,6 +440,7 @@ export default {
 
     },
   };
+
 </script>
 
 <style scoped lang="less">

src/views/water/river/dict/water.vue

@@ -1,3 +1,4 @@
+<!--水站点位信息-->
 <template>
     <div class="ele-body">
         <a-card :bordered="false">

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

@@ -56,12 +56,6 @@ const tableColumns = [
 
 
 const tableCityColumns = [
-  {title: "城区", dataIndex: "area", sorter: true,},
-  {title: "县", dataIndex: "county", sorter: true,},
-  {title: "所在流域", dataIndex: "watershed", sorter: true,},
-  {title: "所在河流", dataIndex: "river", sorter: true,},
-  {title: "断面名称", dataIndex: "sectionName", sorter: true,},
-  {title: "站点名称", dataIndex: "place", sorter: true,},
   {title: "本期水质", dataIndex: "periodWaterQuality", sorter: true,},
   {title: "水温", dataIndex: "waterTemperature", sorter: true,},
   {title: "pH值", dataIndex: "ph", sorter: true,},

src/views/water/water-function-area/collect/water-city.vue

@@ -155,6 +155,7 @@ import {
 } from "@/api/ecology/river-station";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { tableCityColumns } from "./colums";
+import moment from "moment";
 //   import utils from "./utils";
 export default {
   name: "RiverStationCollectWater",
@@ -170,6 +171,18 @@ export default {
       tableCityColumns,
       // 表格列配置
       columns: [
+        {title: "城区", dataIndex: "area", sorter: true,},
+        {title: "县", dataIndex: "county", sorter: true,},
+        {title: "所在流域", dataIndex: "watershed", sorter: true,},
+        {title: "所在河流", dataIndex: "river", sorter: true,},
+        {title: "断面名称", dataIndex: "sectionName", sorter: true,},
+        {title: "站点名称", dataIndex: "place", sorter: true,},
+        {
+          title: "采样开始时间",
+          dataIndex: "monitorTime",
+          sorter: true,
+          customRender: ({text})=> moment(text,"YYYY/MM/DD").format("YYYY-MM-DD")
+        },
         ...tableCityColumns,
 
         {