Prechádzať zdrojové kódy

adm:fix> 7042 删除扇形图其他分区id显示

shaun-sheep 4 rokov pred
rodič
commit
568831b88d

+ 0 - 1
src/components/ledger/handsontables/device.vue

@@ -852,7 +852,6 @@ export default {
     },
     // 更新
     updateBusiness(data, change) {
-      console.log(data, change, '=================================')
       let param = {
           Content: [],
           Projection: [],

+ 85 - 91
src/views/ledger/report/index.vue

@@ -119,75 +119,75 @@
 </template>
 
 <script>
-  import {mapGetters} from "vuex";
-  import {
-    countEquip,
-    countGeneralSys,
-    countProperty,
-    gatherInfoPoint,
-    getCenoteType,
-    getDataDictionary,
-    infoPoint,
-    notSyncObject,
-    notSyncRelationData,
-    postRelationInforAtpism,
-    queryCenoteCount,
-    queryDefaultFunTypes,
-    queryLederDelObject,
-    queryPart,
-    queryPartitionRatio,
-    queryRentCount,
-    queryShaftFunctionType,
-    queryTenantCompletion,
-    queryZoneCount,
-    ShaftRelationBusinessSpace,
-    systemInfoPoint
-  } from "@/api/scan/request";
-  import dataOrigin from "@/components/ledger/report/dataorigin";
-  import datafan from "@/components/ledger/report/datafan";
-  import dataExport from "@/components/ledger/report/dataexport";
-
-  export default {
-    data() {
-      return {
-        lederDelObjectCount: null,// 台账中待删除的对象
-        notSyncObjectCount: null,// 不能同步到物理世界的对象
-        notSyncDataCount: null,// 不能同步到物理世界的关系数据
-        postRelationInforCount: null,// 岗位和关联的资产信息点值不一致
-        equipCount: null,// 设备总数
-        equipment: [],// 设备数据
-        assetsCount: null,// 资产总数
-        assets: [],// 资产数据
-        parts: [],// 部件数据
-        partsCount: null,// 部件总数
-        zoneSpaceCount: null,// 业务空间总数
-        zoneType: [// 分区类型
-          {
-            "Code": "GeneralZone",
-            "Name": "默认分区",
-            "Rel_type": "99"
-          },
-          {
-            "Name": "供电分区",
-            "Rel_type": "1",
-            "Code": "PowerSupplyZone"
-          },
-          {
-            "Name": "照明分区",
-            "Rel_type": "2",
-            "Code": "LightingZone"
-          },
-          {
-            "Name": "网络分区",
-            "Rel_type": "3",
-            "Code": "NetworkZone"
-          },
-          {
-            "Code": "AirConditioningZone",
-            "Name": "空调分区",
-            "Rel_type": "4"
-          },
-          {
+import {mapGetters} from "vuex";
+import {
+  countEquip,
+  countGeneralSys,
+  countProperty,
+  gatherInfoPoint,
+  getCenoteType,
+  getDataDictionary,
+  infoPoint,
+  notSyncObject,
+  notSyncRelationData,
+  postRelationInforAtpism,
+  queryCenoteCount,
+  queryDefaultFunTypes,
+  queryLederDelObject,
+  queryPart,
+  queryPartitionRatio,
+  queryRentCount,
+  queryShaftFunctionType,
+  queryTenantCompletion,
+  queryZoneCount,
+  ShaftRelationBusinessSpace,
+  systemInfoPoint
+} from "@/api/scan/request";
+import dataOrigin from "@/components/ledger/report/dataorigin";
+import datafan from "@/components/ledger/report/datafan";
+import dataExport from "@/components/ledger/report/dataexport";
+
+export default {
+  data() {
+    return {
+      lederDelObjectCount: null,// 台账中待删除的对象
+      notSyncObjectCount: null,// 不能同步到物理世界的对象
+      notSyncDataCount: null,// 不能同步到物理世界的关系数据
+      postRelationInforCount: null,// 岗位和关联的资产信息点值不一致
+      equipCount: null,// 设备总数
+      equipment: [],// 设备数据
+      assetsCount: null,// 资产总数
+      assets: [],// 资产数据
+      parts: [],// 部件数据
+      partsCount: null,// 部件总数
+      zoneSpaceCount: null,// 业务空间总数
+      zoneType: [// 分区类型
+        {
+          "Code": "GeneralZone",
+          "Name": "默认分区",
+          "Rel_type": "99"
+        },
+        {
+          "Name": "供电分区",
+          "Rel_type": "1",
+          "Code": "PowerSupplyZone"
+        },
+        {
+          "Name": "照明分区",
+          "Rel_type": "2",
+          "Code": "LightingZone"
+        },
+        {
+          "Name": "网络分区",
+          "Rel_type": "3",
+          "Code": "NetworkZone"
+        },
+        {
+          "Code": "AirConditioningZone",
+          "Name": "空调分区",
+          "Rel_type": "4"
+        },
+        {
             "Name": "采暖分区",
             "Rel_type": "5",
             "Code": "HeatingZone"
@@ -278,13 +278,6 @@
           type: 'warning'
         });
       },
-      zoneTypeConversion(item) {// 分区类型转换
-        this.zoneType.forEach(it => {
-          if (item.Name === it.Code) {
-            item.Name = it.Name;
-          }
-        })
-      },
       functionTypeTranstion(item, type) {// 默认分区功能类型转换
         type.forEach(it => {
           if (item.Name === it.Code) {
@@ -657,22 +650,23 @@
           this.defaultPart = [];
           let res1 = response[0]
           let res2 = response[1]
-          if (res1.Content.length) {
-            res1.Content.forEach(item => {
-              this.zoneTypeConversion(item);
-            })
-            let arr = res1.Content.filter(i => i.Count).forEach(j => {
-              this.partProtion.push({
-                name: j.Name + j.Count,
-                value: j.Count
-              })
-            })
-            this.business.push({
-              title: '各分区占比',
-              tips: '各类型分区实例数量与实例总数占比',
-              needCountO: this.partProtion,
+          res1.Content.length && res1.Content.filter(i => i.Count).forEach(j => {
+            this.zoneType.forEach(l => {
+              if (l.Code == j.Name) {
+                this.partProtion.push({
+                  name: l.Name + j.Count,
+                  value: j.Count
+                })
+              }
             })
-          }
+
+          })
+          this.business.push({
+            title: '各分区占比',
+            tips: '各类型分区实例数量与实例总数占比',
+            needCountO: this.partProtion,
+          })
+          // }
           if (res2.Content.length) {
             res2.Content.forEach(item => {
               this.functionTypeTranstion(item, this.functionType);