From c36a162d33acf68280fb9bb87609bd795f3da4cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Tue, 14 Dec 2021 10:20:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A5=AE=E7=94=A8=E6=B0=B4=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/new-drinking-water.js         |  27 ++-
 .../drinking-water/statistic/city/base.vue    |   1 +
 .../drinking-water/statistic/city/index.vue   |   1 -
 .../statistic/city/waterQuality.vue           |  10 +-
 .../statistic/city/waterQualityUp.vue         |  19 +-
 .../statistic/countryside/index.vue           |  29 +--
 .../statistic/countryside/waterQuality.vue    | 183 ++++++++++++++++++
 .../statistic/countryside/waterQualityUp.vue  | 165 ++++++++++++++++
 .../drinking-water/statistic/county/index.vue |  27 +--
 .../statistic/county/waterQuality.vue         | 183 ++++++++++++++++++
 .../statistic/county/waterQualityUp.vue       | 171 ++++++++++++++++
 11 files changed, 778 insertions(+), 38 deletions(-)
 create mode 100644 src/views/water/drinking-water/statistic/countryside/waterQuality.vue
 create mode 100644 src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
 create mode 100644 src/views/water/drinking-water/statistic/county/waterQuality.vue
 create mode 100644 src/views/water/drinking-water/statistic/county/waterQualityUp.vue

