瀏覽代碼

清空设备台账为文件

zhangyu 4 年之前
父節點
當前提交
eb0ec6bd9d

+ 3 - 1
config/prod.env.js

@@ -7,7 +7,9 @@ module.exports = {
   // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
   // MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
   // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-  SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
+  // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
+//   BASE_URL: '"http://182.92.126.202"', //龙湖iframe地址
+  SSO_SERVER: '"http://182.92.126.202:8889/"',  //龙湖正式环境
    MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 }
 

+ 28 - 34
src/components/dialogs/list/batchDialog.vue

@@ -133,30 +133,30 @@
 </template>
 
 <script>
-  import myPagination from "@/components/ledger/lib/myPagination"
-  import tools from "@/utils/buildfloor/tools";
-
-  export default {
-    name: "batchDialog",
-    props: ['firmName', 'allObject', 'page', 'information','newEnclosure'],
-    components: {myPagination},
-    data() {
-      return {
-        form:{},
-        batchDialog: false,//dialog
-        active: 0,//进度条
-        checkAll: false,//全选
-        isIndeterminate: true,
-        checkedCities: [],//选择的项,单项
-        firm: [
-          {
-            name: "生产厂家/品牌型号",
-            code: "DPManufacturerID",
-            num: 2,
-          }, {
-            name: "供应商信息",
-            code: "DPSupplierID",
-            num: 8
+import myPagination from "@/components/ledger/lib/myPagination"
+import tools from "@/utils/buildfloor/tools";
+
+export default {
+  name: "batchDialog",
+  props: ['firmName', 'allObject', 'page', 'information', 'newEnclosure'],
+  components: {myPagination},
+  data() {
+    return {
+      form: {},
+      batchDialog: false,//dialog
+      active: 0,//进度条
+      checkAll: false,//全选
+      isIndeterminate: true,
+      checkedCities: [],//选择的项,单项
+      firm: [
+        {
+          name: "生产厂家/品牌型号",
+          code: "DPManufacturerID",
+          num: 2,
+        }, {
+          name: "供应商信息",
+          code: "DPSupplierID",
+          num: 8
           }, {
             name: "维修商信息",
             code: "DPMaintainerID",
@@ -230,18 +230,11 @@
     },
     filters: {
       filterImgName(value) {
-        if (value && value.length > 16) {
-          return value.substring(0, 12) + '...'
-        } else {
-          return value
-        }
+        return value && value.length > 16 ? value.substring(0, 12) + '...' : value
       } ,
       filterImgNames(value) {
-        if (value && value.length > 16) {
-          return value.substring(0, 16) + '...'
-        } else {
-          return value
-        }
+        return value && value.length > 16 ? value.substring(0, 16) + '...' : value
+
       }
     },
     methods: {
@@ -449,6 +442,7 @@
         this.$emit('getAllData')
       },
       multiple(val) {
+
         this.$emit('multiples',val)
       },
 

+ 2 - 2
src/components/ledger/cenote/dialog/addSpaceDialog.vue

@@ -77,7 +77,7 @@ export default {
   },
   data() {
     return {
-      title: "添加系统所在业务空间",
+      title: "添加竖井所在业务空间",
       keycode: "", //输入查询条件
       inSpaceType: "业务空间",
       Buildfloor: ["all"], // 选中的建筑楼层
@@ -220,4 +220,4 @@ export default {
     }
   }
 }
-</style>
+</style>

+ 68 - 63
src/components/ledger/handsontables/assets.vue

@@ -141,72 +141,72 @@
   </div>
 </template>
 <script>
-  import {
-    BeatchQueryParam,
-    countPartsDie,
-    createPropertys,
-    deleteProperty,
-    getDataDictionary,
-    propertyLinkEq,
-    queryProperty,
-    propertyUpdate,
-    updateProperty
-  } from "@/api/scan/request";
+import {
+  BeatchQueryParam,
+  countPartsDie,
+  createPropertys,
+  deleteProperty,
+  getDataDictionary,
+  propertyLinkEq,
+  propertyUpdate,
+  queryProperty,
+  updateProperty
+} from "@/api/scan/request";
 
-  import tools from "@/utils/scan/tools"
-  import handsonUtils from "@/utils/scan/hasontableUtils"
-  import showTools from "@/utils/handsontable/notShow"
-  import buildFloor from '@/utils/handsontable/buildFloorData'
-  import firm from "@/components/dialogs/list/firm"
-  import supplierDialog from "@/components/dialogs/list/supplierDialog"
-  import uploadFilesDialog from "@/components/dialogs/list/filesDialog"
-  import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog"
-  import maintainerDialog from "@/components/dialogs/list/maintainerDialog"
-  import insurerDialog from "@/components/dialogs/list/insurerDialog"
-  import picDialog from "@/components/dialogs/list/picDialog"
+import tools from "@/utils/scan/tools"
+import handsonUtils from "@/utils/scan/hasontableUtils"
+import showTools from "@/utils/handsontable/notShow"
+import buildFloor from '@/utils/handsontable/buildFloorData'
+import firm from "@/components/dialogs/list/firm"
+import supplierDialog from "@/components/dialogs/list/supplierDialog"
+import uploadFilesDialog from "@/components/dialogs/list/filesDialog"
+import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog"
+import maintainerDialog from "@/components/dialogs/list/maintainerDialog"
+import insurerDialog from "@/components/dialogs/list/insurerDialog"
+import picDialog from "@/components/dialogs/list/picDialog"
 
-  import qrcode from "@/components/business_space/lib/qrcode"
-  // import firm from "@/components/business_space/dialogs/list/firm"
-  import supplyDialog from "@/components/business_space/dialogs/list/supplyDialog"
-  // import supplierDialog from "@/components/business_space/dialogs/list/supplierDialog"
-  // import maintainerDialog from "@/components/business_space/dialogs/list/maintainerDialog"
-  // import insurerDialog from "@/components/business_space/dialogs/list/insurerDialog"
-  import guaranteeDialog from "@/components/business_space/dialogs/list/guaranteeDialog"
-  // import uploadFilesDialog from "@/components/business_space/dialogs/list/filesDialog"
-  // import uploadImgDialog from "@/components/business_space/dialogs/list/uploadImgDialog"
-  // import detailsDialog from "@/components/business_space/lib/detailsDia"
-  // import picDialog from "@/components/business_space/dialogs/list/picDialog"
-  import myPagination from "@/components/common/myPagination"
-  import myCascader from "@/components/ledger/lib/assets"
-  import floorCascader from "@/components/ledger/lib/floorCascader"
-  import dieCascader from "@/components/ledger/lib/partsDieList"
-  import {mapGetters} from "vuex"
-  //图片查看
-  import lookPic from "@/components/ledger/lib/lookImages"
-  import Handsontable from "handsontable-pro"
-  import 'handsontable-pro/dist/handsontable.full.css'
-  import batchDialog from "../../dialogs/list/batchDialog";
-  //下拉插件
-  // import "@/assets/js/chosen.jquery.min";
-  // import "@/assets/js/handsontable-chosen-editor";
+import qrcode from "@/components/business_space/lib/qrcode"
+// import firm from "@/components/business_space/dialogs/list/firm"
+import supplyDialog from "@/components/business_space/dialogs/list/supplyDialog"
+// import supplierDialog from "@/components/business_space/dialogs/list/supplierDialog"
+// import maintainerDialog from "@/components/business_space/dialogs/list/maintainerDialog"
+// import insurerDialog from "@/components/business_space/dialogs/list/insurerDialog"
+import guaranteeDialog from "@/components/business_space/dialogs/list/guaranteeDialog"
+// import uploadFilesDialog from "@/components/business_space/dialogs/list/filesDialog"
+// import uploadImgDialog from "@/components/business_space/dialogs/list/uploadImgDialog"
+// import detailsDialog from "@/components/business_space/lib/detailsDia"
+// import picDialog from "@/components/business_space/dialogs/list/picDialog"
+import myPagination from "@/components/common/myPagination"
+import myCascader from "@/components/ledger/lib/assets"
+import floorCascader from "@/components/ledger/lib/floorCascader"
+import dieCascader from "@/components/ledger/lib/partsDieList"
+import {mapGetters} from "vuex"
+//图片查看
+import lookPic from "@/components/ledger/lib/lookImages"
+import Handsontable from "handsontable-pro"
+import 'handsontable-pro/dist/handsontable.full.css'
+import batchDialog from "../../dialogs/list/batchDialog";
+//下拉插件
+// import "@/assets/js/chosen.jquery.min";
+// import "@/assets/js/handsontable-chosen-editor";
 
-  export default {
-    components: {
-      qrcode, //二维码页面
-      firm, //
-      supplyDialog,
-      supplierDialog,
-      guaranteeDialog,
-      uploadFilesDialog,
-      maintainerDialog,
-      insurerDialog,
-      uploadImgDialog,
-      picDialog,
-      myPagination,
-      // dialogAssets,
-      myCascader,
-      floorCascader,
-      dieCascader,
+export default {
+  components: {
+    qrcode, //二维码页面
+    firm, //
+    supplyDialog,
+    supplierDialog,
+    guaranteeDialog,
+    uploadFilesDialog,
+    maintainerDialog,
+    insurerDialog,
+    uploadImgDialog,
+    picDialog,
+    myPagination,
+    // dialogAssets,
+    myCascader,
+    floorCascader,
+    dieCascader,
       // detailsDialog,
       lookPic,
       batchDialog
@@ -1317,6 +1317,11 @@
       multiples(val) {
         this.firmDataType = 'dialog'
         switch (val) {
+          case 'TechParam.CompleteMachine.DesignIDGraph': //"设计工况空调机组处理过程焓湿图"
+            this.filesArr = this.forValue(this.newEnclosure, val) ? this.forValue(this.newEnclosure, val) : [];
+            this.infoType = val;
+            this.myDialog.uploadFiles = true;
+            break;
           case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
             this.filesArr = this.forValue(this.newEnclosure, val) ? this.forValue(this.newEnclosure, val) : [];
             this.infoType = val;

File diff suppressed because it is too large
+ 0 - 1609
src/components/ledger/handsontables/device.vue


+ 5 - 1
src/components/ledger/lib/excelDialog.vue

@@ -6,7 +6,7 @@
     </p>
     <el-upload
       class="upload-demo"
-      v-loading=loading
+      v-loading='loading'
       drag
       action="/api/datacenter/graphic/import/point"
       :show-file-list='false'
@@ -60,6 +60,10 @@ export default {
         this.loading = false
         this.messageKey = event.Message
         this.$message.success('上传成功')
+      } else {
+        this.loading = false
+        this.messageKey =''
+        this.$message.error('目前只支持.xlsx格式,请重新上传')
       }
     },
     error(event, file, fileList) {

+ 2 - 1
src/components/ledger/lib/uploadImgsName.vue

@@ -127,7 +127,8 @@
     delImage(i, key) {
       if (this.type == "video") {
         this.videoPicArr = this.videoPicArr.map(item => {
-          if (item.key.substring(0, item.length - 3) == this.imagesArr[i].key.substring(0, this.imagesArr[i].length - 3)) {
+          if (item.Key.substring(0, item.length - 3) == this.imagesArr[i].Key.substring(0, this.imagesArr[i].length - 3)) {
+          // if (item.key.substring(0, item.length - 3) == this.imagesArr[i].key.substring(0, this.imagesArr[i].length - 3)) {
             return undefined
           } else {
             return item

+ 4 - 0
src/components/relation/overview/CardList.vue

@@ -168,6 +168,7 @@
       :TableVisibleMoreLoading="TableVisibleMoreLoading"
       @openComputed="openComputed"
       @RelationType="RelationType"
+      @Refresh="Refresh"
     />
   </div>
 
@@ -225,6 +226,9 @@
     computed: {},
 
     methods: {
+      Refresh() {
+        this.$emit('Refresh')
+      },
       explain() {
         // alert('explain click')
       },

+ 2 - 1
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -519,7 +519,7 @@
       },
 
       promptly() {
-    
+
         if (this.isComputed.IsAutomatic && !this.isComputed.IsSource) { //需要自动计算并且不需要配置云末端
           this.$emit('RelationType', this.isComputed.RelationType, this.isComputed.ZoneType)
         }
@@ -593,6 +593,7 @@
         }
         calcSpecial(params, res => {
           this.$message.success('计算成功')
+          this.$emit('Refresh')
         })
 
       },

+ 68 - 50
src/framework/layout/Main.vue

@@ -1,52 +1,56 @@
 <template>
     <div id='page-main' v-bind:class='{"page-sidebar-closed": sidebarClosed}'>
-        <page-header></page-header>
+      <page-header></page-header>
 
-        <div id='page-container' class='page-container'>            
-            <page-sidebar></page-sidebar>            
-            <div id='page-content-wrapper' class='page-content-wrapper'>
-                <div class='page-bar'>
-                    <el-breadcrumb separator='/'>
-                    <el-breadcrumb-item v-show="!breadcrumb.length"  :to='{ path: "/" }'>首页</el-breadcrumb-item>
-                    <el-breadcrumb-item v-show="breadcrumb.length" v-for='(b, index) in breadcrumb' :key='index' :to='b.path ? { path: b.path } : null'>{{b.label}}</el-breadcrumb-item>                       
-                    </el-breadcrumb>
-                </div>
-                <!-- <router-view class='page-content'/> -->
-                <keep-alive>
-                    <router-view v-if='$route.meta.keepAlive' class='page-content'></router-view>
-                </keep-alive>
-                <router-view v-if='!$route.meta.keepAlive' class='page-content'></router-view>
-            </div>
+      <div id='page-container' class='page-container'>
+        <page-sidebar></page-sidebar>
+        <div id='page-content-wrapper' class='page-content-wrapper'>
+          <div class='page-bar'>
+            <el-breadcrumb separator='/'>
+              <el-breadcrumb-item v-show="!breadcrumb.length" :to='{ path: "/" }'>首页</el-breadcrumb-item>
+              <el-breadcrumb-item v-show="breadcrumb.length" v-for='(b, index) in breadcrumb' :key='index'
+                                  :to='b.path ? { path: b.path } : null'>{{ b.label }}
+              </el-breadcrumb-item>
+            </el-breadcrumb>
+          </div>
+          <!-- <router-view class='page-content'/> -->
+          <keep-alive>
+            <router-view v-if='$route.meta.keepAlive' class='page-content'></router-view>
+          </keep-alive>
+          <router-view v-if='!$route.meta.keepAlive' class='page-content'></router-view>
+                <div class="version">当前版本: V4.0.1</div>
         </div>
-        <!-- <div class='page-footer'>
-            © 2016 SAGACLOUD. All rights reserved 京ICP备16059843号-1
-        </div>-->
+      </div>
+      <!--     <div class='page-footer'>-->
+      <!--            © 2016 SAGACLOUD. All rights reserved 京ICP备16059843号-1-->
+      <!--        </div>-->
     </div>
 </template>
 <script>
-import { mapGetters, mapMutations } from 'vuex'
+import {mapGetters, mapMutations} from 'vuex'
 import PageHeader from './PageHeader'
 import PageSidebar from './PageSidebar'
-import menus from '@/data/menus' 
+import menus from '@/data/menus'
+
 export default {
-    name: 'Main',
-    components: {
-        'page-header': PageHeader,
-        'page-sidebar': PageSidebar
-    },
-    props: [],
-    data() {
-        return {
-            isPath:  false
-        }
-    },
-    computed: {
-        ...mapGetters('layout', ['sidebarClosed', 'breadcrumb'])
-    },
-    methods: {
-        ...mapMutations('layout', ['setSidebarClosed','setSidebarSelected']),
-        windwoResize() {
-            // 窗口大小发生变化时
+  name: 'Main',
+  components: {
+    'page-header': PageHeader,
+    'page-sidebar': PageSidebar
+  },
+  props: [],
+  data() {
+    return {
+      isPath: false
+    }
+  },
+  computed: {
+    ...mapGetters('layout', ['sidebarClosed', 'breadcrumb'])
+  },
+  methods: {
+    ...mapMutations('layout', ['setSidebarClosed', 'setSidebarSelected']),
+    windwoResize() {
+      // 窗口大小发生变化时
             let clientWidth = `${document.documentElement.clientWidth}`
             let clientHeight = `${document.documentElement.clientHeight}`
             //this.setPageContentHeight(height)
@@ -71,17 +75,31 @@ export default {
     },
     watch: {
         "$route": {
-            handler: function(route, oldVal){
-                let path = route.path
-                this.isPath = false;
-                this.findPathInArray(menus,path)
-                if(this.isPath) {
-                    this.setSidebarSelected(path)
-                }
-            },
-            // 深度观察监听
-            deep: true
+          handler: function (route, oldVal) {
+            let path = route.path
+            this.isPath = false;
+            this.findPathInArray(menus, path)
+            if (this.isPath) {
+              this.setSidebarSelected(path)
+            }
+          },
+          // 深度观察监听
+          deep: true
         }
     },
 }
-</script>
+</script>
+<style lang="less">
+#page-main {
+
+  .version {
+    order: 2;
+    flex-grow: 0;
+    flex-shrink: 0;
+    height: 15px;
+    line-height: 1.5;
+    text-align: center;
+    color: #6d6d6d;
+  }
+}
+</style>

+ 10 - 10
src/framework/layout/PageHeader.vue

@@ -22,16 +22,16 @@
               yanruolan
               <i class='el-icon-fa-user el-icon--right'></i>
           </span>
-      <!--      <el-dropdown trigger='hover' class='user-menu-dropdown' @command='userMenuCommand'>-->
-      <!--                <span class='el-dropdown-link'>-->
-      <!--                    {{ userInfo.userName }}-->
-      <!--                    <i class='el-icon-fa-user el-icon&#45;&#45;right'></i>-->
-      <!--                </span>-->
-      <!--        <el-dropdown-menu slot='dropdown'>-->
-      <!--          <el-dropdown-item icon='el-icon-plus' command='logout'>退出</el-dropdown-item>-->
-      <!--          <el-dropdown-item icon='el-icon-circle-plus'>修改密码</el-dropdown-item>-->
-      <!--        </el-dropdown-menu>-->
-      <!--      </el-dropdown>-->
+<!--      <el-dropdown trigger='hover' class='user-menu-dropdown' @command='userMenuCommand'>-->
+<!--                      <span class='el-dropdown-link'>-->
+<!--                          {{ userInfo.userName }}-->
+<!--                          <i class='el-icon-fa-user el-icon&#45;&#45;right'></i>-->
+<!--                      </span>-->
+<!--        <el-dropdown-menu slot='dropdown'>-->
+<!--          <el-dropdown-item icon='el-icon-plus' command='logout'>退出</el-dropdown-item>-->
+<!--          <el-dropdown-item icon='el-icon-circle-plus'>修改密码</el-dropdown-item>-->
+<!--        </el-dropdown-menu>-->
+<!--      </el-dropdown>-->
       <ul class="header-nav">
         <li class="header-nav-Splitscreen">
           <a href="/splitScreen" target="_blank"><i class="el-icon-s-platform"></i></a>

+ 1 - 0
src/framework/layout/layout-store.js

@@ -1,3 +1,4 @@
+
 import frameworkApi from '@/api/framework'
 import storage from '@/framework/utils/storage'
 import lStorage from '@/utils/localStorage'

+ 1 - 0
src/views/ledger/cenotelist/index.vue

@@ -336,6 +336,7 @@ export default {
         data: "SpaceList",
         renderer: (instance, td, row, col, prop, value, cellProperties) => {
           td.style.color = "#409EFF";
+          td.style.cursor = "pointer";
           td.innerHTML = `<span>${value?value.length:0}</span>`
           return td;
         },

+ 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);

+ 5 - 0
src/views/relation/overview/index.vue

@@ -7,6 +7,7 @@
       @calcSpecial="calcSpecial"
       @openComputed="openComputed"
       @RelationType="RelationType"
+      @Refresh="Refresh"
     />
   </div>
 </template>
@@ -223,6 +224,10 @@ export default {
       sysDirection(param, res => {
         this.init();
       });
+    },
+    Refresh() {
+
+      this.init()
     }
   }
 };

+ 0 - 1
src/views/system/auth/index.vue

@@ -22,7 +22,6 @@ export default {
     this.$router.replace({path: "/"})
     // this.$store.dispatch('layout/loadUserInfo').then(resp => {
     //     console.log('store dispatch result ', resp)
-    //     // if (resp.result  == 'success') {
     //     if (resp.Result  == 'success') {
     //         let lastRoute = this.$store.getters['lastRoute']
     //         console.log('last route ', lastRoute)