bug修复

src/views/atmosphere/acid-rain/trend/index.vue

@@ -4,10 +4,14 @@
     <a-form :model="queryParams" :label-col="{ md: { span: 6 }, sm: { span: 24 } }" :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }" labelAlign="left" layout="vertical">
       <a-row>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="年度:"><a-select mode="multiple" v-model:value="queryParams.yearList" :options="yearOptions" placeholder="请选择年度"></a-select></a-form-item>
+          <a-form-item label="年度:">
+            <a-select mode="multiple" v-model:value="queryParams.yearList" :options="yearOptions" allowClear placeholder="请选择年度"></a-select>
+          </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="月份:"><a-select mode="multiple" v-model:value="queryParams.monthList" :options="monthOptions" placeholder="请选择月份"></a-select></a-form-item>
+          <a-form-item label="月份:">
+            <a-select mode="multiple" @change="handleMonthChange" v-model:value="queryParams.monthList" :options="monthOptions" allowClear placeholder="请选择月份"></a-select>
+          </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="区域等级:">
@@ -18,12 +22,12 @@
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="测点名称:">
-            <a-select mode="multiple" v-model:value="queryParams.placeList" :options="placeOptions" placeholder="请选择测点名称"></a-select>
+            <a-select mode="multiple" v-model:value="queryParams.placeList" :options="placeOptions" allowClear placeholder="请选择测点名称"></a-select>
           </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="项目类别:">
-            <a-select mode="multiple" @change="handleCategoryChange" v-model:value="queryParams.categoryList" :options="categoryOptions" placeholder="请选择项目类别"></a-select>
+            <a-select mode="multiple" @change="handleCategoryChange" v-model:value="queryParams.categoryList" :options="categoryOptions" allowClear placeholder="请选择项目类别"></a-select>
           </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -133,6 +137,11 @@ export default {
         this.getPlaceOptions(value)
       }
     },
+    handleMonthChange(value) {
+      if (value.includes('全部')) {
+        this.queryParams.monthList = [1,2,3,4,5,6,7,8,9,10,11,12]
+      }
+    },
     // 纵坐标变化
     handleYcoChange(value) {
       if (value.includes('rate') && !this.queryParams.categoryList.includes('酸雨频率')) {

src/views/atmosphere/air/trend/index.vue

@@ -4,10 +4,14 @@
     <a-form :model="queryParams" :label-col="{ md: { span: 6 }, sm: { span: 24 } }" :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }" labelAlign="left" layout="vertical">
       <a-row>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="年度:"><a-select mode="multiple" v-model:value="queryParams.yearList" :options="yearOptions" placeholder="请选择年度"></a-select></a-form-item>
+          <a-form-item label="年度:">
+            <a-select mode="multiple" v-model:value="queryParams.yearList" :options="yearOptions" allowClear placeholder="请选择年度"></a-select>
+          </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="月份:"><a-select mode="multiple" v-model:value="queryParams.monthList" :options="monthOptions" placeholder="请选择月份"></a-select></a-form-item>
+          <a-form-item label="月份:">
+            <a-select mode="multiple" @change="handleMonthChange" v-model:value="queryParams.monthList" :options="monthOptions" allowClear placeholder="请选择月份"></a-select>
+          </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="区域等级:">
@@ -17,16 +21,18 @@
           </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="区域:"><a-select mode="multiple" v-model:value="queryParams.areaList" :options="areaOptions" placeholder="请选择区域"></a-select></a-form-item>
+          <a-form-item label="区域:">
+            <a-select mode="multiple" v-model:value="queryParams.areaList" :options="areaOptions" allowClear placeholder="请选择区域"></a-select>
+          </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="测点名称:">
-            <a-select mode="multiple" v-model:value="queryParams.placeList" :options="placeOptions" placeholder="请选择测点名称"></a-select>
+            <a-select mode="multiple" v-model:value="queryParams.placeList" :options="placeOptions" allowClear placeholder="请选择测点名称"></a-select>
           </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="监测指标:">
-            <a-select mode="multiple" @change="handleIndicatorChange" v-model:value="queryParams.indicatorList" :options="indicatorOptions" placeholder="请选择监测指标"></a-select>
+            <a-select mode="multiple" @change="handleIndicatorChange" v-model:value="queryParams.indicatorList" :options="indicatorOptions" allowClear placeholder="请选择监测指标"></a-select>
           </a-form-item>
         </a-col>
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -188,6 +194,11 @@ export default {
         this.getCountryPlace();
       }
     },
+    handleMonthChange(value) {
+      if (value.includes('全部')) {
+        this.queryParams.monthList = [1,2,3,4,5,6,7,8,9,10,11,12]
+      }
+    },
     // 纵坐标变化
     handleYcoChange(value) {
       if (value.length > 2) {
@@ -286,10 +297,29 @@ export default {
           return value.toFixed(1);
         }
       };
+      let yMax = 0
+      this.trendData.series && this.trendData.series.forEach(item => {
+          yMax = Math.max(...item.data) > yMax ? Math.max(...item.data) : yMax
+          if (item.name === '二氧化氮') {
+            yMax = yMax > 40 ? yMax : 40
+          } else if (item.name === '二氧化硫') {
+            yMax = yMax > 60 ? yMax : 60
+          } else if (item.name === '可吸入颗粒物') {
+            yMax = yMax > 70 ? yMax : 70
+          } else if (item.name === '一氧化碳') {
+            yMax = yMax > 4 ? yMax : 4
+          } else if (item.name === '臭氧') {
+            yMax = yMax > 160 ? yMax : 160
+          } else if (item.name === '细颗粒物') {
+            yMax = yMax > 35 ? yMax : 35
+          }
+      })
+      console.log("yMax", yMax);
       this.trendData.yAxis && this.trendData.yAxis.forEach(item=>{
         console.log("item", item);
         if (item.name === '浓度') {
           item.name = '浓度 单位：微克/立方米（一氧化碳：毫克/立方米）'
+          item.max = yMax
         }
       })
       if (trendChart != null && trendChart != '' && trendChart != undefined) {