修改参数传值

src/api/ecology/new-drinking-water.js

@@ -135,4 +135,12 @@ export const villageWaterQualityUpData = function (data) {
 export const villageOverStandardtUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterVillageEvaluate';
 export const villageOverStandardCount = function (data) {
     return axios.post(villageOverStandardtUrl,data)
-}
+}
+
+
+// /api/waterFunctionArea/drinkingWaterEvaluationStandard
+
+export const filterList = function (data) {
+    return axios.post('/waterFunctionArea/drinkingWaterEvaluationStandard',data)
+}
+

src/views/water/drinking-water/statistic/city/situation.vue

@@ -47,13 +47,13 @@
 
         <template #desc="{ text, record ,index }">
             <div class="editable-cell">
-                <div v-if="editableData[index] && editableData[index].edable=='index6'" class="editable-cell-input-wrapper">
+                <div v-if="editableData[index] && editableData[index].edable=='reason'" class="editable-cell-input-wrapper">
-                  <a-input class="edit-input" v-model:value="editableData[index]['index6']" @pressEnter="save(index)" />
+                  <a-input class="edit-input" v-model:value="editableData[index]['reason']" @pressEnter="save(index)" />
                   <check-outlined class="editable-cell-icon-check" @click="save(index)" />
                 </div>
                 <div v-else class="editable-cell-text-wrapper">
                 {{ text || ' ' }}
-                <edit-outlined class="editable-cell-icon" @click="edit(record,index,'index6')" />
+                <edit-outlined class="editable-cell-icon" @click="edit(record,index,'reason')" />
                 </div>
             </div>
         </template>
@@ -131,10 +131,10 @@ export default {
         {title:"县城",dataIndex:"county",slots:{customRender:'county'}},
         {title:"水源地名称",dataIndex:"sourceWaterName",},
         {title:"类型",dataIndex:"waterSourceProperty",},
-        {title:"监测时间",dataIndex:"reportTime"},
+        {title:"监测时间",dataIndex:"monitorTime"},
         //  {title:"监测时间",dataIndex:"reportTime",customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
-        {title:"应当监测项目个数",dataIndex:'index1'},
+        {title:"应当监测项目个数",dataIndex:'index1', },
-        {title:"未测个数",dataIndex:"index2",},
+        {title:"未测个数",dataIndex:"noCheckNum",},
         {title:"独立分析项目个数",dataIndex:"index3",
          slots: {
           customRender: 'enumber',
@@ -143,8 +143,8 @@ export default {
         {title:"外送分析项目个数",dataIndex:"index4",  slots: {
           customRender: 'wnumber',
             },},
-        {title:"超标项目",dataIndex:"index5",},
+        {title:"超标项目",dataIndex:"exceedingStandard",},
-        {title:"情况说明或原因",dataIndex:"index6", slots: {
+        {title:"情况说明或原因",dataIndex:"reason", slots: {
           customRender: 'desc',
             }},
         {title:"备注",dataIndex:"remark",slots: {

src/views/water/drinking-water/statistic/components/citySearch.vue

@@ -250,7 +250,9 @@ export default {
     },
     searchData() {
         if(Array.isArray(this.filter) && this.filter.length){
-            this.where.filter = [...this.filter]
+            this.where.filter = this.changeKeyToName([...this.filter])
+        }else{
+            delete this.where.filter;
         }
         const sectionNames = this.where.sectionNames
         if(sectionNames && Array.isArray(sectionNames) && !sectionNames.length){
@@ -258,6 +260,17 @@ export default {
         }
       this.$emit("search", this.where);
     },
+
+    // 将key转文字
+    changeKeyToName(keys){
+        const targetNames = filterColumns.map(item=>{
+            if(keys.indexOf(item.dataIndex)>-1){
+                return item.title
+            }
+        })
+        return targetNames;
+    },
+
     exportFile() {
       this.$emit("exportFile");
     },

src/views/water/drinking-water/statistic/components/countySearch.vue

@@ -250,10 +250,22 @@ export default {
     },
     searchData() {
     if(Array.isArray(this.filter) && this.filter.length){
-            this.where.filter = [...this.filter]
+            this.where.filter = this.changeKeyToName([...this.filter])
+        }else{
+            delete this.where.filter;
         }
       this.$emit("search", this.where);
     },
+        // 将key转文字
+    changeKeyToName(keys){
+        const targetNames = filterColumns.map(item=>{
+            if(keys.indexOf(item.dataIndex)>-1){
+                return item.title
+            }
+        })
+        return targetNames;
+    },
+
     exportFile() {
       this.$emit("exportFile");
     },

src/views/water/drinking-water/statistic/components/countySideSeatch.vue

@@ -250,9 +250,20 @@ export default {
     },
     searchData() {
         if(Array.isArray(this.filter) && this.filter.length){
-            this.where.filter = [...this.filter]
+            this.where.filter = this.changeKeyToName([...this.filter])
+              }else{
+            delete this.where.filter;
         }
       this.$emit("search", this.where);
+    },
+            // 将key转文字
+    changeKeyToName(keys){
+        const targetNames = filterColumns.map(item=>{
+            if(keys.indexOf(item.dataIndex)>-1){
+                return item.title
+            }
+        })
+        return targetNames;
     },
     exportFile() {
       this.$emit("exportFile");

src/views/water/drinking-water/statistic/county/situation.vue

@@ -132,10 +132,10 @@ export default {
         {title:"县城",dataIndex:"county",slots:{customRender:'county'}},
         {title:"水源地名称",dataIndex:"sourceWaterName",},
         {title:"类型",dataIndex:"waterSourceProperty",},
-        {title:"监测时间",dataIndex:"reportTime"},
+        {title:"监测时间",dataIndex:"monitorTime"},
         //  {title:"监测时间",dataIndex:"reportTime",customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
-        {title:"应当监测项目个数",dataIndex:'index1'},
+        {title:"应当监测项目个数",dataIndex:'index1', },
-        {title:"未测个数",dataIndex:"index2",},
+        {title:"未测个数",dataIndex:"noCheckNum",},
         {title:"独立分析项目个数",dataIndex:"index3",
          slots: {
           customRender: 'enumber',
@@ -144,8 +144,8 @@ export default {
         {title:"外送分析项目个数",dataIndex:"index4",  slots: {
           customRender: 'wnumber',
             },},
-        {title:"超标项目",dataIndex:"index5",},
+        {title:"超标项目",dataIndex:"exceedingStandard",},
-        {title:"情况说明或原因",dataIndex:"index6", slots: {
+        {title:"情况说明或原因",dataIndex:"reason", slots: {
           customRender: 'desc',
             }},
         {title:"备注",dataIndex:"remark",slots: {