BUG

operationSupport/src/components/common/Home.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zouwenying
  * @Date: 2020-10-22 15:51:29
- * @LastEditTime: 2022-08-16 18:38:03
+ * @LastEditTime: 2022-08-17 14:44:17
  * @LastEditors: D4THYL3
  * @Description: In User Settings Edit
  * @FilePath: \vue-manage-system-master\src\components\others\Home.vue
@@ -28,7 +28,6 @@
           <keep-alive :include="treeList">
             <router-view></router-view>
           </keep-alive>
-          <!-- <router-view v-else></router-view> -->
           <!-- <router-view></router-view> -->
         </transition>
       </div>
@@ -77,7 +76,12 @@ export default {
     treeList () {
       let resTree;
       resTree = this.$store.getters['getTreeListAll'];
-      return resTree
+      if (resTree == this.$route.name) {
+        return resTree;
+      } else {
+        resTree = '';
+        return resTree;
+      }
     },
     tagsList () {
       let arr = [],

operationSupport/src/components/common/buildingTree.vue

@@ -170,7 +170,7 @@ export default {
   },
   created () {
     this.getOrgTreeList();
-  }
+  },
 };
 </script>
 

operationSupport/src/components/common/organTree.vue

@@ -126,7 +126,7 @@ export default {
   },
   created () {
     this.getOrgTreeList();
-  }
+  },
 };
 </script>
 

operationSupport/src/views/newWorkBench/components/collectionRate.vue

@@ -31,7 +31,12 @@
         </div>
       </div>
       <div class="model-content">
-        <process-circle
+        <zz-echart
+          :option="clientOptions"
+          class="chart"
+          style="top: 15px; width: 270px;"
+        ></zz-echart>
+        <!-- <process-circle
           class="item"
           :strokeWidth="strokeWidth"
           :strokeColor="strokeColor"
@@ -44,7 +49,7 @@
             style="font-size: 14px"
           >收款率</span>
           <span> {{ dataObj.collectionRate }}</span>
-        </process-circle>
+        </process-circle> -->
         <div class="textAmount">
           <div class="listAmount">
             <div class="listText">应收金额</div>
@@ -69,6 +74,7 @@
 </template>
 <script>
 import processCircle from './circle'; // 环形进度条
