Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

zhangyu 4 years ago
parent
commit
3724f8e14a

+ 1 - 1
package.json

@@ -23,7 +23,7 @@
     "@saga-web/cad-engine": "2.0.560",
     "@saga-web/draw": "2.1.75",
     "@saga-web/graphy": "2.1.47",
-    "@saga-web/topology": "1.0.77",
+    "@saga-web/topology": "1.0.78",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",

+ 2 - 2
src/api/topo/index.js

@@ -9,6 +9,6 @@ export function topoCreate(param, success) {
 
 // 查询拓扑图
 export function topoQuery(param, success) {
-  let url = `${baseUrl}/datacenter/topo/query`;
-  httputils.postJson(url, param, success)
+  let url = `${baseUrl}/datacenter/topo/query?type=${param.type}`;
+  httputils.postJson(url, param.data||{}, success)
 }

+ 7 - 3
src/components/point/dynamicdata/buildRules.vue

@@ -220,7 +220,11 @@ export default {
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.BuildID == item.BuildID) {
-                  item.ObjectLocalName = t.BuildLocalName;
+                  if (t.BuildLocalName && t.BuildLocalID) {
+                    item.ObjectLocalName = t.BuildLocalName + '/' + t.BuildLocalID;
+                  } else if (t.BuildLocalName || t.BuildLocalID) {
+                    item.ObjectLocalName = t.BuildLocalName || t.BuildLocalID;
+                  }
                 }
               })
             })
@@ -228,8 +232,8 @@ export default {
             this.tableData = dyData;
           })
         } else {
-            this.loading = false;
-            this.tableData = dyData;
+          this.loading = false;
+          this.tableData = dyData;
         }
         this.page.total = res.PageSize < 50 ? res.PageSize : res.Total;
       });

+ 10 - 6
src/components/point/dynamicdata/equipRules.vue

