From 4ba63e2d2e6041b34b3510cc4ddfdd1bc89e0480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Sat, 25 Dec 2021 17:57:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=87=E7=94=A8=E6=B0=B4=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drinking-water/statistic/city/waterNutritional.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/waterNutritional.vue b/src/views/water/drinking-water/statistic/city/waterNutritional.vue
index 1284f5c..7fdfe27 100644
--- a/src/views/water/drinking-water/statistic/city/waterNutritional.vue
+++ b/src/views/water/drinking-water/statistic/city/waterNutritional.vue
@@ -71,12 +71,12 @@ export default {
       datasource:{},
       selection: [],
       columns:[
-        {title:"监测时间",dataIndex:"city",},
-        {title:"类别",dataIndex:"place",},
-        {title:"点位名称",dataIndex:"sourceWaterName",},
+        {title:"监测时间",dataIndex:"monitorTime",},
+        {title:"类别",dataIndex:"subordinateWater",},
+        {title:"点位名称",dataIndex:"sectionName",},
         {title:"水质类别",dataIndex:"waterSourceProperty",},
-        {title: "级别", dataIndex: ""},
-        {title: "综合营养指数", dataIndex: ""},
+        {title: "级别", dataIndex: "nutritionLevel"},
+        {title: "综合营养指数", dataIndex: "compositeNutritionIndex"},
       ],
         
       

From 35e5d10be0d157074273fcd03dec7a61ff7f05f1 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, 27 Dec 2021 09:52:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/drinking-water/statistic/city/situation.vue     | 2 +-
 src/views/water/drinking-water/statistic/city/waterCount.vue    | 1 +
 .../water/drinking-water/statistic/city/waterNutritional.vue    | 2 +-
 src/views/water/drinking-water/statistic/city/waterQuality.vue  | 2 +-
 .../water/drinking-water/statistic/city/waterQualityCount.vue   | 2 +-
 .../water/drinking-water/statistic/city/waterQualityUp.vue      | 2 +-
 .../water/drinking-water/statistic/countryside/waterQuality.vue | 2 +-
 .../drinking-water/statistic/countryside/waterQualityCount.vue  | 2 +-
 .../drinking-water/statistic/countryside/waterQualityUp.vue     | 2 +-
 src/views/water/drinking-water/statistic/county/situation.vue   | 2 +-
 src/views/water/drinking-water/statistic/county/waterCount.vue  | 1 +
 .../water/drinking-water/statistic/county/waterQuality.vue      | 2 +-
 .../water/drinking-water/statistic/county/waterQualityCount.vue | 2 +-
 .../water/drinking-water/statistic/county/waterQualityUp.vue    | 2 +-
 14 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/situation.vue b/src/views/water/drinking-water/statistic/city/situation.vue
index e1ca11c..bb48dc4 100644
--- a/src/views/water/drinking-water/statistic/city/situation.vue
+++ b/src/views/water/drinking-water/statistic/city/situation.vue
@@ -123,7 +123,7 @@ export default {
       bill: {},
       editableData:[],
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {key: "index",title:"序号",dataIndex: "index",width: 48,align: "center",customRender: ({ index }) => index + 1,},
diff --git a/src/views/water/drinking-water/statistic/city/waterCount.vue b/src/views/water/drinking-water/statistic/city/waterCount.vue
index 46dd0d0..41a515d 100644
--- a/src/views/water/drinking-water/statistic/city/waterCount.vue
+++ b/src/views/water/drinking-water/statistic/city/waterCount.vue
@@ -64,6 +64,7 @@ export default {
   data() {
     return {
       data: [],
+      datasource:[],
       locale,
       bill: {},
       // 表格数据接口
diff --git a/src/views/water/drinking-water/statistic/city/waterNutritional.vue b/src/views/water/drinking-water/statistic/city/waterNutritional.vue
index 7fdfe27..04d4280 100644
--- a/src/views/water/drinking-water/statistic/city/waterNutritional.vue
+++ b/src/views/water/drinking-water/statistic/city/waterNutritional.vue
@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"监测时间",dataIndex:"monitorTime",},
diff --git a/src/views/water/drinking-water/statistic/city/waterQuality.vue b/src/views/water/drinking-water/statistic/city/waterQuality.vue
index b6a7e43..3a8de1c 100644
--- a/src/views/water/drinking-water/statistic/city/waterQuality.vue
+++ b/src/views/water/drinking-water/statistic/city/waterQuality.vue
@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"城市名称",dataIndex:"city",},
diff --git a/src/views/water/drinking-water/statistic/city/waterQualityCount.vue b/src/views/water/drinking-water/statistic/city/waterQualityCount.vue
index ba78190..03f926a 100644
--- a/src/views/water/drinking-water/statistic/city/waterQualityCount.vue
+++ b/src/views/water/drinking-water/statistic/city/waterQualityCount.vue
@@ -69,7 +69,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"年份",dataIndex:"year",},
diff --git a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
index 144be3a..5f2f5b2 100644
--- a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"断面名称",dataIndex:"sectionName",},
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue
index cc3a44b..4dcd416 100644
--- a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue
+++ b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue
@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"城市名称",dataIndex:"city",},
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue
index 805d21d..cc915e0 100644
--- a/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue
+++ b/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue
@@ -69,7 +69,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"年份",dataIndex:"year",},
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
index dd5bf4e..14cb4ea 100644
--- a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"断面名称",dataIndex:"sectionName",},
diff --git a/src/views/water/drinking-water/statistic/county/situation.vue b/src/views/water/drinking-water/statistic/county/situation.vue
index 60a7ab8..2687207 100644
--- a/src/views/water/drinking-water/statistic/county/situation.vue
+++ b/src/views/water/drinking-water/statistic/county/situation.vue
@@ -124,7 +124,7 @@ export default {
       bill: {},
       editableData:[],
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {key: "index",title:"序号",dataIndex: "index",width: 48,align: "center",customRender: ({ index }) => index + 1,},
diff --git a/src/views/water/drinking-water/statistic/county/waterCount.vue b/src/views/water/drinking-water/statistic/county/waterCount.vue
index 2a00a29..286bfe3 100644
--- a/src/views/water/drinking-water/statistic/county/waterCount.vue
+++ b/src/views/water/drinking-water/statistic/county/waterCount.vue
@@ -63,6 +63,7 @@ export default {
     },
   data() {
     return {
+      datasource:[],
       data: [],
       locale,
       bill: {},
diff --git a/src/views/water/drinking-water/statistic/county/waterQuality.vue b/src/views/water/drinking-water/statistic/county/waterQuality.vue
index 76c4982..0b4f03f 100644
--- a/src/views/water/drinking-water/statistic/county/waterQuality.vue
+++ b/src/views/water/drinking-water/statistic/county/waterQuality.vue
@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"城市名称",dataIndex:"city",},
diff --git a/src/views/water/drinking-water/statistic/county/waterQualityCount.vue b/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
index a17a854..93df842 100644
--- a/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
+++ b/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
@@ -69,7 +69,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"年份",dataIndex:"year",},
diff --git a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
index 43b3ee5..f193215 100644
--- a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
@@ -68,7 +68,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      datasource:{},
+      datasource:[],
       selection: [],
       columns:[
         {title:"断面名称",dataIndex:"sectionName",},

From e2c1fc7c5de350b9e61ea447643b6367b2dfe4d1 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, 27 Dec 2021 10:54:17 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../water/drinking-water/statistic/city/overStandard.vue    | 6 +++++-
 .../water/drinking-water/statistic/city/waterCount.vue      | 6 +++++-
 .../drinking-water/statistic/components/citySearch.vue      | 6 ++++--
 .../drinking-water/statistic/components/countySearch.vue    | 6 ++++--
 .../statistic/components/countySideSeatch.vue               | 6 ++++--
 .../drinking-water/statistic/countryside/overStandard.vue   | 6 +++++-
 .../water/drinking-water/statistic/county/overStandard.vue  | 6 +++++-
 .../water/drinking-water/statistic/county/waterCount.vue    | 6 +++++-
 8 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/overStandard.vue b/src/views/water/drinking-water/statistic/city/overStandard.vue
index 5072771..28ca624 100644
--- a/src/views/water/drinking-water/statistic/city/overStandard.vue
+++ b/src/views/water/drinking-water/statistic/city/overStandard.vue
@@ -8,6 +8,7 @@
         :filterKeys="filterKeys"
         @search="searchData"
         @exportFile="exportFile"
+        :visiable="visiable"
         @filterColumns="changeFilter"
       />
       <!-- 表格 -->
@@ -56,7 +57,10 @@ export default {
             default: function () {
                 return []
             },
-        }
+        },
+        visiable:{
+          typeof:Boolean
+      }
     },
   data() {
     return {
diff --git a/src/views/water/drinking-water/statistic/city/waterCount.vue b/src/views/water/drinking-water/statistic/city/waterCount.vue
index 41a515d..716b1b7 100644
--- a/src/views/water/drinking-water/statistic/city/waterCount.vue
+++ b/src/views/water/drinking-water/statistic/city/waterCount.vue
@@ -6,6 +6,7 @@
         <search
         :searchForm="searchForm"
         :filterKeys="filterKeys"
+        :visiable="visiable"
         @search="searchData"
         @exportFile="exportFile"
         @filterColumns="changeFilter"
@@ -59,7 +60,10 @@ export default {
             default: function () {
                 return []
             },
-        }
+        },
+        visiable:{
+          typeof:Boolean
+      }
     },
   data() {
     return {
diff --git a/src/views/water/drinking-water/statistic/components/citySearch.vue b/src/views/water/drinking-water/statistic/components/citySearch.vue
index 2b04583..1fb217a 100644
--- a/src/views/water/drinking-water/statistic/components/citySearch.vue
+++ b/src/views/water/drinking-water/statistic/components/citySearch.vue
@@ -174,8 +174,10 @@ export default {
     },
     // 监听组件显示
     visiable(val){
-      console.log('change',val)
-      this.emitData(val)
+         window.setTimeout(()=>{
+        let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val;
+        this.emitData(isSearch)
+      },200)
     }
   },
 
diff --git a/src/views/water/drinking-water/statistic/components/countySearch.vue b/src/views/water/drinking-water/statistic/components/countySearch.vue
index f6bb3e4..8ea5126 100644
--- a/src/views/water/drinking-water/statistic/components/countySearch.vue
+++ b/src/views/water/drinking-water/statistic/components/countySearch.vue
@@ -174,8 +174,10 @@ export default {
     },
     // 监听组件显示
     visiable(val){
-      console.log('change',val)
-      this.emitData(val)
+         window.setTimeout(()=>{
+        let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val;
+        this.emitData(isSearch)
+      },200)
     }
   },
 