diff --git a/src/api/ecology/new-drinking-water.js b/src/api/ecology/new-drinking-water.js
index 11cdae7..4b5417c 100644
--- a/src/api/ecology/new-drinking-water.js
+++ b/src/api/ecology/new-drinking-water.js
@@ -30,7 +30,7 @@ export const overStandardCount = function (data) {
 
 
 //市级—水质类别
-export const waterQualityUrl = '/drinkingWater/drinkingWater/AnalysePage';
+export const waterQualityUrl = '/drinkingWater/drinkingWater/getWaterQualityCategory';
 export const waterQualityData = function (data) {
     return axios.post(waterQualityUrl,data)
 }
@@ -42,7 +42,7 @@ export const waterQualityCountData = function (data) {
 }
 
 //市级—水质达标情况
-export const waterQualityUpUrl = '/drinkingWater/drinkingWater/AnalysePage';
+export const waterQualityUpUrl = '/drinkingWater/drinkingWater/getWaterQualityStandard';
 export const waterQualityUpData = function (data) {
     return axios.post(waterQualityUpUrl,data)
 }
@@ -74,6 +74,17 @@ export const countyOverStandardCount = function (data) {
     return axios.post(countyOverStandardtUrl,data)
 }
 
+//县级—水质类别
+export const countyWaterQualityUrl = '/drinkingWater/drinkingWater/getWaterQualityCategory';
+export const countyWaterQualityData = function (data) {
+    return axios.post(countyWaterQualityUrl,data)
+}
+
+//县级—水质达标情况
+export const countyWaterQualityUpUrl = '/drinkingWater/drinkingWater/getWaterQualityStandard';
+export const countyWaterQualityUpData = function (data) {
+    return axios.post(countyWaterQualityUpUrl,data)
+}
 
 
 // 农村
@@ -81,3 +92,15 @@ export const villageAnalysePageUrl = '/drinkingWaterVillage/drinkingWaterVillage
 export const villageAnalysePageData = function (data) {
     return axios.post(villageAnalysePageUrl,data)
 }
+
+//农村—水质类别
+export const villageWaterQualityUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterQualityCategoryVillage';
+export const villageWaterQualityData = function (data) {
+    return axios.post(villageWaterQualityUrl,data)
+}
+
+//农村—水质达标情况
+export const villageWaterQualityUpUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterQualityStandard';
+export const villageWaterQualityUpData = function (data) {
+    return axios.post(villageWaterQualityUpUrl,data)
+}
\ No newline at end of file
diff --git a/src/views/water/drinking-water/statistic/city/base.vue b/src/views/water/drinking-water/statistic/city/base.vue
index 7ddb94a..16f8534 100644
--- a/src/views/water/drinking-water/statistic/city/base.vue
+++ b/src/views/water/drinking-water/statistic/city/base.vue
@@ -19,6 +19,7 @@
         row-key="drinkingWaterId"
         :datasource="datasource"
         :columns="columns"
+        :total="count"
         :where="where"
         :scroll="{ x: 'max-content' }"
         @done="(d) => (data = d.data)"
diff --git a/src/views/water/drinking-water/statistic/city/index.vue b/src/views/water/drinking-water/statistic/city/index.vue
index 600fad7..fd495f3 100644
--- a/src/views/water/drinking-water/statistic/city/index.vue
+++ b/src/views/water/drinking-water/statistic/city/index.vue
@@ -52,7 +52,6 @@
   // 水质达标情况
   import waterQualityUp from "./waterQualityUp.vue";
   //综合营养指数
-
   import waterNutritional from "./waterNutritional.vue"
 
 
diff --git a/src/views/water/drinking-water/statistic/city/waterQuality.vue b/src/views/water/drinking-water/statistic/city/waterQuality.vue
index 0841d6c..6a99bff 100644
--- a/src/views/water/drinking-water/statistic/city/waterQuality.vue
+++ b/src/views/water/drinking-water/statistic/city/waterQuality.vue
@@ -73,13 +73,13 @@ export default {
       selection: [],
       columns:[
         {title:"城市名称",dataIndex:"city",},
-        {title:"水源地名称",dataIndex:"place",},
+        {title:"水源地名称",dataIndex:"sourceWaterName",},
         {title:"期数",dataIndex:"sourceWaterName",},
         {title:"水源地性质",dataIndex:"waterSourceProperty",},
         {title:"断面水质",align: 'center',children: [
-              {title: "本月", dataIndex: ""},
-              {title: "上月", dataIndex: ""},
-              {title: "去年同期", dataIndex: ""},
+              {title: "本月", dataIndex: "waterQualityCategory"},
+              {title: "上月", dataIndex: "waterQualityCategoryMom"},
+              {title: "去年同期", dataIndex: "waterQualityCategoryYoy"},
             ]
         },
         {title:"主要污染指标",dataIndex:"",},
@@ -89,7 +89,7 @@ export default {
       // 表格列配置
       
     
-      // 表格搜索条件
+      // 表格搜索条件 
       where: {
         checked: 1,
       },
diff --git a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
index 6659b2b..42bf3e9 100644
--- a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
@@ -72,12 +72,12 @@ export default {
       datasource:{},
       selection: [],
       columns:[
-        {title:"断面名称",dataIndex:"city",},
-        {title:"时间",dataIndex:"place",},
-        {title:"水质目标",dataIndex:"sourceWaterName",},
-        {title:"水质类别",dataIndex:"waterSourceProperty",},
-        {title: "达标情况", dataIndex: ""},
-        {title: "达标率", dataIndex: ""},
+        {title:"断面名称",dataIndex:"sectionName",},
+        {title:"时间",dataIndex:"time",},
+        {title:"水质目标",dataIndex:"waterTarget",},
+        {title:"水质类别",dataIndex:"waterQualityCategory",},
+        {title: "达标情况", dataIndex: "standard"},
+        {title: "达标率", dataIndex: "standardRate"},
         // {title:"达标情况",align: 'center',children: [
         //       {title: "达标情况", dataIndex: ""},
         //       {title: "达标率", dataIndex: ""},
@@ -112,7 +112,12 @@ export default {
                 this.$message.error(res.data.msg);
                 this.datasource = []
             }else{
-                this.datasource = res.data.data
+              let newData = []
+              const resData = res.data.data || {}
+              for(let i in resData){
+                newData.push(resData[i])
+              }
+              this.datasource = newData
             }
         }).catch(()=>{
                 this.loading = false;
diff --git a/src/views/water/drinking-water/statistic/countryside/index.vue b/src/views/water/drinking-water/statistic/countryside/index.vue
index e70ee68..b89c0b1 100644
--- a/src/views/water/drinking-water/statistic/countryside/index.vue
+++ b/src/views/water/drinking-water/statistic/countryside/index.vue
@@ -4,6 +4,15 @@
             <a-tab-pane tab="监测数据报送表" key="base" >
               <base-statistic :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base'"></base-statistic>
             </a-tab-pane>
+
+            <a-tab-pane tab="水质类别" key="base2" >
+              <water-quality :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base2'"></water-quality>
+            </a-tab-pane>
+
+            <a-tab-pane tab="水质达标情况" key="base8" >
+              <water-quality-up :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base8'"></water-quality-up>
+            </a-tab-pane>
+
             <!-- <a-tab-pane tab="报送情况说明表" key="base1">
               <county-appraise  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base1'"></county-appraise>
             </a-tab-pane>
@@ -13,16 +22,12 @@
             <a-tab-pane tab="超标评价" key="base4">
               <county-over-standard  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base4'"></county-over-standard>
             </a-tab-pane> -->
-            <!--<a-tab-pane tab="水质类别" key="base2" >
-              <city-water-quality :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base2'"></city-water-quality>
-            </a-tab-pane>
+            <!--
 
             <a-tab-pane tab="水质统计" key="base7" >
               <water-quality-count :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base7'"></water-quality-count>
             </a-tab-pane>
-            <a-tab-pane tab="水质达标情况" key="base8" >
-              <water-quality-up :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base8'"></water-quality-up>
-            </a-tab-pane>
+            
             <a-tab-pane tab="备用水源营养指数" key="base5">
               <water-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base5'"></water-nutritional>
             </a-tab-pane> -->
@@ -45,12 +50,12 @@
   // import countyWaterWithdrawal from "./waterCount.vue"
   // // 超标评价
   // import countyOverStandard from './overStandard.vue'
-//   // 水质类别
-//   import cityWaterQuality from "./waterQuality.vue"
+  // 水质类别
+  import waterQuality from "./waterQuality.vue"
 //   // 水质统计
 //   import waterQualityCount from "./waterQualityCount.vue";
-//   // 水质达标情况
-//   import waterQualityUp from "./waterQualityUp.vue";
+  // 水质达标情况
+  import waterQualityUp from "./waterQualityUp.vue";
 //   //综合营养指数
 
 //   import waterNutritional from "./waterNutritional.vue"
@@ -64,9 +69,9 @@
     components: {
       BaseStatistic,
       // countyAppraise,
-    //   cityWaterQuality,
+      waterQuality,
     //   waterQualityCount,
-    //   waterQualityUp,
+      waterQualityUp,
     //   waterNutritional,
       // countyWaterWithdrawal,
       // countyOverStandard
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue
new file mode 100644
index 0000000..167d604
--- /dev/null
+++ b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue
@@ -0,0 +1,183 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+      <search
+        :searchForm="searchForm"
+        :filterKeys="filterKeys"
+        @search="searchData"
+        @exportFile="exportFile"
+        @filterColumns="changeFilter"
+        :visiable="visiable"
+        :loading="loading"
+      />
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="drinkingWaterId"
+        :datasource="datasource"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+import XLSX from "xlsx";
+
+import {
+  villageWaterQualityData
+} from "@/api/ecology/new-drinking-water";
+
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+
+import Search from "./../components/countySideSeatch.vue";
+
+export default {
+  name: "waterQuality",
+  components: {
+    Search
+  },
+  props:{
+      // 表格搜索条件
+      searchForm:{
+          typeof:Object,
+          default: function () {
+              return {}
+          },
+      },
+      filterKeys:{
+          typeof:Object,
+          default: function () {
+              return []
+          },
+      },
+    visiable:{
+        typeof:Boolean
+    }
+  },
+  
+  data() {
+    return {
+      data: [],
+      locale,
+      bill: {},
+      // 表格数据接口
+      datasource:{},
+      selection: [],
+      columns:[
+        {title:"城市名称",dataIndex:"city",},
+        {title:"水源地名称",dataIndex:"sourceWaterName",},
+        {title:"期数",dataIndex:"sourceWaterName",},
+        {title:"水源地性质",dataIndex:"waterSourceProperty",},
+        {title:"断面水质",align: 'center',children: [
+              {title: "本月", dataIndex: "waterQualityCategory"},
+              {title: "上月", dataIndex: "waterQualityCategoryMom"},
+              {title: "去年同期", dataIndex: "waterQualityCategoryYoy"},
+            ]
+        },
+        {title:"主要污染指标",dataIndex:"",},
+      ],
+        
+      
+      // 表格列配置
+      
+    
+      // 表格搜索条件 
+      where: {
+        checked: 1,
+      },
+      // 表格选中数据
+      selectionList: [],
+      loading:false
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    
+    // 获取列表数据
+    getPageData(){
+            this.loading = true;
+        villageWaterQualityData(this.where).then(res=>{
+                this.loading = false;
+            if(res.data.code){
+                this.$message.error(res.data.msg);
+                this.datasource = []
+            }else{
+                this.datasource = res.data.data
+            }
+        }).catch(()=>{
+                this.loading = false;
+        })
+    },
+
+    JumpFieldClick(record, column) {
+        console.log(column.dataIndex)
+      },
+
+          // 执行搜索
+    searchData(data){
+        this.where = data;
+        this.$emit("search", this.where);
+        this.reload();
+    },
+
+    /* 刷新表格 */
+    reload() {
+      this.getPageData()
+      // this.$refs.table.reload({
+      //   where: this.where,
+      // });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        checked: 1,
+      };
+      this.reload();
+    },
+
+    exportFile() {
+      const columns = [...this.columns];
+      const arr = [];
+      let th1 = []
+      let th2 = []
+      const sColumns = []
+      columns.forEach(item=>{
+        th1.push(item.title)
+        if(Array.isArray(item.children) && item.children.length>0){
+          item.children.forEach(single=>{
+            th1.push('')
+            th2.push(single.title)
+            sColumns.push({dataIndex:single.dataIndex})
+          })
+        }else{
+            th2.push('')
+             sColumns.push({dataIndex:item.dataIndex})
+        }
+      })
+      arr.push(th1)
+      arr.push(th2)
+      this.datasource.forEach((d) => {
+        const td = sColumns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+
+
+
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
new file mode 100644
index 0000000..115e9ca
--- /dev/null
+++ b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+      <search
+        :searchForm="searchForm"
+        :filterKeys="filterKeys"
+        @search="searchData"
+        @exportFile="exportFile"
+        @filterColumns="changeFilter"
+        :visiable="visiable"
+        :loading="loading"
+      />
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="drinkingWaterId"
+        :datasource="datasource"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+import XLSX from "xlsx";
+
+import {
+  villageWaterQualityUpData
+} from "@/api/ecology/new-drinking-water";
+
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+
+import Search from "./../components/countySideSeatch.vue";
+
+export default {
+  name: "waterQuality",
+  components: {
+    Search
+  },
+  props:{
+      // 表格搜索条件
+      searchForm:{
+          typeof:Object,
+          default: function () {
+              return {}
+          },
+      },
+      filterKeys:{
+          typeof:Object,
+          default: function () {
+              return []
+          },
+      },
+    visiable:{
+        typeof:Boolean
+    }
+  },
+  
+  data() {
+    return {
+      data: [],
+      locale,
+      bill: {},
+      // 表格数据接口
+      datasource:{},
+      selection: [],
+      columns:[
+        {title:"断面名称",dataIndex:"sectionName",},
+        {title:"时间",dataIndex:"time",},
+        {title:"水质目标",dataIndex:"waterTarget",},
+        {title:"水质类别",dataIndex:"waterQualityCategory",},
+        {title: "达标情况", dataIndex: "standard"},
+        {title: "达标率", dataIndex: "standardRate"},
+      ],
+        
+      
+      // 表格列配置
+      
+    
+      // 表格搜索条件
+      where: {
+        checked: 1,
+      },
+      // 表格选中数据
+      selectionList: [],
+      loading:false
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    
+    // 获取列表数据
+    getPageData(){
+            this.loading = true;
+        villageWaterQualityUpData(this.where).then(res=>{
+                this.loading = false;
+            if(res.data.code){
+                this.$message.error(res.data.msg);
+                this.datasource = []
+            }else{
+              let newData = []
+              const resData = res.data.data || {}
+              for(let i in resData){
+                newData.push(resData[i])
+              }
+              this.datasource = newData
+            }
+        }).catch(()=>{
+                this.loading = false;
+        })
+    },
+
+    JumpFieldClick(record, column) {
+        console.log(column.dataIndex)
+      },
+
+          // 执行搜索
+    searchData(data){
+        this.where = data;
+        this.$emit("search", this.where);
+        this.reload();
+    },
+
+    /* 刷新表格 */
+    reload() {
+      this.getPageData()
+      // this.$refs.table.reload({
+      //   where: this.where,
+      // });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        checked: 1,
+      };
+      this.reload();
+    },
+    exportFile() {
+      const columns = [
+         ...this.columns,
+      ];
+      const arr = [];
+      const th = columns.map((item) => item.title);
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = columns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>
diff --git a/src/views/water/drinking-water/statistic/county/index.vue b/src/views/water/drinking-water/statistic/county/index.vue
index e3ddcc1..2af25d3 100644
--- a/src/views/water/drinking-water/statistic/county/index.vue
+++ b/src/views/water/drinking-water/statistic/county/index.vue
@@ -13,16 +13,21 @@
             <a-tab-pane tab="超标评价" key="base4">
               <county-over-standard  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base4'"></county-over-standard>
             </a-tab-pane>
-            <!--<a-tab-pane tab="水质类别" key="base2" >
-              <city-water-quality :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base2'"></city-water-quality>
+
+            <a-tab-pane tab="水质类别" key="base2" >
+              <water-quality :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base2'"></water-quality>
             </a-tab-pane>
 
+            <a-tab-pane tab="水质达标情况" key="base8" >
+              <water-quality-up :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base8'"></water-quality-up>
+            </a-tab-pane>
+
+            <!--
+
             <a-tab-pane tab="水质统计" key="base7" >
               <water-quality-count :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base7'"></water-quality-count>
             </a-tab-pane>
-            <a-tab-pane tab="水质达标情况" key="base8" >
-              <water-quality-up :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base8'"></water-quality-up>
-            </a-tab-pane>
+            
             <a-tab-pane tab="备用水源营养指数" key="base5">
               <water-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base5'"></water-nutritional>
             </a-tab-pane> -->
@@ -45,12 +50,12 @@
   import countyWaterWithdrawal from "./waterCount.vue"
   // 超标评价
   import countyOverStandard from './overStandard.vue'
-//   // 水质类别
-//   import cityWaterQuality from "./waterQuality.vue"
+  // 水质类别
+  import waterQuality from "./waterQuality.vue"
 //   // 水质统计
 //   import waterQualityCount from "./waterQualityCount.vue";
-//   // 水质达标情况
-//   import waterQualityUp from "./waterQualityUp.vue";
+  // 水质达标情况
+  import waterQualityUp from "./waterQualityUp.vue";
 //   //综合营养指数
 
 //   import waterNutritional from "./waterNutritional.vue"
@@ -64,9 +69,9 @@
     components: {
       BaseStatistic,
       countyAppraise,
-    //   cityWaterQuality,
+      waterQuality,
     //   waterQualityCount,
-    //   waterQualityUp,
+      waterQualityUp,
     //   waterNutritional,
       countyWaterWithdrawal,
       countyOverStandard
diff --git a/src/views/water/drinking-water/statistic/county/waterQuality.vue b/src/views/water/drinking-water/statistic/county/waterQuality.vue
new file mode 100644
index 0000000..2856b4a
--- /dev/null
+++ b/src/views/water/drinking-water/statistic/county/waterQuality.vue
@@ -0,0 +1,183 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+      <search
+        :searchForm="searchForm"
+        :filterKeys="filterKeys"
+        @search="searchData"
+        @exportFile="exportFile"
+        @filterColumns="changeFilter"
+        :visiable="visiable"
+        :loading="loading"
+      />
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="drinkingWaterId"
+        :datasource="datasource"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+import XLSX from "xlsx";
+
+import {
+  countyWaterQualityData
+} from "@/api/ecology/new-drinking-water";
+
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+
+import Search from "./../components/countySearch.vue";
+
+export default {
+  name: "waterQuality",
+  components: {
+    Search
+  },
+  props:{
+      // 表格搜索条件
+      searchForm:{
+          typeof:Object,
+          default: function () {
+              return {}
+          },
+      },
+      filterKeys:{
+          typeof:Object,
+          default: function () {
+              return []
+          },
+      },
+    visiable:{
+        typeof:Boolean
+    }
+  },
+  
+  data() {
+    return {
+      data: [],
+      locale,
+      bill: {},
+      // 表格数据接口
+      datasource:{},
+      selection: [],
+      columns:[
+        {title:"城市名称",dataIndex:"city",},
+        {title:"水源地名称",dataIndex:"sourceWaterName",},
+        {title:"期数",dataIndex:"sourceWaterName",},
+        {title:"水源地性质",dataIndex:"waterSourceProperty",},
+        {title:"断面水质",align: 'center',children: [
+              {title: "本月", dataIndex: "waterQualityCategory"},
+              {title: "上月", dataIndex: "waterQualityCategoryMom"},
+              {title: "去年同期", dataIndex: "waterQualityCategoryYoy"},
+            ]
+        },
+        {title:"主要污染指标",dataIndex:"",},
+      ],
+        
+      
+      // 表格列配置
+      
+    
+      // 表格搜索条件 
+      where: {
+        checked: 1,
+      },
+      // 表格选中数据
+      selectionList: [],
+      loading:false
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    
+    // 获取列表数据
+    getPageData(){
+            this.loading = true;
+        countyWaterQualityData(this.where).then(res=>{
+                this.loading = false;
+            if(res.data.code){
+                this.$message.error(res.data.msg);
+                this.datasource = []
+            }else{
+                this.datasource = res.data.data
+            }
+        }).catch(()=>{
+                this.loading = false;
+        })
+    },
+
+    JumpFieldClick(record, column) {
+        console.log(column.dataIndex)
+      },
+
+          // 执行搜索
+    searchData(data){
+        this.where = data;
+        this.$emit("search", this.where);
+        this.reload();
+    },
+
+    /* 刷新表格 */
+    reload() {
+      this.getPageData()
+      // this.$refs.table.reload({
+      //   where: this.where,
+      // });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        checked: 1,
+      };
+      this.reload();
+    },
+
+    exportFile() {
+      const columns = [...this.columns];
+      const arr = [];
+      let th1 = []
+      let th2 = []
+      const sColumns = []
+      columns.forEach(item=>{
+        th1.push(item.title)
+        if(Array.isArray(item.children) && item.children.length>0){
+          item.children.forEach(single=>{
+            th1.push('')
+            th2.push(single.title)
+            sColumns.push({dataIndex:single.dataIndex})
+          })
+        }else{
+            th2.push('')
+             sColumns.push({dataIndex:item.dataIndex})
+        }
+      })
+      arr.push(th1)
+      arr.push(th2)
+      this.datasource.forEach((d) => {
+        const td = sColumns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+
+
+
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>
diff --git a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
new file mode 100644
index 0000000..f3aa4e1
--- /dev/null
+++ b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+      <search
+        :searchForm="searchForm"
+        :filterKeys="filterKeys"
+        @search="searchData"
+        @exportFile="exportFile"
+        @filterColumns="changeFilter"
+        :visiable="visiable"
+        :loading="loading"
+      />
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="drinkingWaterId"
+        :datasource="datasource"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+import XLSX from "xlsx";
+
+import {
+  countyWaterQualityUpData
+} from "@/api/ecology/new-drinking-water";
+
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+
+import Search from "./../components/countySearch.vue";
+
+export default {
+  name: "waterQuality",
+  components: {
+    Search
+  },
+  props:{
+      // 表格搜索条件
+      searchForm:{
+          typeof:Object,
+          default: function () {
+              return {}
+          },
+      },
+      filterKeys:{
+          typeof:Object,
+          default: function () {
+              return []
+          },
+      },
+    visiable:{
+        typeof:Boolean
+    }
+  },
+  
+  data() {
+    return {
+      data: [],
+      locale,
+      bill: {},
+      // 表格数据接口
+      datasource:{},
+      selection: [],
+      columns:[
+        {title:"断面名称",dataIndex:"sectionName",},
+        {title:"时间",dataIndex:"time",},
+        {title:"水质目标",dataIndex:"waterTarget",},
+        {title:"水质类别",dataIndex:"waterQualityCategory",},
+        {title: "达标情况", dataIndex: "standard"},
+        {title: "达标率", dataIndex: "standardRate"},
+        // {title:"达标情况",align: 'center',children: [
+        //       {title: "达标情况", dataIndex: ""},
+        //       {title: "达标率", dataIndex: ""},
+        //       {title: "去年同期", dataIndex: ""},
+        //     ]
+        // },
+      ],
+        
+      
+      // 表格列配置
+      
+    
+      // 表格搜索条件
+      where: {
+        checked: 1,
+      },
+      // 表格选中数据
+      selectionList: [],
+      loading:false
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    
+    // 获取列表数据
+    getPageData(){
+            this.loading = true;
+        countyWaterQualityUpData(this.where).then(res=>{
+                this.loading = false;
+            if(res.data.code){
+                this.$message.error(res.data.msg);
+                this.datasource = []
+            }else{
+              let newData = []
+              const resData = res.data.data || {}
+              for(let i in resData){
+                newData.push(resData[i])
+              }
+              this.datasource = newData
+            }
+        }).catch(()=>{
+                this.loading = false;
+        })
+    },
+
+    JumpFieldClick(record, column) {
+        console.log(column.dataIndex)
+      },
+
+          // 执行搜索
+    searchData(data){
+        this.where = data;
+        this.$emit("search", this.where);
+        this.reload();
+    },
+
+    /* 刷新表格 */
+    reload() {
+      this.getPageData()
+      // this.$refs.table.reload({
+      //   where: this.where,
+      // });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        checked: 1,
+      };
+      this.reload();
+    },
+    exportFile() {
+      const columns = [
+         ...this.columns,
+      ];
+      const arr = [];
+      const th = columns.map((item) => item.title);
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = columns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>

From ada1fb7749d2a1468a5826871775ecc8e5391095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Tue, 14 Dec 2021 15:16:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=8D=86?=
 =?UTF-8?q?=E7=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/drinking-water/statistic/city/base.vue  | 6 ++++--
 src/views/water/drinking-water/statistic/colums/base.js | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/base.vue b/src/views/water/drinking-water/statistic/city/base.vue
index 16f8534..7decdba 100644
--- a/src/views/water/drinking-water/statistic/city/base.vue
+++ b/src/views/water/drinking-water/statistic/city/base.vue
@@ -19,10 +19,10 @@
         row-key="drinkingWaterId"
         :datasource="datasource"
         :columns="columns"
-        :total="count"
         :where="where"
         :scroll="{ x: 'max-content' }"
         @done="(d) => (data = d.data)"
+        @change="handleTableChange"
       >
       <template #footer>
         <div class="footer">
@@ -124,7 +124,9 @@ export default {
     // this.loadOptionData();
   },
   methods: {
-
+        handleTableChange(page){
+          console.log(page)
+        },
         // 获取列表数据
         getPageData(){
             this.loading = true;
diff --git a/src/views/water/drinking-water/statistic/colums/base.js b/src/views/water/drinking-water/statistic/colums/base.js
index 044d8cd..04005c1 100644
--- a/src/views/water/drinking-water/statistic/colums/base.js
+++ b/src/views/water/drinking-water/statistic/colums/base.js
@@ -1,4 +1,4 @@
-import moment from "moment"
+// import moment from "moment"
 //市级数据总览表格
 
 export const filterColumns = [
@@ -147,7 +147,8 @@ const tableColumns = [
     { title: "取水点经度", dataIndex: "longitude", sorter: true, },
     { title: "取水点纬度", dataIndex: "latitude", sorter: true, },
     { title: "本月取水量", dataIndex: "waterWithdrawal", sorter: true, },
-    { title: "采样时间", dataIndex: "reportTime", sorter: true, customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
+    // { title: "采样时间", dataIndex: "reportTime", sorter: true, customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
+    { title: "采样时间", dataIndex: "reportTime", sorter: true,},
     { title: "水期代码", dataIndex: "waterPhaseCode",sorter: true, 
         slots:{customRender:'waterCode' }
     },
@@ -301,7 +302,7 @@ const tableColumns2 = [
     { title: "取水点经度", dataIndex: "longitude", sorter: true, },
     { title: "取水点纬度", dataIndex: "latitude", sorter: true, },
     { title: "本月取水量", dataIndex: "waterWithdrawal", sorter: true, },
-    { title: "采样时间", dataIndex: "reportTime", sorter: true, customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
+    { title: "采样时间", dataIndex: "reportTime", sorter: true},
     { title: "水期代码", dataIndex: "waterPhaseCode",sorter: true, 
         slots:{customRender:'waterCode' }
     },