Merge branch 'feat/v20240706-dashboard' into dev

src/views/dashboard/componets/StatisticsItem.vue

@@ -50,8 +50,8 @@ export default {
 
   watch: {
     value: {
-      handler(count) {
-        count * 1 !== 0 && this.init()
+      handler() {
+        this.init()
       },
       immediate: true
     }

src/views/dashboard/index.vue

@@ -5,7 +5,7 @@
       <div class="wrapper">
         <el-form ref="topSearchFormRef" inline :model="topSearchForm">
           <el-form-item label="代理商">
-            <el-select :popper-append-to-body="false" @change="handleChangeTopSelect('agents')" v-model="topSearchForm.agents" class="select" placeholder="请选择代理商">
+            <el-select clearable :popper-append-to-body="false" @change="handleChangeTopSelect('agents')" v-model="topSearchForm.agents" class="select" placeholder="请选择代理商">
               <el-option
                 style="height: auto !important; line-height: 1.1; padding: 5px 15px; margin: 2px 0"
                 v-for="(item, index) in selectOptions.agents"
@@ -20,7 +20,7 @@
           </el-form-item>
 
           <el-form-item label="加盟商">
-            <el-select @change="handleChangeTopSelect('franchise')" v-model="topSearchForm.franchise" class="select" placeholder="请选择加盟商">
+            <el-select clearable @change="handleChangeTopSelect('franchise')" v-model="topSearchForm.franchise" class="select" placeholder="请选择加盟商">
               <el-option
                 style="height: auto !important; line-height: 1.1; padding: 5px 15px; margin: 2px 0"
                 v-for="(item, index) in selectOptions.franchise"
@@ -35,7 +35,7 @@
           </el-form-item>
 
           <el-form-item label="商家">
-            <el-select @change="handleChangeTopSelect('shop')" class="select" v-model="topSearchForm.shop" placeholder="请选择商家">
+            <el-select clearable @change="handleChangeTopSelect('shop')" class="select" v-model="topSearchForm.shop" placeholder="请选择商家">
               <el-option v-for="(item, index) in selectOptions.shopList" :key="`${item.shopName}:${index}`" :label="item.shopName" :value="`${item.shopName}:${index}`"></el-option>
             </el-select>
           </el-form-item>
@@ -377,18 +377,20 @@ export default {
     async getHomeData() {
       this.isLoading = true
       try {
-        const type = this.topSearchForm.type
+        let type = this.topSearchForm.type
         let address = undefined
         if (type) {
           address = this.topSearchForm[searchType.find((item) => item.value === type).key]
           if (address) {
             address = address.split(':')[0]
+          } else {
+            type = null
           }
         }
 
         const res = await getHomeStatisticsData({
           type: type || null,
-          address
+          address: address || undefined
         })
         const { data } = res
 
@@ -416,6 +418,7 @@ export default {
         // 地图数据
         this.nationalMapList = data.nationalMapList
       } catch (error) {
+        
       } finally {
         this.isLoading = false
       }