From 8f73ddb063bc7b164532dfbde279721809da8888 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 10 Oct 2022 11:07:23 +0800
Subject: [PATCH] 31081

---
 .../components/List.vue                       | 12 ++++++----
 .../components/Statistics.vue                 | 24 +++++++------------
 .../components/List.vue                       |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/project/pingchang/apps/AppBayonetRegistration/components/List.vue b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
index ee6d029e..148bbe6b 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/List.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
@@ -1,6 +1,6 @@
 <template>
   <ai-list class="list">
-    <ai-title slot="title" title="卡口登记" isShowBottomBorder :instance="instance" :hideLevel="0" :disabledLevel="disabledLevel" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
+    <ai-title slot="title" title="卡口登记" v-if="this.search.arriveAreaId" isShowBottomBorder :instance="instance" :isShowArea="true" v-model="search.arriveAreaId" @change="changeArea"></ai-title>
     <template slot="content">
       <div class="statistics-top">
         <div class="statistics-top__item">
@@ -133,7 +133,8 @@
         tableData: [],
         total: 0,
         loading: false,
-        disabledLevel: 0
+        disabledLevel: 0,
+        areaId: ''
       }
     },
 
@@ -142,9 +143,12 @@
     },
 
     created () {
-      this.disabledLevel = this.user.info.areaList.length - 1
-      this.search.arriveAreaId = this.user.info.areaId
       this.loading = true
+      this.instance.post(`/app/appdvcpconfig/getCorpArea`).then(res => {
+        if (res.code == 0) {
+          this.search.arriveAreaId = res.data
+        }
+      })
 
       this.getTotalInfo()
       this.getDictList()
diff --git a/project/pingchang/apps/AppCommunityManagement/components/Statistics.vue b/project/pingchang/apps/AppCommunityManagement/components/Statistics.vue
index 702e02eb..cffe811b 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/Statistics.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/Statistics.vue
@@ -93,7 +93,6 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
   import * as echarts from 'echarts'
   export default {
     name: 'Statistics',
@@ -126,10 +125,6 @@
       }
     },
 
-    computed: {
-      ...mapState(['user'])
-    },
-
     watch: {
       unitName (val) {
         this.$refs.tree.filter(val)
@@ -137,20 +132,20 @@
     },
 
     mounted () {
-      this.areaId = this.user.info.areaId
-      this.areaName = this.user.info.areaName
       this.endTime = this.$moment().format('YYYY-MM-DD')
       this.beginTime = this.$moment(new Date().getTime() - 7 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
-      this.getTree()
       this.loading = true
       this.$nextTick(() => {
         this.chart1 = echarts.init(document.querySelector('.chart1'))
         this.chart2 = echarts.init(document.querySelector('.chart2'))
         window.addEventListener('resize', this.onResize)
-
-        this.dict.load('sex').then(() => {
-          this.getInfo()
-        })
+        this.getInfo()
+      })
+      this.instance.post(`/app/appdvcpconfig/getCorpArea`).then(res => {
+        if (res.code == 0) {
+          this.areaId = res.data
+          this.getTree(res.data)
+        }
       })
     },
 
@@ -165,7 +160,6 @@
 
       onTreeChange (e) {
         this.areaId = e.id
-        this.areaName = e.name
 
         this.$nextTick(() => {
           this.getInfo()
@@ -177,8 +171,8 @@
         return data.name.indexOf(value) !== -1
       },
 
-      getTree () {
-        this.instance.post(`/admin/area/queryAllArea?id=${this.user.info.areaId}`).then(res => {
+      getTree (areaId) {
+        this.instance.post(`/admin/area/queryAllArea?id=${areaId}`).then(res => {
           if (res.code === 0) {
             let parent = res.data.map(v => {
               v.label = v.name
diff --git a/project/pingchang/apps/AppDataPermissionConfig/components/List.vue b/project/pingchang/apps/AppDataPermissionConfig/components/List.vue
index 8f8a892a..e416a6b3 100644
--- a/project/pingchang/apps/AppDataPermissionConfig/components/List.vue
+++ b/project/pingchang/apps/AppDataPermissionConfig/components/List.vue
@@ -117,7 +117,7 @@
         @onConfirm="onConfirm">
         <el-form ref="form" :model="form" label-width="110px" label-position="right">
           <el-form-item label="返乡登记" prop="fxdj">
-            <ai-area-get multiple v-model="form.fxdj" :root="user.info.areaId" :instance="instance" showAll></ai-area-get>
+            <ai-area-get multiple v-model="form.fxdj" :root="user.info.areaId" :instance="instance"></ai-area-get>
           </el-form-item>
           <el-form-item label="卡口登记-卡口" prop="kkdjKk">
             <ai-select