Bladeren bron

系统集成报告bug修改 获取信息点

haojianlong 4 jaren geleden
bovenliggende
commit
fffa578023
1 gewijzigde bestanden met toevoegingen van 106 en 14 verwijderingen
  1. 106 14
      src/components/point/report/objectInstance.vue

+ 106 - 14
src/components/point/report/objectInstance.vue

@@ -48,6 +48,7 @@ import {
   queryLinkSys, //数据中心系统查询
   queryTenant, //数据中心查询租户
   partsQuery, //数据中心部件查询
+  getDataDictionary, // 项目数据字典
 } from '@/api/scan/request'
 
 export default {
@@ -96,26 +97,51 @@ export default {
                   }
                   that.forms[key].ObjectLocalName = equipMsg.Content[0].EquipLocalName
                   that.forms[key].ObjectLocalCode = equipMsg.Content[0].EquipLocalID
+                  if (item.InfoList.length && equipMsg.Content[0].Category) {
+                    let params = {
+                      data: {
+                        Filters: `InfoPointCode in ${JSON.stringify(item.InfoList)}`
+                      },
+                      type: equipMsg.Content[0].Category
+                    }
+                    getDataDictionary(params, resp => {
+                      that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
+                    })
+                  }
                   this.loadDataToInstanceByFloorID(equipMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
                 }
               })
             } else if (item.TypeCode == 'Sp') {
               //获取空间信息
-              zoneQuery({
-                Filters: `RoomID='${item.TypeCode + item.ProjectId + item.ObjectID}'`
-              }, zoneMsg => {
-                if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
-                  let canvasOption = {
-                    RoomLocalName: zoneMsg.Content[0].RoomLocalName,
-                    OutLine: zoneMsg.Content[0].Outline,
-                    RoomID: zoneMsg.Content[0].RoomID,
-                    Color: '#F9C3C3'
+              if (item.SpaceType) {
+                zoneQuery({
+                  Filters: `RoomID='${item.TypeCode + item.ProjectId + item.ObjectID}'`,
+                  ZoneType: item.SpaceType
+                }, zoneMsg => {
+                  if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
+                    let canvasOption = {
+                      RoomLocalName: zoneMsg.Content[0].RoomLocalName,
+                      OutLine: zoneMsg.Content[0].Outline,
+                      RoomID: zoneMsg.Content[0].RoomID,
+                      Color: '#F9C3C3'
+                    }
+                    that.forms[key].ObjectLocalName = zoneMsg.Content[0].RoomLocalName
+                    that.forms[key].ObjectLocalCode = zoneMsg.Content[0].RoomLocalID
+                    if (item.InfoList.length && zoneMsg.Content[0].ObjectType) {
+                      let params = {
+                        data: {
+                          Filters: `InfoPointCode in ${JSON.stringify(item.InfoList)}`
+                        },
+                        type: zoneMsg.Content[0].ObjectType
+                      }
+                      getDataDictionary(params, resp => {
+                        that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
+                      })
+                    }
+                    this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
                   }
-                  that.forms[key].ObjectLocalName = zoneMsg.Content[0].RoomLocalName
-                  that.forms[key].ObjectLocalCode = zoneMsg.Content[0].RoomLocalID
-                  this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
-                }
-              });
+                });
+              }
             } else if (item.TypeCode == 'Ec') {
               partsQuery({
                 Filters: `EquipID='${item.TypeCode + item.ProjectId + item.ObjectID}'`
@@ -133,6 +159,17 @@ export default {
                   }
                   that.forms[key].ObjectLocalName = equipMsg.Content[0].EquipLocalName
                   that.forms[key].ObjectLocalCode = equipMsg.Content[0].EquipLocalID
+                  if (item.InfoList.length && equipMsg.Content[0].Category) {
+                    let params = {
+                      data: {
+                        Filters: `InfoPointCode in ${JSON.stringify(item.InfoList)}`
+                      },
+                      type: equipMsg.Content[0].Category
+                    }
+                    getDataDictionary(params, resp => {
+                      that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
+                    })
+                  }
                   this.loadDataToInstanceByFloorID(equipMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
                 }
               })
@@ -143,6 +180,17 @@ export default {
                 if (res.Content.length) {
                   that.forms[key].ObjectLocalName = res.Content[0].SysLocalName
                   that.forms[key].ObjectLocalCode = res.Content[0].SysLocalID
+                  if (item.InfoList.length && res.Content[0].Category) {
+                    let params = {
+                      data: {
+                        Filters: `InfoPointCode in ${JSON.stringify(item.InfoList)}`
+                      },
+                      type: res.Content[0].Category
+                    }
+                    getDataDictionary(params, resp => {
+                      that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
+                    })
+                  }
                 }
               })
             } else if (item.TypeCode == 'Bd') {
@@ -152,6 +200,17 @@ export default {
                 if (res.Content.length) {
                   that.forms[key].ObjectLocalName = res.Content[0].BuildLocalName
                   that.forms[key].ObjectLocalCode = res.Content[0].BuildLocalID
+                  if (item.InfoList.length && res.Content[0].ObjectType) {
+                    let params = {
+                      data: {
+                        Filters: `InfoPointCode in ${JSON.stringify(item.InfoList)}`
+                      },
+                      type: res.Content[0].ObjectType
+                    }
+                    getDataDictionary(params, resp => {
+                      that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
+                    })
+                  }
                 }
               })
             } else if (item.TypeCode == 'Fl') {
@@ -161,6 +220,17 @@ export default {
                 if (res.Content.length) {
                   that.forms[key].ObjectLocalName = res.Content[0].FloorLocalName
                   that.forms[key].ObjectLocalCode = res.Content[0].FloorLocalID
+                  if (item.InfoList.length && res.Content[0].ObjectType) {
+                    let params = {
+                      data: {
+                        Filters: `InfoPointCode in ${JSON.stringify(item.InfoList)}`
+                      },
+                      type: res.Content[0].ObjectType
+                    }
+                    getDataDictionary(params, resp => {
+                      that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
+                    })
+                  }
                 }
               })
             } else if (item.TypeCode == 'VOTn') {
@@ -170,6 +240,17 @@ export default {
                 if (res.Content.length) {
                   that.forms[key].ObjectLocalName = res.Content[0].TenantLocalName
                   that.forms[key].ObjectLocalCode = res.Content[0].TenantLocalID
+                  if (item.InfoList.length && res.Content[0].ObjectType) {
+                    let params = {
+                      data: {
+                        Filters: `InfoPointCode in ${JSON.stringify(item.InfoList)}`
+                      },
+                      type: res.Content[0].ObjectType
+                    }
+                    getDataDictionary(params, resp => {
+                      that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
+                    })
+                  }
                 }
               })
             } else if (item.TypeCode == 'Pj') {
@@ -179,6 +260,17 @@ export default {
                 if (res.Content.length) {
                   that.forms[key].ObjectLocalName = res.Content[0].ProjLocalName
                   that.forms[key].ObjectLocalCode = res.Content[0].ProjLocalID
+                  if (item.InfoList.length && res.Content[0].ObjectType) {
+                    let params = {
+                      data: {
+                        Filters: `InfoPointCode in ${JSON.stringify(item.InfoList)}`
+                      },
+                      type: res.Content[0].ObjectType
+                    }
+                    getDataDictionary(params, resp => {
+                      that.forms[key].InfomationPointName = resp.Content.map(t => t.InfoPointName || '').join(',');
+                    })
+                  }
                 }
               })
             }