Merge branch 'develop' into 'test'

.env

@@ -4,7 +4,7 @@ VUE_APP_CUSTOMER_MENU_CODE=0001
 VUE_APP_BASE_MENU_CODE=0002
 VUE_APP_SYSTEM_MENU_CODE=0003
 VUE_APP_FEEDBACK_MENU_CODE=0018
-VUE_APP_WARNNING_MENU_CODE=0098
+VUE_APP_WARNNING_MENU_CODE=0100
 VUE_APP_STATISTICS_MENU_CODE=0044
 VUE_APP_DEVICE_MENU_CODE=0048
 VUE_APP_CUSTOMER_OPERATE_CODE=0077

src/components/input/AreaDashboard/mixin.js

@@ -12,7 +12,7 @@ export default {
     };
   },
   created() {
-    this.storeIndex = store.install(this.$store);
+    this.storeIndex = store.install(this.$store, this.$attrs);
   },
   mounted() {
     if (this.dashboardArea && !this.dashboardArea.length) {

src/components/input/AreaDashboard/store.js

@@ -3,21 +3,19 @@ import areaStroe from './areaStore';
 let index = 0;
 
 export default {
-  install(store) {
+  install(store, attrs) {
+    let name = attrs.name ? attrs.name : 'Da' + index++;
     if (!store.state.base) {
       store.registerModule(['base'], {
         state: {},
       });
     }
-    if (!store.state.base['dashboardArea' + index]) {
-      store.registerModule(['base', 'dashboardArea' + index], areaStroe);
-    } else {
-      index++;
-      store.registerModule(['base', 'dashboardArea' + index], areaStroe);
+    if (!store.state.base['dashboardArea' + name]) {
+      store.registerModule(['base', 'dashboardArea' + name], areaStroe);
     }
-    return index;
+    return name;
   },
-  uninstall(store) {
+  uninstall(store, index) {
     store.unregisterModule(['base', 'dashboardArea' + index]);
   },
 };

src/containers/Dashboard/CampusCustomerData/CampusCustomerData.vue

@@ -10,6 +10,7 @@
       </search-item>
       <search-item label="区域">
         <dashboard-area-select
+          name='campusData'
           :operateId="filters.operateId"
           :value="filters.choiceareaIds"
           multiple

src/containers/Dashboard/CustomerData/CustomerData.vue

@@ -10,6 +10,7 @@
       </search-item>
       <search-item label="区域">
         <dashboard-area-select
+          name='customerData'
           :operateId="filters.operateId"
           :value="filters.areaId"
           multiple

src/containers/Dashboard/Dashboard.js

@@ -205,12 +205,8 @@ const actions = {
       commit(GET_TITLE_DATA, data);
     });
   },
-  getWarnningCount({ commit, rootGetters }) {
-    getWarnningCount({
-      params: {
-        operatorId: rootGetters.userInfo.operateId,
-      },
-    }).then(res => {
+  getWarnningCount({ commit }) {
+    getWarnningCount().then(res => {
       commit(GET_WARNNING_COUNT, res.data);
     });
   },

src/containers/Dashboard/Dashboard.vue

@@ -42,7 +42,6 @@ export default {
     };
   },
   beforeDestroy() {
-    console.log('in beforeDestroy');
     if (this.timer) {
       clearInterval(this.timer);
     }

src/containers/HomePage/Demo.vue

@@ -8,29 +8,47 @@
           @input="val => updateFilters({operateId: val,areaIdArr:[]})"
         />
       </search-item>
-      <!-- <search-item label="区域">
+      <search-item label="区域1">
         <dashboard-area-select
-          :operateId="filters.operateId"
-          :value="filters.areaIdArr"
+          name='da1'
+          :operateId="3"
+          :value="filters.areaIdArr1"
           multiple
           @input="val => updateFilters({areaIdArr: val})"
         />
-      </search-item> -->
-      <search-item label="区域">
+      </search-item>
+      <search-item label="区域2">
+        <dashboard-area-select
+          name='da2'
+          :operateId="28"
+          :value="filters.areaIdArr2"
+          multiple
+          @input="val => updateFilters({areaIdArr: val})"
+        />
+      </search-item>
+      <search-item label="区域3">
+        <dashboard-area-select
+          :operateId="39"
+          :value="filters.areaIdArr3"
+          multiple
+          @input="val => updateFilters({areaIdArr: val})"
+        />
+      </search-item>
+      <!-- <search-item label="区域">
         <area-select
           :value="filters.areaId"
           @input="val => updateFilters({areaId: val})"
         />
-      </search-item>
+      </search-item> -->
 
-      <search-item label="服务">
+      <!-- <search-item label="服务">
         <area-service-select
           :areaId="filters.areaId"
           :filterList="[3]"
           :value="filters.service"
           @input="val => updateFilters({service: val})"
         />
-      </search-item>
+      </search-item> -->
     </template>
   </list-layout>
 </template>
@@ -41,7 +59,9 @@ export default {
     return {
       filters: {
         operateId: undefined,
-        areaIdArr: [],
+        areaIdArr1: [15],
+        areaIdArr2: [123],
+        areaIdArr3: [128],
         areaId: undefined,
         service: undefined,
       },