From fe1e0a71d4bd1fbcfd9456de668e6a0f12873df8 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: Mon, 10 Jan 2022 09:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=9F=E6=B2=B3=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistic/city/situation.vue              |  2 +-
 .../statistic/county/situation.vue            | 20 +++++-
 src/views/water/lake/collect/index.vue        | 15 ++++
 .../river-station/statistic/site-day-avg.vue  | 45 ++++++++++--
 .../water/river-station/statistic/site.vue    | 41 +++++++++--
 src/views/water/river/statistic/avg-index.vue | 50 ++++++++++++-
 .../water/river/statistic/avg-standard.vue    | 51 ++++++++++++-
 .../water/river/statistic/base-index.vue      | 49 ++++++++++++-
 .../water/river/statistic/base-standard.vue   | 50 ++++++++++++-
 src/views/water/river/statistic/base.vue      | 72 +++++++++++++++----
 src/views/water/river/statistic/index.vue     | 57 ++++++++++-----
 .../statistic/auto-standard.vue               | 54 ++++++++++++--
 .../statistic/auto-yoy.vue                    | 59 ++++++++++++---
 .../water-function-area/statistic/auto.vue    | 52 ++++++++++++--
 .../statistic/national-standard.vue           | 54 ++++++++++++--
 .../statistic/national-yoy.vue                | 60 +++++++++++++---
 .../statistic/national.vue                    | 54 +++++++++++---
 17 files changed, 685 insertions(+), 100 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/situation.vue b/src/views/water/drinking-water/statistic/city/situation.vue
index 9313a27..bc4110a 100644
--- a/src/views/water/drinking-water/statistic/city/situation.vue
+++ b/src/views/water/drinking-water/statistic/city/situation.vue
@@ -61,7 +61,7 @@
         <template #desc="{ text, record ,index }">
             <div class="editable-cell">
                 <div v-if="editableData[index] && editableData[index].edable=='reason'" class="editable-cell-input-wrapper">
-                  <a-input class="edit-input" v-model:value="editableData[index]['reason']" @pressEnter="save(index)" />
+                  <a-textarea 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">
diff --git a/src/views/water/drinking-water/statistic/county/situation.vue b/src/views/water/drinking-water/statistic/county/situation.vue
index 2687207..755fcce 100644
--- a/src/views/water/drinking-water/statistic/county/situation.vue
+++ b/src/views/water/drinking-water/statistic/county/situation.vue
@@ -19,6 +19,19 @@
             {{text="市区"}}
           </template>
 
+          <template #checknumber="{ text, record ,index }">
+            <div class="editable-cell">
+                <div v-if="editableData[index] && editableData[index].edable=='index1'" class="editable-cell-input-wrapper">
+                  <a-input class="edit-input" v-model:value="editableData[index]['index1']" @pressEnter="save(index)" />
+                  <check-outlined class="editable-cell-icon-check" @click="save(index)" />
+                </div>
+                <div v-else class="editable-cell-text-wrapper">
+                    {{ (Array.isArray(text)? text[0]: text) || ' ' }}
+                    <edit-outlined class="editable-cell-icon" @click="edit(record,index,'index1')" />
+                </div>
+            </div>
+        </template>
+
         <template #enumber="{ text, record ,index }">
             <div class="editable-cell">
                 <div v-if="editableData[index] && editableData[index].edable=='index3'" class="editable-cell-input-wrapper">
@@ -48,7 +61,7 @@
         <template #desc="{ text, record ,index }">
             <div class="editable-cell">
                 <div v-if="editableData[index] && editableData[index].edable=='index6'" class="editable-cell-input-wrapper">
-                  <a-input class="edit-input" v-model:value="editableData[index]['index6']" @pressEnter="save(index)" />
+                  <a-textarea class="edit-input" v-model:value="editableData[index]['index6']" @pressEnter="save(index)" />
                   <check-outlined class="editable-cell-icon-check" @click="save(index)" />
                 </div>
                 <div v-else class="editable-cell-text-wrapper">