+import { quantitativeAnalysisDashboard } from './indexOptionChart';
 import permissionComponent from './permissionComponent';
 export default {
   mixins: [permissionComponent],
@@ -81,6 +87,9 @@ export default {
         permissUrl: '14',
         titleName: '收费管理'
       },
+      clientOptions: quantitativeAnalysisDashboard(
+        ['收款率'], [50], []
+      ),
       strokeWidth: 15, // 线条宽度
       trailWidth: 15, // 背景线条宽度
       trailColor: '#2C3345', // 背景线条宽度
@@ -136,6 +145,9 @@ export default {
             uncollected: !!data.uncollectedAmount ? data.uncollectedAmount : 0,
             collectionRate: !!data.collectionRate ? data.collectionRate : '0%'
           };
+          let a = this.dataObj.collectionRate.indexOf('%');
+          let b = this.dataObj.collectionRate.substring(0, a);
+          this.clientOptions = quantitativeAnalysisDashboard(['收款率'], [b], []);
         } else {
           this.dataObj = {
             receivableAmount: 0,

operationSupport/src/views/newWorkBench/components/indexOptionChart.js

@@ -1665,3 +1665,92 @@ export const quantitativeAnalysisProblems = (name = [], namexAxis = '', nameyAxi
 
     return option;
 };
+
+export const quantitativeAnalysisDashboard = (name = [], data = [], color = []) => {
+    const percent = data[0]; // 数值
+    let option = {
+        // backgroundColor: 'rgba(8, 17, 67, 0.9)',
+        title: {
+            text: name,
+            left: 'center',
+            top: '30%',
+            textStyle: {
+                color: 'rgba(245, 247, 247,0.6)',
+                fontSize: 16
+            },
+            subtext: `${percent} %`,
+            subtextStyle: {
+                color: 'rgba(245, 247, 247,1)',
+                fontSize: 16
+            }
+        },
+        polar: {
+            radius: ['75%', '100%'],
+            center: ['50%', '50%']
+        },
+        // 极坐标角度轴
+        angleAxis: {
+            min: 0,
+            max: 100,
+            // startAngle: 0,
+            // endAngle: -0,
+            clockwise: true,
+            show: false // 隐藏刻度线
+        },
+        // 极坐标径向轴
+        radiusAxis: {
+            type: 'category',
+            // 隐藏极坐标轴线
+            axisLine: {
+                show: false
+            },
+            axisTick: {
+                show: false
+            }
+        },
+        tooltip: {
+            show: true,
+            formatter: (val) => {
+                return `${val.seriesName}: ${val.data}%`;
+            }
+            // backgroundColor: 'rgba(31, 196, 225, 0.2)',
+            // borderColor: 'rgba(31, 196, 225, 0.6)'
+        },
+        series: [
+            {
+                // 进度条
+                type: 'bar',
+                name: name,
+                coordinateSystem: 'polar',
+                // 设置柱子背景灰色，需开启showBackground才能显示backgroundStyle
+                showBackground: true,
+                backgroundStyle: {
+                    // 外圈颜色
+                    // color: 'rgba(14, 61, 128,0.3)',
+                },
+                // 两端设置圆角
+                roundCap: true,
+                itemStyle: {
+                    color: {
+                        x: 0,
+                        y: 0,
+                        x1: 0,
+                        y1: 1,
+                        colorStops: [
+                            {
+                                offset: 0,
+                                color: 'rgba(94, 237, 204,0.65)'
+                            },
+                            {
+                                offset: 1,
+                                color: 'rgba(36,195,241,0.8)'
+                            }
+                        ]
+                    }
+                },
+                data: [percent]
+            }
+        ]
+    };
+    return option;
+};

operationSupport/src/views/newWorkBench/components/rentalAndSaleRate.vue

@@ -32,7 +32,7 @@ let defaultTitle = {
   subtextStyle: {
     rich: {
       b: {
-        fontSize: 30,
+        fontSize: 26,
         color: '#fff'
       }
     }
@@ -68,7 +68,7 @@ export default {
         subtextStyle: {
           rich: {
             b: {
-              fontSize: 30,
+              fontSize: 26,
               color: '#fff'
             }
           }

operationSupport/src/views/ownerManagement/index.vue

@@ -2,12 +2,12 @@
   <div class="content main">
     <organ-tree
       @organId="currentOrganId"
-      v-if="!ownerStatus"
+      v-show="!ownerStatus"
       :buildingType="1"
     ></organ-tree>
     <div
       class="content-right"
-      v-if="!ownerStatus"
+      v-show="!ownerStatus"
     >
       <div class="search">
         <el-input
@@ -234,7 +234,7 @@
     </div>
 
     <add-owner
-      v-else
+      v-show="!!ownerStatus"
       :params="activeData"
       @clerOwnerStatus="clerOwnerStatus"
       :isAdd="isAdd"

operationSupport/src/views/ownerManagement/landlordManagement/index.vue

@@ -2,13 +2,12 @@
   <div class="content main">
     <organ-tree
       @organId="currentOrganId"
-      v-if="!ownerStatus"
+      v-show="!ownerStatus"
     ></organ-tree>
     <!-- :buildingType="10" -->
-
     <div
       class="content-right"
-      v-if="!ownerStatus"
+      v-show="!ownerStatus"
     >
       <div class="search">
         <el-input
@@ -170,7 +169,7 @@
     </div>
 
     <add-owner
-      v-else
+      v-show="!!ownerStatus"
       :params="activeData"
       @clerOwnerStatus="clerOwnerStatus"
       :isAdd="isAdd"

operationSupport/src/views/ownerManagement/landlordManagement/stepPage/add.vue

@@ -692,6 +692,7 @@ export default {
 
     },
     closes () {
+      // this.$store.commit('setTreeListAll', 'ownerManagement/landlordManagement/index');
       this.$emit('clerOwnerStatus');
     },
     addEdit () {