@@ -60,9 +60,9 @@
         </el-table-column>
         <el-table-column prop="Datasource" label="数据源" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="SubTypeName" :label="`数字字典${typeName}类型`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="ObjectLocalName" :label="`对应的${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl">
+        <el-table-column prop="ObjectLocalName" :label="`对应的${typeName}实例`" show-overflow-tooltip min-width="125" class-name="td-bl">
         </el-table-column>
-        <el-table-column label="实例所在建筑楼层" min-width="100">
+        <el-table-column label="实例所在建筑楼层" min-width="125">
           <template slot-scope="scope">
             <el-tooltip
               :content="scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''"
@@ -73,7 +73,7 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="RoomLocalName" label="实例所在业务空间" show-overflow-tooltip min-width="200"></el-table-column>
+        <el-table-column prop="RoomLocalName" label="实例所在业务空间" show-overflow-tooltip min-width="150"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
@@ -221,7 +221,11 @@ export default {
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.EquipID == item.EquipID) {
-                  item.ObjectLocalName = t.EquipLocalName;
+                  if (t.EquipLocalName && t.EquipLocalID) {
+                    item.ObjectLocalName = t.EquipLocalName + '/' + t.EquipLocalID;
+                  } else if (t.EquipLocalName || t.EquipLocalID) {
+                    item.ObjectLocalName = t.EquipLocalName || t.EquipLocalID;
+                  }
                   item.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
                   item.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
                   item.RoomLocalName = '';
@@ -238,8 +242,8 @@ export default {
             this.tableData = dyData;
           })
         } else {
-            this.loading = false;
-            this.tableData = dyData;
+          this.loading = false;
+          this.tableData = dyData;
         }
         this.page.total = res.PageSize < 50 ? res.PageSize : res.Total;
       });

+ 5 - 1
src/components/point/dynamicdata/floorRules.vue

@@ -229,7 +229,11 @@ export default {
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.FloorID == item.FloorID) {
-                  item.ObjectLocalName = t.FloorLocalName;
+                  if (t.FloorLocalName && t.FloorLocalID) {
+                    item.ObjectLocalName = t.FloorLocalName + '/' + t.FloorLocalID;
+                  } else if (t.FloorLocalName || t.FloorLocalID) {
+                    item.ObjectLocalName = t.FloorLocalName || t.FloorLocalID;
+                  }
                   item.ObjectSequenceID = t.FloorSequenceID;
                   item.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
                 }

+ 1 - 1
src/components/point/dynamicdata/locationCascader.vue

@@ -62,7 +62,7 @@ export default {
           } else if (node.level == 3) {
             let pa = {
               PageSize: 1000,
-              ObjectType: node.path[2],
+              ZoneType: node.path[2],
               Filters: `BuildingId='${node.path[0]}';FloorId='${node.path[1]}'`
             };
             zoneQuery(pa, res => {

+ 5 - 1
src/components/point/dynamicdata/partsRules.vue

@@ -219,7 +219,11 @@ export default {
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.EquipID == item.EquipID) {
-                  item.ObjectLocalName = t.EquipLocalName;
+                  if (t.EquipLocalName && t.EquipLocalID) {
+                    item.ObjectLocalName = t.EquipLocalName + '/' + t.EquipLocalID;
+                  } else if (t.EquipLocalName || t.EquipLocalID) {
+                    item.ObjectLocalName = t.EquipLocalName || t.EquipLocalID;
+                  }
                 }
               })
             })

+ 5 - 1
src/components/point/dynamicdata/projectRules.vue

@@ -225,7 +225,11 @@ export default {
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.ProjID == item.ProjID) {
-                  item.ObjectLocalName = t.ProjLocalName;
+                  if (t.ProjLocalName && t.ProjLocalID) {
+                    item.ObjectLocalName = t.ProjLocalName + '/' + t.ProjLocalID;
+                  } else if (t.ProjLocalName || t.ProjLocalID) {
+                    item.ObjectLocalName = t.ProjLocalName || t.ProjLocalID;
+                  }
                 }
               })
             })

+ 5 - 1
src/components/point/dynamicdata/spaceRules.vue

@@ -220,7 +220,11 @@ export default {
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.RoomID == item.RoomID) {
-                  item.ObjectLocalName = t.RoomLocalName;
+                  if (t.RoomLocalName && t.RoomLocalID) {
+                    item.ObjectLocalName = t.RoomLocalName + '/' + t.RoomLocalID;
+                  } else if (t.RoomLocalName || t.RoomLocalID) {
+                    item.ObjectLocalName = t.RoomLocalName || t.RoomLocalID;
+                  }
                   item.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
                   item.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
                 }

+ 5 - 1
src/components/point/dynamicdata/systemRules.vue

@@ -217,7 +217,11 @@ export default {
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.SysID == item.SysID) {
-                  item.ObjectLocalName = t.SysLocalName;
+                  if (t.SysLocalName && t.SysLocalID) {
+                    item.ObjectLocalName = t.SysLocalName + '/' + t.SysLocalID;
+                  } else if (t.SysLocalName || t.SysLocalID) {
+                    item.ObjectLocalName = t.SysLocalName || t.SysLocalID;
+                  }
                 }
               })
             })

+ 5 - 1
src/components/point/dynamicdata/tenantRules.vue

@@ -220,7 +220,11 @@ export default {
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.TenantID == item.TenantID) {
-                  item.ObjectLocalName = t.TenantLocalName;
+                  if (t.TenantLocalName && t.TenantLocalID) {
+                    item.ObjectLocalName = t.TenantLocalName + '/' + t.TenantLocalID;
+                  } else if (t.TenantLocalName || t.TenantLocalID) {
+                    item.ObjectLocalName = t.TenantLocalName || t.TenantLocalID;
+                  }
                   item.RoomLocalName = '';
                   if (t.ZoneTenantList) {
                     t.ZoneTenantList.forEach(it => {

BIN
src/views/business_space/dataUtil/2.jpg


+ 14 - 8
src/views/business_space/dataUtil/topology.vue

@@ -3,7 +3,7 @@
   <el-container>
     <el-aside width="200px" class="el-scrollbar">
       <div title="查询">
-        <el-button size="mini" @click="queryGraphy" icon="el-icon-notebook-2">查询</el-button>
+        <el-button size="mini" @click="queryGraphy" icon="el-icon-search">查询</el-button>
       </div>
       <div title="保存">
         <el-button size="mini" @click="saveGraphy" icon="el-icon-notebook-2">保存</el-button>
@@ -75,14 +75,14 @@ export default {
         {
           Id: this.uuid(),
           Size: {
-            Width: 100,
-            Height: 100
+            Width: 145,
+            Height: 89
           },
           Pos: {},
           img: require('./2.jpg'),
           ImgSource: this.img2,
           Name: '测试2',
-          AnchorList: [{ Pos: { X: 0, Y: -50 }, Id: this.uuid() }, { Pos: { X: -50, Y: 0 }, Id: this.uuid() }, { Pos: { X: 50, Y: 0 }, Id: this.uuid() }]
+          AnchorList: [{ Pos: { X: 0, Y: -44 }, Id: this.uuid() }, { Pos: { X: -72, Y: 0 }, Id: this.uuid() }, { Pos: { X: 72, Y: 0 }, Id: this.uuid() }]
         },
         {
           Id: this.uuid(),
@@ -140,6 +140,7 @@ export default {
       this.clearGraphy();
       this.scene = new TopoScene()
       this.view.scene = this.scene;
+      this.scene.callback = this.equipClick
     },
     // 清除canvas
     clearGraphy() {
@@ -155,11 +156,10 @@ export default {
     },
     additem(i) {
       let equipdata = this.equipList[i]
-      let curEquip = this.scene.createItem(equipdata);
-      this.scene.click(curEquip, this.equipClick)
+      this.scene.createItem(equipdata);
     },
     drawline() {
-      this.scene.isLining = true;
+      this.scene.isLining = !this.scene.isLining;
     },
     // 清除默认左右键事件
     disableRightButton() {
@@ -298,8 +298,14 @@ export default {
     },
     //查询
     queryGraphy() {
+      console.log(this.scene)
       topoQuery({ type: 'eq2sp_for' }, res => {
-        console.log(res);
+        console.log(res.Content[0])
+        // this.scene.loadData({
+          // equipList: res.Content[0].NodeList,
+          // relationList: res.Content[0].RelationList,
+        // })
+        // this.view.fitSceneToView()
       })
     }
   },

+ 3 - 3
src/views/model/file/pathcontrol/index.vue

@@ -325,9 +325,9 @@ export default {
     }
   },
   mounted() {
-    // Bus.$on('modelStatusChange', message => {
-    //   this.init()
-    // })
+    Bus.$on('modelStatusChange', message => {
+      this.init()
+    })
   },
   created() {
     this.Id = this.$route.query.Id

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

@@ -406,10 +406,18 @@ export default {
         pa.Filters += `;RoomLocalName contain "${this.form.ObjectLocalName}"`;
       }
       if (this.form.locationVal.length > 0) {
-        pa.Filters += `;BuildingId="${this.form.locationVal[0]}"`;
+        if (this.form.locationVal[0] == "unknowBuild") {
+          pa.BuildingId = 'isnull';
+        } else {
+          pa.BuildingId = this.form.locationVal[0];
+        }
       }
       if (this.form.locationVal.length > 1) {
-        pa.Filters += `;FloorId="${this.form.locationVal[1]}"`;
+        if (this.form.locationVal[1] == "unknowFloor") {
+          pa.FloorId = 'isnull';
+        } else {
+          pa.FloorId = this.form.locationVal[1];
+        }
       }
       let pa2 = {
         Filters: `TypeName='${this.typeName}'`