1004749546@qq.com %!s(int64=4) %!d(string=hai) anos
pai
achega
b02123fe19

+ 1 - 1
src/views/map/NodeMap.vue

@@ -266,7 +266,7 @@ export default {
       }
     },
     mapHeight () {
-      return this.isMapFull ? '80vh' : '30vh'
+      return this.isMapFull ? '80vh' : '45vh'
     },
     classOption () {
       return {

+ 6 - 0
src/views/reportForm/rubbishDeliverySearchTime.vue

@@ -114,6 +114,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
+        if (searchData.stationNo) {
+          searchData.name = this.optionData.find(item => item.stationNo == searchData.stationNo).name || ''
+        }
         if (this.time && this.time.length) {
           searchData.beginDate = moment(this.time[0])
           searchData.endDate = moment(this.time[1])
@@ -175,6 +178,9 @@ export default {
         params.beginDate = ''
         params.endDate = ''
       }
+	  if (params.stationNo) {
+	    params.name = this.optionData.find(item => item.stationNo == params.stationNo).name || ''
+	  }
       if (!params.beginDate && !params.endDate) {
         this.$message.error('请先选择需要导出的投放时间区间再进行导出!')
         return

+ 18 - 3
src/views/reportForm/rubbishDeliveryTotal.vue

@@ -31,7 +31,7 @@
           </a-col>
           <a-col :span="5">
             <a-form-model-item prop="districtCode" label=" " :colon="false" :label-col="{ span:0 }" :wrapper-col="{ span:20}">
-              <a-select allowClear id="rubbishTotal-districtCode" v-model="queryParam.districtCode" placeholder="请选择区/县">
+              <a-select allowClear id="rubbishTotal-districtCode" v-model="queryParam.districtCode" @change="getDistrictCode" placeholder="请选择区/县">
                 <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
@@ -47,6 +47,7 @@
                 v-model="queryParam.stationNo"
                 :showSearch="true"
                 option-filter-prop="children"
+                @change="stationNoChange"
                 :filter-option="filterOption">
                 <a-select-option v-for="item in optionData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
               </a-select>
@@ -123,10 +124,14 @@ export default {
       queryParam: {
         beginDate: null, // 开始时间
         endDate: null, // 结束时间
-        stationNo: undefined, // 网点名称
+        stationNo: undefined, // 网点no
+        name: '', // 网点名称
         provinceCode: undefined, //  省
+        provinceName: '',
         cityCode: undefined, // 市
-        districtCode: undefined // 区
+        cityName: '', // 市名称
+        districtCode: undefined, // 区
+        districtName: '' // 区名称
       },
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
@@ -297,6 +302,7 @@ export default {
     getCityList (val) {
       this.addrCityList = []
       this.addrDistrictList = []
+	  this.queryParam.provinceName = val ? this.addrProvinceList.find(item => item.code == this.queryParam.provinceCode).name : ''
       this.queryParam.cityCode = undefined
       this.queryParam.districtCode = undefined
       this.getCityListRequest(val)
@@ -315,6 +321,7 @@ export default {
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
+	  this.queryParam.cityName = val ? this.addrCityList.find(item => item.code == this.queryParam.cityCode).name : ''
       this.queryParam.districtCode = undefined
       this.getAreaListRequest(val)
     },
@@ -329,6 +336,14 @@ export default {
         }
       })
     },
+    // 选择区
+    getDistrictCode (val) {
+      this.queryParam.districtName = val ? this.addrDistrictList.find(item => item.code == this.queryParam.districtCode).name : ''
+    },
+    // 选择网点
+    stationNoChange (val) {
+      this.queryParam.name = val ? this.optionData.find(item => item.stationNo == val).name : ''
+    },
     // 导出
     handleExport () {
       const params = this.queryParam