diff --git a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
index 54838f8..10e74f5 100644
--- a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
+++ b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
@@ -174,8 +174,10 @@ export default {
     },
     // 监听组件显示
     visiable(val){
-      console.log('change',val)
-      this.emitData(val)
+      window.setTimeout(()=>{
+        let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val;
+        this.emitData(isSearch)
+      },200)
     }
   },
 
diff --git a/src/views/water/drinking-water/statistic/countryside/overStandard.vue b/src/views/water/drinking-water/statistic/countryside/overStandard.vue
index 3de29fb..76414ae 100644
--- a/src/views/water/drinking-water/statistic/countryside/overStandard.vue
+++ b/src/views/water/drinking-water/statistic/countryside/overStandard.vue
@@ -8,6 +8,7 @@
         :filterKeys="filterKeys"
         @search="searchData"
         @exportFile="exportFile"
+        :visiable="visiable"
         @filterColumns="changeFilter"
       />
       <!-- 表格 -->
@@ -56,7 +57,10 @@ export default {
             default: function () {
                 return []
             },
-        }
+        },
+        visiable:{
+          typeof:Boolean
+      }
     },
   data() {
     return {
diff --git a/src/views/water/drinking-water/statistic/county/overStandard.vue b/src/views/water/drinking-water/statistic/county/overStandard.vue
index 307d13e..76af50a 100644
--- a/src/views/water/drinking-water/statistic/county/overStandard.vue
+++ b/src/views/water/drinking-water/statistic/county/overStandard.vue
@@ -6,6 +6,7 @@
         <search
         :searchForm="searchForm"
         :filterKeys="filterKeys"
+        :visiable="visiable"
         @search="searchData"
         @exportFile="exportFile"
         @filterColumns="changeFilter"
@@ -56,7 +57,10 @@ export default {
             default: function () {
                 return []
             },
-        }
+        },
+        visiable:{
+          typeof:Boolean
+      }
     },
   data() {
     return {
diff --git a/src/views/water/drinking-water/statistic/county/waterCount.vue b/src/views/water/drinking-water/statistic/county/waterCount.vue
index 286bfe3..b15034d 100644
--- a/src/views/water/drinking-water/statistic/county/waterCount.vue
+++ b/src/views/water/drinking-water/statistic/county/waterCount.vue
@@ -6,6 +6,7 @@
         <search
         :searchForm="searchForm"
         :filterKeys="filterKeys"
+        :visiable="visiable"
         @search="searchData"
         @exportFile="exportFile"
         @filterColumns="changeFilter"
@@ -59,7 +60,10 @@ export default {
             default: function () {
                 return []
             },
-        }
+        },
+        visiable:{
+          typeof:Boolean
+      }
     },
   data() {
     return {

From 9dffc3ac70642f69c6759bf625c7c4a3ec07b64a Mon Sep 17 00:00:00 2001
From: art_station <hey78450496@163.com>
Date: Mon, 27 Dec 2021 14:11:24 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E5=88=86=E8=B4=9D?=
 =?UTF-8?q?=E5=80=BC=E4=BF=9D=E7=95=99=E4=B8=80=E4=BD=8D=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=20=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=E5=88=A0=E9=99=A4=20?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=93=E5=BC=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sound/function/statistic/compare.vue      | 502 ------------------
 .../sound/function/statistic/leq-compare.vue  | 102 ----
 src/views/sound/road/trend/index.vue          |   3 +
 vue.config.js                                 |   7 +
 4 files changed, 10 insertions(+), 604 deletions(-)
 delete mode 100644 src/views/sound/function/statistic/compare.vue
 delete mode 100644 src/views/sound/function/statistic/leq-compare.vue

diff --git a/src/views/sound/function/statistic/compare.vue b/src/views/sound/function/statistic/compare.vue
deleted file mode 100644
index 174485f..0000000
--- a/src/views/sound/function/statistic/compare.vue
+++ /dev/null
@@ -1,502 +0,0 @@
-<template>
-  <div class="">
-    <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
-      <a-row>
-        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="统计模块:">
-            <a-select
-              :options="groupModelOptions"
-              v-model:value="where.groupModel"
-              placeholder="统计模块"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col> -->
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="时间细度:">
-            <a-select
-              :options="groupTimeLengthOptions"
-              v-model:value="where.groupTimeLength"
-              placeholder=""
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item name="timeRange" label="时间范围:">
-            <a-range-picker
-              @panelChange="timeRangePanelChange"
-              v-model:value="timeRange"
-              format="YYYY"
-              :mode="['year', 'year']"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="昼夜:">
-            <a-select
-              :options="timeSlotOptions"
-              v-model:value="where.timeSlot"
-              placeholder="昼夜"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-
-        <a-col :lg="12" :md="12" :sm="24" :xs="24">
-          <a-form-item label="类型:">
-            <a-select
-              v-model:value="where.valueType"
-              :options="valueTypeOptions"
-              mode="multiple"
-              placeholder="至少选择一项"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
-              <a-form-item label="时间范围:">
-                <a-range-picker @change="reportTimeScopeChange" :mode="['year','year']" separator="~" v-model:value="where.reportTimeScope" ><a-range-picker>
-                   <template #renderExtraFooter>
-                      extra footer
-                    </template>
-                </a-range-picker>
-              </a-form-item>
-            </a-col> -->
-
-        <a-col :lg="12" :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
-      v-if="hisYears.length > 0"
-      ref="table"
-      row-key="id"
-      :datasource="url"
-      :columns="columns"
-      :where="where"
-      :needPage="false"
-      :initLoad="false"
-      :scroll="{ x: 'max-content' }"
-      :method="'POST'"
-      @done="(d) => (data = d.data)"
-    >
-      <template #toolbar>
-        <!-- 搜索表单 -->
-
-        <!-- <a-space>
-            
-        </a-space> -->
-      </template>
-    </ele-pro-table>
-  </div>
-</template>
-
-<script>
-// import _ from "lodash";
-import { ref } from "vue";
-import XLSX from "xlsx";
-import {
-  pageFunctionNoiseCompare,
-  getHistoryyears,
-} from "@/api/ecology/noise/function-sound";
-export default {
-  name: "StatisticSoundFunctionCompare",
-  components: {},
-  data() {
-    const groupModelOptions = [
-      { label: "测点", value: "place" },
-      { label: "城区", value: "area" },
-      { label: "市", value: "city" },
-    ];
-    const groupTimeLengthOptions = [
-      {
-        label: "年",
-        value: "monitor_year",
-      },
-      {
-        label: "季度",
-        value: "quarter",
-      },
-    ];
-
-    // const valueTypeOptions = ['Leq','SD','L10','L50','L90','Lmin','Lmax'];
-    const valueTypeOptions = [
-      {
-        label: "Leq",
-        value: "index_Leq",
-      },
-      {
-        label: "SD",
-        value: "index_SD",
-      },
-      {
-        label: "L10",
-        value: "index_L10",
-      },
-      {
-        label: "L50",
-        value: "index_L50",
-      },
-      {
-        label: "L90",
-        value: "index_L90",
-      },
-      {
-        label: "Lmin",
-        value: "index_Lmin",
-      },
-      {
-        label: "Lmax",
-        value: "index_Lmax",
-      },
-    ];
-
-    const whereRules = {};
-    return {
-      url: pageFunctionNoiseCompare,
-      data: [],
-      where: {
-        groupModel: "area",
-        groupTimeLength: "monitor_year",
-        reportTimeScope: [],
-        valueType: ["index_Leq"],
-        timeRange: [],
-      },
-      timeRange: [],
-      whereRules,
-      hisYears: [],
-      timeScope: [],
-      columns: [{ title: "年", dataIndex: "year" }],
-      groupModelOptions,
-      groupTimeLengthOptions,
-      valueTypeOptions: ref(valueTypeOptions),
-      timeSlotOptions: [
-        {
-          value: "昼",
-          label: "昼",
-        },
-        {
-          value: "夜",
-          label: "夜",
-        },
-      ],
-    };
-  },
-  mounted() {
-    getHistoryyears().then((res) => {
-      this.hisYears = res.data.data;
-      this.$nextTick(() => {
-        this.reload();
-      });
-    });
-  },
-  methods: {
-    /* 刷新表格 */
-    reload() {
-      if (this.where.valueType.length == 0) {
-        this.$message.error("请至少选择一个类型");
-        return;
-      }
-
-      // 结束时间必须大于开始时间
-      if (this.where.timeRange && this.where.timeRange.length == 2) {
-        if (this.where.timeRange[0] > this.where.timeRange[1]) {
-          this.$message.error("结束时间必须大于起始时间");
-          return;
-        }
-        this.where.startYear = this.where.timeRange[0];
-        this.where.endYear = this.where.timeRange[1];
-      }
-      this.stableDone();
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        model: "area",
-      };
-      this.this.timeScope = [];
-      this.reload();
-    },
-    reportTimeScopeChange(d, dstr) {
-      console.log(d, dstr);
-    },
-    timeRangePanelChange(val) {
-      val[0] && (this.where.timeRange[0] = val[0].year());
-      val[1] && (this.where.timeRange[1] = val[1].year());
-      this.timeRange = val;
-    },
-    // 数据加载完成
-    stableDone() {
-      const columns = [];
-      if (this.where.groupModel == "area") {
-        columns.push({
-          title: "城区",
-          dataIndex: "area",
-          sorter: true,
-        });
-      } else if (this.where.groupModel == "place") {
-        columns.push({
-          title: "测点",
-          dataIndex: "area",
-          sorter: true,
-        });
-      } else if (this.where.groupModel == "city") {
-        columns.push({
-          title: "城市",
-          dataIndex: "area",
-          sorter: true,
-        });
-      }
-
-      this.hisYears.forEach((item) => {
-        if (
-          (!this.where.timeRange[0] || this.where.timeRange[0] <= item) &&
-          (!this.where.timeRange[1] || this.where.timeRange[1] >= item)
-        ) {
-          if (this.where.groupTimeLength == "quarter") {
-            columns.push({
-              title: item + "年第一季度Leq",
-              dataIndex: item + "1" + "Leq",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度Leq",
-              dataIndex: item + "2" + "Leq",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度Leq",
-              dataIndex: item + "3" + "Leq",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度Leq",
-              dataIndex: item + "4" + "Leq",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度SD",
-              dataIndex: item + "1" + "Sd",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度SD",
-              dataIndex: item + "2" + "Sd",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度SD",
-              dataIndex: item + "3" + "Sd",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度SD",
-              dataIndex: item + "4" + "Sd",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度L10",
-              dataIndex: item + "1" + "L10",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度L10",
-              dataIndex: item + "2" + "L10",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度L10",
-              dataIndex: item + "3" + "L10",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度L10",
-              dataIndex: item + "4" + "L10",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度L50",
-              dataIndex: item + "1" + "L50",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度L50",
-              dataIndex: item + "2" + "L50",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度L50",
-              dataIndex: item + "3" + "L50",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度L50",
-              dataIndex: item + "4" + "L50",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度L90",
-              dataIndex: item + "1" + "L90",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度L90",
-              dataIndex: item + "2" + "L90",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度L90",
-              dataIndex: item + "3" + "L90",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度L90",
-              dataIndex: item + "4" + "L90",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度Lmin",
-              dataIndex: item + "1" + "Lmin",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度Lmin",
-              dataIndex: item + "2" + "Lmin",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度Lmin",
-              dataIndex: item + "3" + "Lmin",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度Lmin",
-              dataIndex: item + "4" + "Lmin",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度Lmax",
-              dataIndex: item + "1" + "Lmax",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度Lmax",
-              dataIndex: item + "2" + "Lmax",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度Lmax",
-              dataIndex: item + "3" + "Lmax",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度Lmax",
-              dataIndex: item + "4" + "Lmax",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-          } else {
-            if (this.where.valueType.includes("index_Leq")) {
-              columns.push({
-                title: item + "年Leq",
-                dataIndex: item + "Leq",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_SD")) {
-              columns.push({
-                title: item + "年SD",
-                dataIndex: item + "Sd",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_L10")) {
-              columns.push({
-                title: item + "年L10",
-                dataIndex: item + "L10",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
-                  return val;
-                },
-              });
-            }
-
-            if (this.where.valueType.includes("index_L50")) {
-              columns.push({
-                title: item + "年L50",
-                dataIndex: item + "L50",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_L90")) {
-              columns.push({
-                title: item + "年L90",
-                dataIndex: item + "L90",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_Lmin")) {
-              columns.push({
-                title: item + "年Lmin",
-                dataIndex: item + "Lmin",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_Lmax")) {
-              columns.push({
-                title: item + "年Lmax",
-                dataIndex: item + "Lmax",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
-                  return val;
-                },
-              });
-            }
-          }
-        }
-      });
-      //
-      this.columns = columns;
-    },
-    exportFile() {
-      const arr = [];
-      const th = this.columns.map((item) => item.title);
-      arr.push(th);
-      this.data.forEach((d) => {
-        const td = this.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>
-</style>
\ No newline at end of file
diff --git a/src/views/sound/function/statistic/leq-compare.vue b/src/views/sound/function/statistic/leq-compare.vue
deleted file mode 100644
index e5ad4b0..0000000
--- a/src/views/sound/function/statistic/leq-compare.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <div class="">
-    <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
-      <a-row>
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="昼夜:">
-            <a-select
-              :options="timeSlotOptions"
-              v-model:value="where.timeSlot"
-              placeholder="昼夜"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :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
-      v-if="hisYears.length > 0"
-      ref="table"
-      row-key="id"
-      :datasource="url"
-      :columns="columns"
-      :where="where"
-      :needPage="false"
-      :initLoad="false"
-      :scroll="{ x: 'max-content' }"
-      :method="'POST'"
-      @done="(d) => (data = d.data)"
-    >
-      <template #toolbar> </template>
-    </ele-pro-table>
-  </div>
-</template>
-
-<script>
-// import _ from "lodash";
-import XLSX from "xlsx";
-import {
-  pageFunctionNoiseCompare,
-  getHistoryyears,
-} from "@/api/ecology/noise/function-sound";
-export default {
-  name: "StatisticSoundFunctionCompare",
-  components: {},
-  data() {
-    const whereRules = {};
-    return {
-      url: pageFunctionNoiseCompare,
-      data: [],
-      where: {},
-      timeRange: [],
-      whereRules,
-      hisYears: [],
-      timeScope: [],
-      columns: [{ title: "年", dataIndex: "year" }],
-    };
-  },
-  mounted() {
-    getHistoryyears().then((res) => {
-      this.hisYears = res.data.data;
-      this.$nextTick(() => {
-        this.reload();
-      });
-    });
-  },
-  methods: {
-    /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.reload();
-    },
-    exportFile() {
-      const arr = [];
-      const th = this.columns.map((item) => item.title);
-      arr.push(th);
-      this.data.forEach((d) => {
-        const td = this.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>
-</style>
\ No newline at end of file
diff --git a/src/views/sound/road/trend/index.vue b/src/views/sound/road/trend/index.vue
index 6c62932..aa8e7bc 100644
--- a/src/views/sound/road/trend/index.vue
+++ b/src/views/sound/road/trend/index.vue
@@ -124,6 +124,9 @@
         })
       },
       initChart() {
+        this.trendData.yAxis[0].axisLabel = {
+          formatter: function (value) { return value.toFixed(1);}
+        };
         echarts.init(document.getElementById("chartColumn")).dispose();
         this.chartColumn = markRaw(echarts.init(document.getElementById('chartColumn')))
         this.chartColumn.setOption({
diff --git a/vue.config.js b/vue.config.js
index 3764250..6147bf0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,5 +23,12 @@ module.exports = {
         }
       }
     }
+  },
+  devServer: {
+    open: true,
+    overlay: {
+      warnings: true,
+      errors: true
+    }
   }
 }

From 0a2fcfcac534a68075198621f69d74ae20c95d93 Mon Sep 17 00:00:00 2001
From: art_station <hey78450496@163.com>
Date: Mon, 27 Dec 2021 19:39:50 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=97=E5=AE=81=E5=B8=82=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sound/road/trend/index.vue | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/views/sound/road/trend/index.vue b/src/views/sound/road/trend/index.vue
index aa8e7bc..968b80e 100644
--- a/src/views/sound/road/trend/index.vue
+++ b/src/views/sound/road/trend/index.vue
@@ -24,13 +24,13 @@
         </a-col>
         <a-col :lg="4" :md="8" :sm="24" :xs="24">
           <a-form-item label="城区:">
-            <a-select mode="multiple" :options="areaOptions" @change="handleAreaChange" placeholder="城区">
+            <a-select mode="multiple" :default-value="['南宁']" v-model:value="queryParams.areaList" :options="areaOptions" placeholder="城区">
             </a-select>
           </a-form-item>
         </a-col>
         <a-col :lg="4" :md="8" :sm="24" :xs="24">
           <a-form-item label="测点名称:">
-            <a-select mode="multiple" :options="placeOptions" @change="handlePlaceChange" placeholder="测点名称">
+            <a-select mode="multiple" v-model:value="queryParams.placeList" :options="placeOptions" placeholder="测点名称">
             </a-select>
           </a-form-item>
         </a-col>
@@ -63,7 +63,7 @@
         queryParams: {
           startYear: 2020,
           endYear: 2021,
-          areaList: ['兴宁区','西乡塘区'],
+          areaList: [],
           placeList: []
         },
         trendData: [],
@@ -78,12 +78,6 @@
       this.drawTrend()
     },
     methods: {
-      handleAreaChange(value) {
-        this.queryParams.areaList = Object.values(value)
-      },
-      handlePlaceChange(value) {
-        this.queryParams.placeList = Object.values(value)
-      },
       // 下拉列表
       loadOptionData() {
         getColumnOptions("place").then((res) => {
@@ -101,6 +95,7 @@
               value: item,
             };
           });
+          this.areaOptions.unshift({ label: '南宁市', value: '南宁'})
         });
         getColumnOptions("monitor_year").then((res) => {
           this.yearOptions = res.data.data.map((item) => {