Merge branch 'dev' into build

# Conflicts:
#	package.json
#	project/dv/apps/AppGridDV.vue

project/dv/apps/AppGridDV.vue

@@ -24,16 +24,14 @@
           id="tree"
           class="tree"
           :style="{left: x, top: y, transform: `scale(${scale}) translate(-50%, -50%) `, 'transform-origin': `${0} ${0}`}">
-        <VueOkrTree
-            ref="VueOkrTree"
-            :data="chartData"
-            node-key="id"
-            show-collapsable
-            aniamte
-            animate-name="okr-fade-in-linear"
-            :render-content="renderContent"
-            default-expand-all>
-        </VueOkrTree>
+        <ai-okr-tree ref="VueOkrTree" v-if="chartData.length"
+                     :data="chartData"
+                     node-key="id"
+                     show-collapsable
+                     aniamte
+                     animate-name="okr-fade-in-linear"
+                     :render-content="renderContent"
+                     default-expand-all/>
       </div>
     </div>
     <div class="right">
@@ -73,7 +71,6 @@
           <span>{{ residentInfo.currentAreaName }}</span>
         </div>
         <ai-table
-            v-if="tableData.length"
             style="width: 558px"
             :tableData="tableData"
             :col-configs="colConfigs"
@@ -90,8 +87,6 @@
 
 <script>
 import {barChart1, pieChart2} from "./components/chartOps"
-import {VueOkrTree} from 'vue-okr-tree'
-import 'vue-okr-tree/dist/vue-okr-tree.css'
 
 export default {
   name: 'AppGridDV',
@@ -157,10 +152,6 @@ export default {
     }
   },
 
-  components: {
-    VueOkrTree
-  },
-
   created() {
     this.dict.load('householdRelation')
     this.getTreeList()
@@ -237,7 +228,6 @@ export default {
     handleNodeClick(e) {
       this.girdLevel = e.girdLevel
       this.isLoading = true
-      console.log(e)
       this.getGirdInfo(e.id, e.girdLevel)
       this.getStatisticsInfo(e.id)
     },
@@ -350,7 +340,6 @@ export default {
       this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
         if (res.code == 0) {
           const chartData = this.formatList([res.data])
-          console.log(chartData)
           this.chartData = chartData
 
           this.$nextTick(() => {