Parcourir la source

动参p2所在位置接口拼接

haojianlong il y a 5 ans
Parent
commit
71c7e3670f

+ 121 - 122
config/index.js

@@ -10,105 +10,16 @@ module.exports = {
         assetsSubDirectory: 'static',
         assetsPublicPath: '/',
 
-        proxyTable: {//正式环境
-            '/admin': {
-                target: 'http://mbi.sagacloud.cn:8080',
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/admin": "/"
-                }
-            },
-            '/api': {
-                target: 'http://mbi.sagacloud.cn:8080',
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/api": "/"
-                }
-            },
-            '/data-platform-3': {
-                // 目标 API 地址
-                target: 'http://api.sagacloud.cn/',
-                // 如果要代理 websockets
-                ws: true,
-                // 将主机标头的原点更改为目标URL
-                changeOrigin: false
-            },
-            '/business-space': {
-                // 目标 API 地址
-                target: 'http://api.sagacloud.cn',
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/business-space": "/dp-auxiliary/business-space/"
-                }
-            },
-            '/pointconfig': {
-                // 目标 API 地址
-                target: 'http://mbi.sagacloud.cn:8080/',
-                // 如果要代理 websockets
-                ws: true,
-                // 将主机标头的原点更改为目标URL
-                changeOrigin: false
-            },
-            '/venders-dp': {
-                // 目标 API 地址
-                target: 'http://api.sagacloud.cn',
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/venders-dp": "/dp-auxiliary/venders-dp/"
-                }
-            },
-            '/venders': {
-                // 目标 API 地址
-                target: 'http://api.sagacloud.cn',
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/venders": "/dp-auxiliary/venders/"
-                }
-            },
-            '/ScanBuilding': {
-                // 目标 API 地址
-                target: 'http://mbi.sagacloud.cn:8080/',
-                // 如果要代理 websockets
-                ws: true,
-                // 将主机标头的原点更改为目标URL
-                changeOrigin: false
-            },
-            '/image-service': {
-                // 目标 API 地址
-                target: 'http://api.sagacloud.cn',
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/image-service": "/dp-auxiliary/image-service/"
-                }
-            },
-            '/godhand': {
-                // 目标 API 地址
-                target: 'http://api.sagacloud.cn',
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/godhand": "/dp-auxiliary/godhand/"
-                }
-            },
-            '/modelapi': {
-                target: 'http://mbi.sagacloud.cn:8080',
-                // target: 'http://192.168.20.218:8082',//景灏
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/modelapi": "/revit-algorithm/"
-                }
-            },
-        },
-
-        // proxyTable: {
+        // proxyTable: {//正式环境
         //     '/admin': {
-        //         target: 'http://192.168.20.236:8080',
+        //         target: 'http://mbi.sagacloud.cn:8080',
         //         changeOrigin: true,
         //         pathRewrite: {
         //             "^/admin": "/"
         //         }
         //     },
         //     '/api': {
-        //         target: 'http://192.168.20.236:8080',
+        //         target: 'http://mbi.sagacloud.cn:8080',
         //         changeOrigin: true,
         //         pathRewrite: {
         //             "^/api": "/"
