Bläddra i källkod

adm:feat > 修改台账详情页动态信息点展示问题,后台添加设备关联资产接口替换

shaun-sheep 4 år sedan
förälder
incheckning
5379e25702

+ 1 - 1
src/api/scan/request.js

@@ -1233,7 +1233,7 @@ export function createEquip(param, success) {
 //设备清单 - 创建设备-关联资产-关联系统
 export function createEquipAndProperty(param, success) {
   // let url = `${baseUrl}${compEquipQuery}/creat-equip-pro`;
-  let url = `${baseUrl}${compEquipQuery}/creat-equip-pro`;
+  let url = `${baseUrl}${object}/equip/creat-equip-pro`;
   http.postJson(url, param, success)
 }
 

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

@@ -53,7 +53,7 @@ export default {
         name: "亚投行",
         pwd: "saga123456"
       }, {
-        id: " Pj1101050013",
+        id: "Pj1101050013",
         name: "BIM测试项目_亚投行",
         pwd: "saga123456"
       }],

+ 9 - 1
src/views/ledger/facility/details/index.vue

@@ -241,9 +241,17 @@ export default {
             res.data.length && res.data.map(child => {
               this.pointData.map(head => {
                 if (head.code == child.infoCode) {
+                  if (head.dataSource) {
+                    head.dataSource.forEach(i => {
+                      if (i.code == child.data) {
+                        this.$set(head, 'data', i.name)
+                      }
+                    })
+                  } else {
+                    this.$set(head, 'data', child.data)
+                  }
                   // this.$set(head, 'svalue', child.value)
                   this.$set(head, 'svalue', child.infoValue)
-                  this.$set(head, 'data', child.data)
                   // this.$set(head, 'receivetime', child.receivetime)
                   this.$set(head, 'receivetime', child.time)
                   this.$set(head, 'error', child.error)

+ 11 - 2
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -63,7 +63,7 @@
 <script>
 import { mapGetters } from "vuex";
 import tools from "@/utils/scan/tools";
-import { zoneDelete, zoneQuery, BeatchQueryParam } from '@/api/scan/request';
+import { BeatchQueryParam, zoneDelete, zoneQuery } from '@/api/scan/request';
 import { getDataDictionary } from "@/api/dict";
 
 import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable';
@@ -246,8 +246,17 @@ export default {
             res.data.length && res.data.map(child => {
               this.pointData.map(head => {
                 if (head.code == child.infoCode) {
+                  if (head.dataSource) {
+                    head.dataSource.forEach(i => {
+                      if (i.code == child.data) {
+                        this.$set(head, 'data', i.name)
+                      }
+                    })
+                  } else {
+                    this.$set(head, 'data', child.data)
+                  }
                   this.$set(head, 'svalue', child.infoValue)
-                  this.$set(head, 'data', child.data)
+                  // this.$set(head, 'data', child.data)
                   this.$set(head, 'receivetime', child.time)
                   this.$set(head, 'error', child.error)
                 }