Merge remote-tracking branch 'origin/build' into build

packages/xbot/AppSensitiveStatistics/AppSensitiveStatistics.vue

@@ -34,7 +34,7 @@
               <span class="shortcut" v-for="(item,i) in timeCheck" :key="i" :class="{active:type==i}"
                 @click="timeChange(i)" v-text="item"/>
               <el-cascader ref="cascader2" clearable v-model="deptList" :options="deptOptions" placeholder="所属部门" size="small"
-                :props="defaultProps" :show-all-levels="false" @change="deptSelect"></el-cascader>
+                :props="defaultProps" :show-all-levels="false" @visible-change="deptSelect"></el-cascader>
             </el-row>
           </template>
         </ai-title>
@@ -106,7 +106,7 @@ export default {
     return {
       defaultProps: {
         label: 'name',
-        value: 'id',
+        value: 'fullId',
         checkStrictly: true,
       },
       deptOptions: [],
@@ -361,9 +361,9 @@ export default {
       }
     },
     deptSelect(val) {
-      this.deptList = val
+      if(!val) {
-      this.$refs.cascader2.dropDownVisible = false;
         this.getStatistics()
+      }
     },
     timeChange(index) {
       this.type = index

packages/xbot/AppWorkStatistics/AppWorkStatistics.vue

@@ -110,7 +110,7 @@ export default {
     return {
       defaultProps: {
         label: 'name',
-        value: 'id',
+        value: 'fullId',
         checkStrictly: true,
       },
       deptOptions: [],
@@ -365,9 +365,9 @@ export default {
       }
     },
     deptSelect(val) {
-      this.deptList = val
+      if(!val) {
-      this.isTypeInit = false
         this.getStatistics()
+      }
     },
     timeChange(index) {
       this.type = index