@@ -116,7 +27,7 @@ module.exports = {
         //     },
         //     '/data-platform-3': {
         //         // 目标 API 地址
-        //         target: 'http://192.168.20.225:8080/',
+        //         target: 'http://api.sagacloud.cn/',
         //         // 如果要代理 websockets
         //         ws: true,
         //         // 将主机标头的原点更改为目标URL
@@ -124,15 +35,15 @@ module.exports = {
         //     },
         //     '/business-space': {
         //         // 目标 API 地址
-        //         target: 'http://192.168.20.225:8080/',
-        //         // 如果要代理 websockets
-        //         ws: true,
-        //         // 将主机标头的原点更改为目标URL
-        //         changeOrigin: false
+        //         target: 'http://api.sagacloud.cn',
+        //         changeOrigin: true,
+        //         pathRewrite: {
+        //             "^/business-space": "/dp-auxiliary/business-space/"
+        //         }
         //     },
         //     '/pointconfig': {
         //         // 目标 API 地址
-        //         target: 'http://192.168.20.236:8080/',
+        //         target: 'http://mbi.sagacloud.cn:8080/',
         //         // 如果要代理 websockets
         //         ws: true,
         //         // 将主机标头的原点更改为目标URL
@@ -140,23 +51,23 @@ module.exports = {
         //     },
         //     '/venders-dp': {
         //         // 目标 API 地址
-        //         target: 'http://192.168.20.225:8080/',
-        //         // 如果要代理 websockets
-        //         ws: true,
-        //         // 将主机标头的原点更改为目标URL
-        //         changeOrigin: false
+        //         target: 'http://api.sagacloud.cn',
+        //         changeOrigin: true,
+        //         pathRewrite: {
+        //             "^/venders-dp": "/dp-auxiliary/venders-dp/"
+        //         }
         //     },
         //     '/venders': {
         //         // 目标 API 地址
-        //         target: 'http://192.168.20.225:8080/',
-        //         // 如果要代理 websockets
-        //         ws: true,
-        //         // 将主机标头的原点更改为目标URL
-        //         changeOrigin: false
+        //         target: 'http://api.sagacloud.cn',
+        //         changeOrigin: true,
+        //         pathRewrite: {
+        //             "^/venders": "/dp-auxiliary/venders/"
+        //         }
         //     },
         //     '/ScanBuilding': {
         //         // 目标 API 地址
-        //         target: 'http://192.168.20.236:8080/',
+        //         target: 'http://mbi.sagacloud.cn:8080/',
         //         // 如果要代理 websockets
         //         ws: true,
         //         // 将主机标头的原点更改为目标URL
@@ -164,30 +75,118 @@ module.exports = {
         //     },
         //     '/image-service': {
         //         // 目标 API 地址
-        //         target: 'http://192.168.20.225:8080/',
-        //         // 如果要代理 websockets
-        //         ws: true,
-        //         // 将主机标头的原点更改为目标URL
-        //         changeOrigin: false
+        //         target: 'http://api.sagacloud.cn',
+        //         changeOrigin: true,
+        //         pathRewrite: {
+        //             "^/image-service": "/dp-auxiliary/image-service/"
+        //         }
         //     },
         //     '/godhand': {
         //         // 目标 API 地址
-        //         target: 'http://192.168.20.225:8080/',
-        //         // 如果要代理 websockets
-        //         ws: true,
-        //         // 将主机标头的原点更改为目标URL
-        //         changeOrigin: false
+        //         target: 'http://api.sagacloud.cn',
+        //         changeOrigin: true,
+        //         pathRewrite: {
+        //             "^/godhand": "/dp-auxiliary/godhand/"
+        //         }
         //     },
         //     '/modelapi': {
-        //         target: 'http://192.168.20.225:8082',
+        //         target: 'http://mbi.sagacloud.cn:8080',
         //         // target: 'http://192.168.20.218:8082',//景灏
         //         changeOrigin: true,
         //         pathRewrite: {
-        //             "^/modelapi": "/"
+        //             "^/modelapi": "/revit-algorithm/"
         //         }
         //     },
         // },
 
+        proxyTable: {
+            '/admin': {
+                target: 'http://192.168.20.235:8080',
+                changeOrigin: true,
+                pathRewrite: {
+                    "^/admin": "/"
+                }
+            },
+            '/api': {
+                target: 'http://192.168.20.235:8080',
+                changeOrigin: true,
+                pathRewrite: {
+                    "^/api": "/"
+                }
+            },
+            '/data-platform-3': {
+                // 目标 API 地址
+                target: 'http://192.168.20.225:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
+            '/business-space': {
+                // 目标 API 地址
+                target: 'http://192.168.20.225:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
+            '/pointconfig': {
+                // 目标 API 地址
+                target: 'http://192.168.20.235:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
+            '/venders-dp': {
+                // 目标 API 地址
+                target: 'http://192.168.20.225:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
+            '/venders': {
+                // 目标 API 地址
+                target: 'http://192.168.20.225:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
+            '/ScanBuilding': {
+                // 目标 API 地址
+                target: 'http://192.168.20.235:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
+            '/image-service': {
+                // 目标 API 地址
+                target: 'http://192.168.20.225:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
+            '/godhand': {
+                // 目标 API 地址
+                target: 'http://192.168.20.225:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
+            '/modelapi': {
+                target: 'http://192.168.20.225:8082',
+                changeOrigin: true,
+                pathRewrite: {
+                    "^/modelapi": "/"
+                }
+            }
+        },
+
         // Various Dev Server settings
         host: '0.0.0.0', // can be overwritten by process.env.HOST
         port: 28080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

+ 65 - 20
src/components/point/dynamicdata/locationCascader.vue

@@ -6,18 +6,74 @@
 import {
   // dynamicLocationList,
   buildingQuery, //数据中心查询建筑
+  floorQuery, //数据中型查询楼层
+  queryDictionaryHead, //数据中心查询分区类型
+  queryAllZone, //数据中心查询所有空间
 } from "@/api/scan/request";
 import { mapGetters, mapActions } from "vuex";
 export default {
   data() {
+    const that = this;
     return {
       LocationList: [],
       value: [],
       timer: null,
       props: {
-        value: 'BuildID',
-        label: 'BuildLocalName',
-        children: 'Floor'
+        lazy: this.isFloor ? false : true,
+        lazyLoad(node, resolve) {
+          console.log(node)
+          if (node.level == 1) {
+            if (node.value == 'unknowBuild') {
+              resolve()
+            } else {
+              let pa = {
+                Filters: `BuildID='${node.value}'`
+              }
+              floorQuery(pa, res => {
+                const nodes = res.Content.map(t => {
+                  t.value = t.FloorID;
+                  t.label = t.FloorLocalName;
+                  return t;
+                })
+                resolve(nodes);
+              })
+            }
+          } else if (node.level == 2) {
+            if (that.isSpace) {
+              resolve();
+            } else {
+              let pa = {
+                Filters: "parentId='Space'"
+              }
+              queryDictionaryHead(pa, res => {
+                const nodes = res.Content.map(t => {
+                  if (t.Code == 'Ispace') {
+                    return undefined;
+                  }
+                  t.value = t.Code;
+                  t.label = t.Name;
+                  return t;
+                }).filter(item => item);
+                resolve(nodes);
+              })
+            }
+          } else if (node.level == 3) {
+            let pa = {
+              PageSize: 1000,
+              Filters: `BuildingId='${node.path[0]}';FloorId='${node.path[1]}';ObjectType='${node.path[2]}'`
+            };
+            queryAllZone(pa, res => {
+              const nodes = res.Content.map(t => {
+                t.value = t.RoomID;
+                t.label = t.RoomLocalName;
+                return t;
+              })
+              resolve(nodes);
+            })
+          } else {
+            resolve();
+          }
+        }
       }
     };
   },
@@ -29,6 +85,9 @@ export default {
     typeName: {},
     isFloor: {
       default: false
+    },
+    isSpace: {
+      default: false
     }
   },
   computed: {
@@ -57,27 +116,13 @@ export default {
       //   this.LocationList.unshift({ Name: '未明确建筑' })
       // });
       let pa = {}
-      if (!this.isFloor) {
-        pa.Cascade = [{ Name: 'floor' }]
-      }
       buildingQuery(pa, res => {
         this.LocationList = res.Content.map(item => {
-          if (!this.isFloor) {
-            if (item.Floor) {
-              item.Floor.map(t => {
-                t.BuildID = t.FloorID;
-                t.BuildLocalName = t.FloorLocalName;
-                t.Floor = [];
-                return t;
-              })
-              item.Floor.unshift({ BuildID: 'unknowFloor', BuildLocalName: '未明确楼层' })
-            } else {
-              item.Floor = [{ BuildID: 'unknowFloor', BuildLocalName: '未明确楼层' }];
-            }
-          }
+          item.value = item.BuildID;
+          item.label = item.BuildLocalName;
           return item;
         });
-        this.LocationList.unshift({ BuildID: 'unknowBuild', BuildLocalName: '未明确建筑' })
+        this.LocationList.unshift({ value: 'unknowBuild', label: '未明确建筑' })
       })
     },
     delNullItems(arr) {

+ 1 - 1
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -398,7 +398,7 @@ export default {
       };
       //处理查询条件
       if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
-        param.Filters += `;EquipLocalName contain "${this.form.ObjectLocalName}"`;
+        pa.Filters += `;EquipLocalName contain "${this.form.ObjectLocalName}"`;
       }
       //TODO
       // if (this.form.SubTypeName.length) {

+ 1 - 1
src/views/point/dynamicdata/addRelation/floorRela/index.vue

@@ -420,7 +420,7 @@ export default {
           t.ObjectLocalName = t.FloorLocalName;
           t.ObjectLocalCode = t.FloorLocalID;
           t.ObjectSequenceID = t.FloorSequenceID;
-          t.BuildLocalName = t.Building.BuildLocalName;
+          t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
           return t;
         });
         if (this.rPage.pageNumber == 1) {

+ 1 - 1
src/views/point/dynamicdata/addRelation/spaceRela/index.vue

@@ -91,7 +91,7 @@
           </div>
           <div class="query-item">
             <label>所在位置</label>
-            <location-cas @change="changeLocation" :Related="false" :typeName="typeName"></location-cas>
+            <location-cas @change="changeLocation" :Related="false" :typeName="typeName" :isSpace="true"></location-cas>
           </div>
         </div>
         <!-- 右侧列表 -->