Pārlūkot izejas kodu

wanda-adm:feat > 修改总览表格映射关系

shaun-sheep 3 gadi atpakaļ
vecāks
revīzija
6c2fe3b035

+ 22 - 17
public/index.html

@@ -7,31 +7,36 @@
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2327510_7jj0x1gmztq.css"/>
+    <meta http-equiv="Cache" content="no-cache">
+    <meta http-equiv="Pragma" content="no-cache"/>
+    <meta http-equiv="Expires" content="0"/>
     <title><%= htmlWebpackPlugin.options.title %></title>
 </head>
 <body>
 <noscript>
-  <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
-    Please enable it to continue.</strong>
+    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
+        Please enable it to continue.</strong>
 </noscript>
 <div id="app"></div>
 <!-- built files will be auto injected -->
 </body>
 <style>
-  html {
-    height: 100%;
-  }
-  ::-webkit-scrollbar {
-      width: 8px;
-      height: 8px;
-  }
-  ::-webkit-scrollbar-thumb {
-      height: 50px;
-      outline-offset: -2px;
-      outline: 2px solid #dddee0;
-      border: 2px solid #dddee0;
-      background-color: #dddee0;
-      border-radius: 4px;
-  }
+    html {
+        height: 100%;
+    }
+
+    ::-webkit-scrollbar {
+        width: 8px;
+        height: 8px;
+    }
+
+    ::-webkit-scrollbar-thumb {
+        height: 50px;
+        outline-offset: -2px;
+        outline: 2px solid #dddee0;
+        border: 2px solid #dddee0;
+        background-color: #dddee0;
+        border-radius: 4px;
+    }
 </style>
 </html>

+ 9 - 9
src/views/maintain/relationship/components/tableHeader.ts

@@ -1,12 +1,12 @@
 const tableHeader = {
-    '设备所在建筑': [['建筑', 'objectInfo-name'], ['BIM构件名称', 'bimTypeId'], ['系统分类','systemCategory'], ['设备类型名称','codeName'], ['设备本地编码', "localId"]],
-    '设备所在楼层': [['建筑', 'objectInfo-name'], ['楼层','floorName'], ['BIM构件名称', 'bimTypeId'], ['系统分类','systemCategory'], ['设备类型名称','codeName'], ['设备本地编码', "localId"]],
-    '设备所在功能空间': [['空间本地名称', "localName"], ['空间本地编码', "localId"], ['建筑', 'objectInfo-name'], ['楼层','floorName'], ['BIM构件名称', 'bimTypeId'], ['系统分类','systemCategory'], ['设备类型名称','codeName'], ['设备本地编码', "localId"]],
-    '设备服务功能空间': [['空间本地名称', "localName"], ['空间本地编码', "localId"], ['建筑', 'objectInfo-name'], ['楼层','floorName'], ['BIM构件名称', 'bimTypeId'], ['系统分类','systemCategory'], ['设备类型名称','codeName'], ['设备本地编码', "localId"]],
-    '设备所在供电空间': [['空间本地名称', "localName"], ['空间本地编码', "localId"], ['建筑', 'objectInfo-name'], ['楼层','floorName'], ['BIM构件名称', 'bimTypeId'], ['系统分类','systemCategory'], ['设备类型名称','codeName'], ['设备本地编码', "localId"]],
-    '空间所在建筑': [['建筑', 'objectInfo-name'], ['空间本地名称', "localName"], ['空间本地编码', "localId"], ['楼层','floorName']],
-    '空间所在楼层': [['建筑', 'objectInfo-name'], ['楼层','floorName'], ['空间本地名称', "localName"], ['空间本地编码', "localId"]],
-    '空间服务空间': [['空间本地名称', "localName"], ['空间本地编码', "localId"], ['建筑', 'objectInfo-name'], ['楼层','floorName'], ['空间本地名称', "localName"], ['空间本地编码', "localId"], ['楼层','floorName']],
-    '系统下的设备': [['系统分类','systemCategory'], ['系统名称',''], ['系统编码',''], ['BIM构件名称', 'bimTypeId'], ['系统分类','systemCategory'], ['设备类型名称','codeName'], ['设备本地编码', "localId"]],
+    '设备所在建筑': [['建筑', 'objectInfo-localName'], ['BIM构件名称', 'bimTypeId'], ['系统分类', 'systemCategory'], ['设备类型名称', 'codeName'], ['设备本地编码', "localId"]],
+    '设备所在楼层': [['建筑', 'objectInfo-buildingName'], ['楼层', 'objectInfo-localName'], ['BIM构件名称', 'bimTypeId'], ['系统分类', 'systemCategory'], ['设备类型名称', 'codeName'], ['设备本地编码', "localId"]],
+    '设备所在功能空间': [['空间本地名称', "objectInfo-localName"], ['空间本地编码', "objectInfo-localId"], ['建筑', 'objectInfo-localName'], ['楼层', 'objectInfo-floorName'], ['BIM构件名称', 'bimTypeId'], ['系统分类', 'systemCategory'], ['设备类型名称', 'codeName'], ['设备本地编码', "localId"]],
+    '设备服务功能空间': [['空间本地名称', "objectInfo-localName"], ['空间本地编码', "objectInfo-localId"], ['建筑', 'objectInfo-localName'], ['楼层', 'objectInfo-floorName'], ['BIM构件名称', 'bimTypeId'], ['系统分类', 'systemCategory'], ['设备类型名称', 'codeName'], ['设备本地编码', "localId"]],
+    '设备所在供电空间': [['空间本地名称', "objectInfo-localName"], ['空间本地编码', "objectInfo-localId"], ['建筑', 'objectInfo-localName'], ['楼层', 'objectInfo-floorName'], ['BIM构件名称', 'bimTypeId'], ['系统分类', 'systemCategory'], ['设备类型名称', 'codeName'], ['设备本地编码', "localId"]],
+    '空间所在建筑': [['建筑', 'localName'], ['空间本地名称', "objectInfo-localName"], ['空间本地编码', "objectInfo-localId"], ['楼层', 'objectInfo-floorName']],
+    '空间所在楼层': [['建筑', 'buildingName'], ['楼层', 'localName'], ['空间本地名称', "objectInfo-localName"], ['空间本地编码', "objectInfo-localId"]],
+    '空间服务空间': [['空间本地名称', "buildingName"], ['空间本地编码', "localId"], ['建筑', 'buildingName'], ['楼层', 'floorName'], ['空间本地名称', "objectInfo-localName"], ['空间本地编码', "objectInfo-localId"], ['楼层', 'objectInfo-floorName']],
+    '系统下的设备': [['系统分类', 'systemCategory'], ['系统名称', ''], ['系统编码', ''], ['BIM构件名称', 'bimTypeId'], ['系统分类', 'systemCategory'], ['设备类型名称', 'codeName'], ['设备本地编码', "localId"]],
 }
 export default tableHeader

+ 1 - 1
src/views/maintain/relationship/relation/index.vue

@@ -265,7 +265,7 @@ export default class extends Vue {
     }
 
     //下拉框数据去重
-    dataReduce(arr: []) {
+    dataReduce(arr: []): [] {
         let obj = {}, setArr = []
         setArr = arr.reduce((item, next) => {
             obj[next.classCode] ? '' : obj[next.classCode] = true && item.push(next)