@@ -134,7 +147,9 @@ export default {
         {title:"类型",dataIndex:"waterSourceProperty",},
         {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',slots: {
+          customRender: 'checknumber',
+            } },
         {title:"未测个数",dataIndex:"noCheckNum",},
         {title:"独立分析项目个数",dataIndex:"index3",
          slots: {
@@ -227,6 +242,7 @@ export default {
       this.getPageData()
       
         this.columns[6].filters = []
+        this.columns[6].filterMultiple = false
         if(this.where.waterSourceType ==1 ){
           // 地表水
           this.columns[6].filters =  [
diff --git a/src/views/water/lake/collect/index.vue b/src/views/water/lake/collect/index.vue
index 47aa459..f99f187 100644
--- a/src/views/water/lake/collect/index.vue
+++ b/src/views/water/lake/collect/index.vue
@@ -137,12 +137,17 @@ export default {
         /* 导入本地excel文件 */
         importFileCity(file,hide){
             const formData = new FormData();
+            const _this = this;
             formData.append('file', file);
             importCityOther(formData).then(res=>{
                 console.log(res)
                 if(!res.data.code){
                     Modal.success({  title:res.data.msg, });
                     this.reload()
+                    _this.$refs.water && _this.$refs.water.reload();
+                    _this.$router.replace({
+                            path: "/water/lake/collect/water/" + res.data.data.id
+                        })
                 }else{
                     Modal.error({  title:res.data.msg || '文件导入失败', });
                 }
@@ -189,12 +194,17 @@ export default {
 
         importWuXiang(file,hide){
             const formData = new FormData();
+            const _this = this;
             formData.append('file', file);
             importCppointCity(formData).then(res=>{
                 console.log(res)
                  if(!res.data.code){
                         Modal.success({  title:res.data.msg, });
                         this.reload()
+                        _this.$refs.water && _this.$refs.water.reload();
+                        _this.$router.replace({
+                                path: "/water/lake/collect/water/" + res.data.data.id
+                            })
                     }else{
                         Modal.error({  title:res.data.msg || '文件导入失败', });
                     }
@@ -238,11 +248,16 @@ export default {
 
         importSpecialFile(file,hide){
             const formData = new FormData();
+            const _this = this;
             formData.append('file', file);
                 importSpecial(formData).then(res=>{
                      if(!res.data.code){
                         Modal.success({  title:res.data.msg, });
                         this.reload()
+                        _this.$refs.special && _this.$refs.special.reload();
+                        _this.$router.replace({
+                                path: "/water/lake/collect/special-water/" + res.data.data.id
+                            })
                     }else{
                         Modal.error({  title:res.data.msg || '文件导入失败', });
                     }
diff --git a/src/views/water/river-station/statistic/site-day-avg.vue b/src/views/water/river-station/statistic/site-day-avg.vue
index 92ca2a1..61b99ac 100644
--- a/src/views/water/river-station/statistic/site-day-avg.vue
+++ b/src/views/water/river-station/statistic/site-day-avg.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
              <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.stationName" :value="item.stationName">
@@ -13,17 +13,21 @@
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.time" :disabled-date="disabledDate" />
           </a-form-item>
-          <a-form-item label="类型:" style="width:100px">
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="类型:">
             <a-select v-model:value="where.type" allowClear showSearch>
               <a-select-option value="0">上半月</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-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -41,7 +45,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -63,6 +66,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -292,7 +307,23 @@
         rules: {},
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.time){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.time){
+        this.reload()
+      }
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
@@ -306,6 +337,9 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+        this.$emit("search", this.where);
+
         this.loading = true;
         listWaterSiteMonthTotal(this.where).then((res) => {
           this.datasource = {};
@@ -381,4 +415,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/river-station/statistic/site.vue b/src/views/water/river-station/statistic/site.vue
index fd9a0f8..5112af4 100644
--- a/src/views/water/river-station/statistic/site.vue
+++ b/src/views/water/river-station/statistic/site.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
            <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.stationName" :value="item.stationName">
@@ -13,6 +13,8 @@
               </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-month-picker
               v-model:value="where.time"
@@ -20,13 +22,16 @@
               valueFormat="YYYY-MM"
             />
           </a-form-item>
-          <a-form-item label="类型:" style="width:100px"> 
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="类型:"> 
             <a-select v-model:value="where.type" allowClear showSearch>
               <a-select-option value="0">上半月</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-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -48,7 +53,6 @@
         :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
       </ele-pro-table>
     </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -69,6 +73,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -171,6 +187,17 @@
         rules: {},
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.time){
+          this.reload()
+        }
+      }
+    },
     created() {
       listInfo().then((res) => {
         if (res.data.code == 0) {
@@ -185,6 +212,9 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+        this.$emit("search", this.where);
+        
         this.loading = true;
         listWaterSiteYoy(this.where).then((res) => {
           this.momData = [];
@@ -315,4 +345,7 @@
 </script>
 
 <style scoped lang="less">
-</style>
+.ant-calendar-picker{
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/water/river/statistic/avg-index.vue b/src/views/water/river/statistic/avg-index.vue
index f274154..d78e07f 100644
--- a/src/views/water/river/statistic/avg-index.vue
+++ b/src/views/water/river/statistic/avg-index.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,18 +13,24 @@
               </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.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
               <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
               </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.importWaterBody" placeholder="请选择水系名称" allowClear showSearch>
               <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
               </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 allow-clear mode="multiple" placeholder="请选择指标名称" v-model:value="where.targetName">
               <a-select-option v-for="item in targetInfoList" :key="item" :value="item">
@@ -32,12 +38,17 @@
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" :disabled-date="disabledDate" />
           </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="结束时间:">
             <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" :disabled-date="disabledDate" />
           </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -55,7 +66,6 @@
         @done="(d) => (data = d.data)">
       </ele-pro-table>
     </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -74,6 +84,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -131,7 +153,24 @@
         targetInfoList:[],
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
@@ -162,6 +201,9 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+         this.$emit("search", this.where);
+
         this.loading=true;
         listAvgCompositeIndex(this.where).then((res) => {
           this.momData = [];
@@ -239,4 +281,8 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
+
diff --git a/src/views/water/river/statistic/avg-standard.vue b/src/views/water/river/statistic/avg-standard.vue
index 362327c..b0e2a86 100644
--- a/src/views/water/river/statistic/avg-standard.vue
+++ b/src/views/water/river/statistic/avg-standard.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,18 +13,24 @@
               </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.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
               <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
               </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.importWaterBody" placeholder="请选择水系名称" allowClear showSearch>
               <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
               </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 allow-clear mode="multiple" placeholder="请选择指标名称" v-model:value="where.targetName">
               <a-select-option v-for="item in targetInfoList" :key="item" :value="item">
@@ -32,13 +38,17 @@
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" :disabled-date="disabledDate" />
           </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="结束时间:">
             <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" :disabled-date="disabledDate" />
           </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -56,7 +66,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -74,6 +83,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -133,7 +154,25 @@
         targetInfoList:[],
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        console.log('change',val)
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.startTime && this.where.endTime){
+        this.reload()
+      }
+
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
@@ -164,6 +203,9 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+         this.$emit("search", this.where);
+
         this.loading = true;
         listAvgWaterQualitySandard(this.where).then((res) => {
           console.log(res.data.data);
@@ -208,4 +250,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/river/statistic/base-index.vue b/src/views/water/river/statistic/base-index.vue
index 40fe361..ec7dbe1 100644
--- a/src/views/water/river/statistic/base-index.vue
+++ b/src/views/water/river/statistic/base-index.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,18 +13,24 @@
               </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.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
               <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
               </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.importWaterBody" placeholder="请选择水系名称" allowClear showSearch>
               <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
               </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 allow-clear mode="multiple" placeholder="请选择指标名称" v-model:value="where.targetName">
               <a-select-option v-for="item in targetInfoList" :key="item" :value="item">
@@ -32,12 +38,17 @@
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" :disabled-date="disabledDate" />
           </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="结束时间:">
             <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" :disabled-date="disabledDate" />
           </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -55,7 +66,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -74,6 +84,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -136,7 +158,24 @@
         targetInfoList: [],
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.startTime && this.where.endTime){
+        this.reload()
+      }
+
       listInfo().then((res) => {
           if (res.data.code == 0) {
             console.log(res.data.data)
@@ -167,6 +206,9 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+         this.$emit("search", this.where);
+
         this.loading = true;
         listMonthCompositeIndex(this.where).then((res) => {
           console.log(res.data.data);
@@ -245,4 +287,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/river/statistic/base-standard.vue b/src/views/water/river/statistic/base-standard.vue
index dc08692..51acf20 100644
--- a/src/views/water/river/statistic/base-standard.vue
+++ b/src/views/water/river/statistic/base-standard.vue
@@ -1,11 +1,11 @@
 <!-- 当月水质目标-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,18 +13,24 @@
               </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.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
               <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
               </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.importWaterBody" placeholder="请选择水系名称"  allowClear showSearch>
               <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
               </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 allow-clear mode="multiple" placeholder="请选择指标名称" v-model:value="where.targetName">
               <a-select-option v-for="item in targetInfoList" :key="item" :value="item">
@@ -32,13 +38,17 @@
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" :disabled-date="disabledDate" />
           </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="结束时间:">
             <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" :disabled-date="disabledDate" />
           </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -56,7 +66,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -74,6 +83,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -138,7 +159,24 @@
         targetInfoList:[],
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.startTime && this.where.endTime){
+        this.reload()
+      }
+
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
@@ -169,6 +207,9 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+         this.$emit("search", this.where);
+
         this.loading = true;
         listMonthWaterQualitySandard(this.where).then((res) => {
           console.log(res.data.data);
@@ -210,4 +251,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/river/statistic/base.vue b/src/views/water/river/statistic/base.vue
index 927904d..54cbda6 100644
--- a/src/views/water/river/statistic/base.vue
+++ b/src/views/water/river/statistic/base.vue
@@ -1,18 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
-      <a-form :model="where" layout="inline">
-
-        <a-form-item label="开始时间:">
-          <a-month-picker v-model:value="where.startTime" :disabled-date="disabledDate" valueFormat="YYYY-MM"
-            placeholder="开始时间" />
-        </a-form-item>
-        <a-form-item label="结束时间:">
-          <a-month-picker v-model:value="where.endTime" :disabled-date="disabledDate" valueFormat="YYYY-MM"
-            placeholder="结束时间" />
-        </a-form-item>
+      <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
+        :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
+        <a-row>
+<a-col :lg="6" :md="12" :sm="24" :xs="24">
         <a-form-item label="断面名称">
           <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
             <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -20,18 +13,24 @@
             </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.riverLakeLibrary" allowClear showSearch>
             <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
             </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.importWaterBody" allowClear showSearch>
             <a-select-option v-for="item in waterBodyList" :key="item">{{ item }}
             </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 allow-clear mode="multiple" placeholder="请选择指标名称" v-model:value="where.targetName">
             <a-select-option v-for="item in targetInfoList" :key="item" :value="item">
@@ -39,19 +38,34 @@
             </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-month-picker v-model:value="where.startTime" :disabled-date="disabledDate" valueFormat="YYYY-MM"
+            placeholder="开始时间" />
+        </a-form-item>
+</a-col>
+<a-col :lg="6" :md="12" :sm="24" :xs="24">
+        <a-form-item label="结束时间:">
+          <a-month-picker v-model:value="where.endTime" :disabled-date="disabledDate" valueFormat="YYYY-MM"
+            placeholder="结束时间" />
+        </a-form-item>
+</a-col>
+<a-col :lg="6" :md="12" :sm="24" :xs="24">
+  <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
         <a-space>
           <a-button type="primary" @click="reload">查询</a-button>
           <a-button @click="reset">重置</a-button>
           <a-button @click="exportFile">导出Excel</a-button>
         </a-space>
+  </a-form-item>
+</a-col>
+        </a-row>
       </a-form>
       <!-- 表格 -->
       <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>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -79,6 +93,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       const {
         billId
@@ -243,6 +269,17 @@
         datasource: {},
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     mounted() {
       const {
         billId
@@ -288,6 +325,10 @@
       loadOptionData() {},
       /* 刷新表格 */
       reload() {
+
+        // 上传搜索条件给父级
+         this.$emit("search", this.where);
+
         console.log(this.where.targetName);
         if (this.where.targetName) {
           if(this.flg){
@@ -506,4 +547,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/river/statistic/index.vue b/src/views/water/river/statistic/index.vue
index 1f1ff27..d27c088 100644
--- a/src/views/water/river/statistic/index.vue
+++ b/src/views/water/river/statistic/index.vue
@@ -3,49 +3,49 @@
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
         <a-tab-pane tab="江河信息" key="cca">
-          <a-tabs v-model:active="active">
+          <a-tabs v-model:activeKey="active">
             <a-tab-pane key="base" tab="数据总览">
-              <base-statistic></base-statistic>
+              <base-statistic :visiable="active=='base'" :searchForm="searchFormRiver" @search="changeSearchRiver"></base-statistic>
             </a-tab-pane>
             <a-tab-pane tab="单月水质达标" key="base1">
-              <month-standard ></month-standard>
+              <month-standard :visiable="active=='base1'" :searchForm="searchFormRiver" @search="changeSearchRiver"></month-standard>
             </a-tab-pane>
             <a-tab-pane tab="平均水质达标" key="base2">
-              <avg-standard></avg-standard>
+              <avg-standard :visiable="active=='base2'" :searchForm="searchFormRiver" @search="changeSearchRiver"></avg-standard>
             </a-tab-pane>
             <a-tab-pane tab="单月综合指数" key="base3">
-              <month-index ></month-index>
+              <month-index :visiable="active=='base3'" :searchForm="searchFormRiver" @search="changeSearchRiver"></month-index>
             </a-tab-pane>
             <a-tab-pane tab="平均水质指数" key="base4">
-              <avg-index ></avg-index>
+              <avg-index :visiable="active=='base4'" :searchForm="searchFormRiver" @search="changeSearchRiver"></avg-index>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
         <a-tab-pane tab="水功能区" key="ccb">
-          <a-tabs v-model:activeWater="activeWater">
+          <a-tabs v-model:activeKey="activeWater">
             <a-tab-pane tab="自治区级水功能区" key="water1">
-              <a-tabs v-model:autoWater="autoWater">
+              <a-tabs v-model:activeKey="autoWater">
                 <a-tab-pane tab="自治区级水功能区统计" key="auto1">
-                  <auto-statis></auto-statis>
+                  <auto-statis :visiable="autoWater=='auto1'" :searchForm="searchFormAutoWater" @search="changeSearchAutoWater"></auto-statis>
                 </a-tab-pane>
                 <a-tab-pane tab="自治区水功能区达标率" key="auto2">
-                  <auto-standard></auto-standard>
+                  <auto-standard :visiable="autoWater=='auto2'" :searchForm="searchFormAutoWater" @search="changeSearchAutoWater"></auto-standard>
                 </a-tab-pane>
                 <a-tab-pane tab="自治区水功能区同比/环比" key="auto3">
-                  <auto-yoy></auto-yoy>
+                  <auto-yoy :visiable="autoWater=='auto3'" :searchForm="searchFormAutoWater" @search="changeSearchAutoWater"></auto-yoy>
                 </a-tab-pane>
                 </a-tabs>
             </a-tab-pane>
             <a-tab-pane tab="国家级水功能区" key="water2">
-              <a-tabs v-model:nationalWater="nationalWater">
+              <a-tabs v-model:activeKey="nationalWater">
                 <a-tab-pane tab="国家级水功能区统计" key="national">
-                  <national-statis></national-statis>
+                  <national-statis :visiable="nationalWater=='national'" :searchForm="searchFormNationalWater" @search="changeSearchNationalWater"></national-statis>
                 </a-tab-pane>
                 <a-tab-pane tab="国家级水功能区达标率" key="national2">
-                  <national-standard></national-standard>
+                  <national-standard :visiable="nationalWater=='national2'" :searchForm="searchFormNationalWater" @search="changeSearchNationalWater"></national-standard>
                 </a-tab-pane>
                 <a-tab-pane tab="国家级水功能区同比/环比" key="national3">
-                  <national-yoy></national-yoy>
+                  <national-yoy :visiable="nationalWater=='national3'" :searchForm="searchFormNationalWater" @search="changeSearchNationalWater"></national-yoy>
                 </a-tab-pane>
                 </a-tabs>
              
@@ -54,12 +54,12 @@
           </a-tabs>
         </a-tab-pane>
         <a-tab-pane tab="水站" key="ccd">
-          <a-tabs v-model:activeSite="activeSite">
+          <a-tabs v-model:activeKey="activeSite">
             <a-tab-pane tab="水站数据统计" key="site1">
-              <site-statis ></site-statis>
+              <site-statis :visiable="activeSite=='site1'" :searchForm="searchFormActiveSite" @search="changeSearchActiveSite"></site-statis>
             </a-tab-pane>
             <a-tab-pane tab="水站日均值数据统计" key="site2">
-              <site-day-statis></site-day-statis>
+              <site-day-statis :visiable="activeSite=='site2'" :searchForm="searchFormActiveSite" @search="changeSearchActiveSite"></site-day-statis>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
@@ -69,6 +69,7 @@
 </template>
 
 <script>
+
   import BaseStatistic from "./base.vue";
   import AutoStatis from "../../water-function-area/statistic/auto.vue";
   import NationalStatis from "../../water-function-area/statistic/national.vue";
@@ -108,10 +109,28 @@
         activeWater: 'water1',
         activeSite:'site1',
         autoWater:'auto1',
-        nationalWater:'national'
+        nationalWater:'national',
+        searchFormRiver:{},
+        searchFormAutoWater:{},
+        searchFormNationalWater:{},
+        searchFormActiveSite:{}
       };
 
     },
+    methods:{
+      changeSearchRiver(val){
+        this.searchFormRiver = val
+      },
+      changeSearchAutoWater(val){
+        this.searchFormAutoWater = val
+      },
+      changeSearchNationalWater(val){
+        this.searchFormNationalWater = val
+      },
+      changeSearchActiveSite(val){
+        this.searchFormActiveSite = val
+      }
+    }
 
   }
 
diff --git a/src/views/water/water-function-area/statistic/auto-standard.vue b/src/views/water/water-function-area/statistic/auto-standard.vue
index 7b8a0bd..4a7d976 100644
--- a/src/views/water/water-function-area/statistic/auto-standard.vue
+++ b/src/views/water/water-function-area/statistic/auto-standard.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="5" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,23 +13,29 @@
               </a-select-option>
             </a-select>
           </a-form-item>
+          </a-col>
+          <a-col :lg="5" :md="12" :sm="24" :xs="24">
           <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-col>
+          <a-col :lg="5" :md="12" :sm="24" :xs="24">
           <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-col>
+          <a-col :lg="5" :md="12" :sm="24" :xs="24">
           <a-form-item label="查询日期:">
             <a-month-picker valueFormat="YYYY" v-model:value="where.startTime" />
           </a-form-item>
-
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          </a-col>
+          <a-col :lg="4" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
                 <a-button type="primary" @click="reload">查询</a-button>
@@ -46,7 +52,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -63,6 +68,18 @@
   export default {
     name: "AutoCollectWater",
     components: {},
+    props:{
+      // 表格搜索条件
+      searchForm:{
+        typeof:Object,
+        default: function () {
+            return {}
+        },
+      },
+      visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -163,8 +180,24 @@
         waterSystemList: [],
       };
     },
-
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.startTime){
+        this.reload()
+      }
+
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
@@ -182,8 +215,14 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+        this.$emit("search", this.where);
+
+        let search = {...this.where}
+        delete search.endTime;
+
         this.loading = true;
-        listAutoStandard(this.where).then((res) => {
+        listAutoStandard(search).then((res) => {
           console.log(res.data.data);
           this.datasource = [];
           if (res.data.code == 0) {
@@ -292,4 +331,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/water-function-area/statistic/auto-yoy.vue b/src/views/water/water-function-area/statistic/auto-yoy.vue
index 5f4dd07..9a1b57c 100644
--- a/src/views/water/water-function-area/statistic/auto-yoy.vue
+++ b/src/views/water/water-function-area/statistic/auto-yoy.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,24 +13,33 @@
               </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.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
               <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
+          </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="结束日期:">
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-picker>
+          </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.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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
-          </a-form-item>
-          <a-form-item label="结束日期:">
-            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-picker>
-          </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -48,7 +57,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -66,6 +74,18 @@
   export default {
     name: "AutoCollectWater",
     components: {},
+    props:{
+      // 表格搜索条件
+      searchForm:{
+        typeof:Object,
+        default: function () {
+            return {}
+        },
+      },
+      visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -117,8 +137,23 @@
         waterSystemList: [],
       };
     },
-
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.startTime && this.where.endTime){
+        this.reload()
+      }
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
@@ -136,6 +171,9 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+        this.$emit("search", this.where);
+
         this.loading = true;
         listAutoYoy(this.where).then((res) => {
           console.log(res.data.data);
@@ -174,4 +212,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/water-function-area/statistic/auto.vue b/src/views/water/water-function-area/statistic/auto.vue
index 5c236b1..b2fd41b 100644
--- a/src/views/water/water-function-area/statistic/auto.vue
+++ b/src/views/water/water-function-area/statistic/auto.vue
@@ -6,6 +6,7 @@
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,25 +14,33 @@
               </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.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
               <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
+          </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="结束日期:">
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-picker>
+          </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.monitorType" placeholder="请选择监测类型" @change="handleChange" 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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
-          </a-form-item>
-          <a-form-item label="结束日期:">
-            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-picker>
-          </a-form-item>
-
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -70,6 +79,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+      // 表格搜索条件
+      searchForm:{
+        typeof:Object,
+        default: function () {
+            return {}
+        },
+      },
+      visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -90,6 +111,17 @@
         waterSystemList: [],
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     mounted() {
       this.loading = true;
       this.$refs.table.reload({
@@ -174,6 +206,9 @@
       },
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+        this.$emit("search", this.where);
+
         this.loading = true;
         listAutonomyWaterFunctionTotal(this.where).then((res) => {
           this.datasource = [];
@@ -256,4 +291,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/water-function-area/statistic/national-standard.vue b/src/views/water/water-function-area/statistic/national-standard.vue
index 7e31078..e16f466 100644
--- a/src/views/water/water-function-area/statistic/national-standard.vue
+++ b/src/views/water/water-function-area/statistic/national-standard.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="5" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,23 +13,29 @@
               </a-select-option>
             </a-select>
           </a-form-item>
+          </a-col>
+          <a-col :lg="5" :md="12" :sm="24" :xs="24">
           <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-col>
+          <a-col :lg="5" :md="12" :sm="24" :xs="24">
           <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-col>
+          <a-col :lg="5" :md="12" :sm="24" :xs="24">
           <a-form-item label="查询日期:">
             <a-month-picker valueFormat="YYYY" v-model:value="where.startTime"></a-month-picker>
           </a-form-item>
-
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          </a-col>
+          <a-col :lg="4" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
                 <a-button type="primary" @click="reload">查询</a-button>
@@ -46,7 +52,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -63,6 +68,18 @@
   export default {
     name: "AutoCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -163,8 +180,23 @@
         waterSystemList: [],
       };
     },
-
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.startTime){
+        this.reload()
+      }
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
@@ -182,8 +214,15 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+        this.$emit("search", this.where);
+
         this.loading = true;
-        listNationalStandard(this.where).then((res) => {
+
+        let search = {...this.where}
+        delete search.endTime;
+
+        listNationalStandard(search).then((res) => {
           this.datasource = [];
           console.log(res.data.data);
           if (res.data.code == 0) {
@@ -289,4 +328,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
diff --git a/src/views/water/water-function-area/statistic/national-yoy.vue b/src/views/water/water-function-area/statistic/national-yoy.vue
index c6656be..9d45598 100644
--- a/src/views/water/water-function-area/statistic/national-yoy.vue
+++ b/src/views/water/water-function-area/statistic/national-yoy.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,24 +13,33 @@
               </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.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
               <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" />
+          </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="结束日期:">
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" />
+          </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.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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" />
-          </a-form-item>
-          <a-form-item label="结束日期:">
-            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" />
-          </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -48,7 +57,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -66,6 +74,18 @@
   export default {
     name: "AutoCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -116,8 +136,23 @@
         waterSystemList: [],
       };
     },
-
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     created() {
+      // 回显并搜素
+      this.where = this.searchForm;
+      if(this.where.startTime && this.where.endTime){
+        this.reload()
+      }
       listInfo().then((res) => {
         if (res.data.code == 0) {
           console.log(res.data.data)
@@ -135,6 +170,9 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+        this.$emit("search", this.where);
+        
         this.loading = true;
         listNationalYoy(this.where).then((res) => {
           console.log(res.data.data);
@@ -178,4 +216,8 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>
+
diff --git a/src/views/water/water-function-area/statistic/national.vue b/src/views/water/water-function-area/statistic/national.vue
index 872f7a4..4710f8a 100644
--- a/src/views/water/water-function-area/statistic/national.vue
+++ b/src/views/water/water-function-area/statistic/national.vue
@@ -1,11 +1,11 @@
 <!-- 江河水查看数据页面-->
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
       <!-- 搜索表单 -->
       <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="断面名称">
             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
               <a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -13,25 +13,33 @@
               </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.riverLakeLibrary" placeholder="请选择河段名称" allowClear showSearch>
               <a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
               </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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
+          </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="结束日期:">
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-picker>
+          </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.monitorType" placeholder="请选择监测类型" @change="handleChange" 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-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
-          </a-form-item>
-          <a-form-item label="结束日期:">
-            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-picker>
-          </a-form-item>
-
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -49,7 +57,6 @@
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
-    </a-card>
   </div>
   <!-- 编辑弹窗 -->
 </template>
@@ -70,6 +77,18 @@
   export default {
     name: "RiverCollectWater",
     components: {},
+    props:{
+    // 表格搜索条件
+    searchForm:{
+      typeof:Object,
+      default: function () {
+          return {}
+      },
+    },
+    visiable:{
+        typeof:Boolean
+      }
+    },
     data() {
       return {
         data: [],
@@ -92,6 +111,17 @@
         waterSystemList: [],
       };
     },
+    watch: {
+      searchForm(newV) {
+        this.where = newV;
+      },
+      // 监听组件显示
+      visiable(val){
+        if(val && this.where.startTime && this.where.endTime){
+          this.reload()
+        }
+      }
+    },
     mounted() {
       this.loading = true;
       this.$refs.table.reload({
@@ -179,6 +209,9 @@
       },
       /* 刷新表格 */
       reload() {
+        // 上传搜索条件给父级
+        this.$emit("search", this.where);
+        
         this.loading = true;
         listNationalWaterFunctionTotal(this.where).then((res) => {
           console.log(res.data.data);
@@ -255,4 +288,7 @@
 </script>
 
 <style scoped lang="less">
+.ant-calendar-picker{
+  width: 100%;
+}
 </style>