zhangyu vor 5 Jahren
Ursprung
Commit
ff76a0c5f9

+ 0 - 10
src/api/scan/request.js

@@ -1525,14 +1525,4 @@ export function addTabFunNum(param, success) {
 export function tableFuncRelatedOverview(param, success) {
     let url = `/pointconfig/report/meter-related`
     http.postJson(url, param, success)
-}
-//实例中查询设备信息
-export function getEquipByEqID(param, success) {
-    let url = `${baseUrl}/datacenter/equip/query`
-    http.postJson(url, param, success)
-}
-//获取楼层信息
-export function getFloorMsgByFloorID(param, success) {
-    let url = `${baseUrl}/datacenter/floor/query`
-    http.postJson(url, param, success)
 }

+ 3 - 5
src/components/point/report/objectInstance.vue

@@ -38,9 +38,7 @@ import { SGraphyView } from "@saga-web/graphy/lib";
 import { LocationPointScene, DivideFloorScene } from "@saga-web/cad-engine"
 import { SColor } from "@saga-web/draw/lib";
 
-import {
-  getTabFunNumObjInstance, getEquipByEqID, getFloorMsgByFloorID, queryZone
-} from '@/api/scan/request'
+import { getTabFunNumObjInstance, queryEquip, floorQuery, queryZone } from '@/api/scan/request'
 
 export default {
   data() {
@@ -76,7 +74,7 @@ export default {
                 Filters: `EquipID='${item.TypeCode + this.projectId.substring(2) + item.ObjectID}'`
               }
               //获取设备信息
-              getEquipByEqID(pa, equipMsg => {
+              queryEquip(pa, equipMsg => {
                 if (equipMsg.Content[0] && equipMsg.Content[0].LocationJson && equipMsg.Content[0].FloorId) {
                   let canvasOption = {
                     /** 标记的id  */
@@ -124,7 +122,7 @@ export default {
       }
       let that = this;
       //获取楼层信息
-      getFloorMsgByFloorID(param, floorMsg => {
+      floorQuery(param, floorMsg => {
         //刷新canvas
         that.refreshCanvas = new Date().getTime();
         if (!that.views[key]) {

+ 2 - 1
src/components/point/report/tabFunNumOverview.vue

@@ -129,7 +129,7 @@ export default {
       }
     },
     handleClickRow(row,column,event){//点击表格行
-      lStorage.set('screen_data', {path: this.$route.path, data: {MeterFunc: row.MeterFunc}})
+      lStorage.set('screen_data', {path: this.$route.path, data: {MeterFunc: row.MeterFunc, RelatedInstance: row.RelatedInstance}})
     },
     //获取统计数据
     getOverViewList() {
@@ -220,6 +220,7 @@ export default {
 }
 /deep/ .el-drawer__body {
   height: 90%;
+  overflow-y: auto;
 }
 /deep/ .el-table__body-wrapper tr:hover{
   .dialog-btn{

+ 2 - 2
src/components/screen/integrateresults/buildfloorList.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="buildfloor-list" v-loading="loading">
     <el-scrollbar style="height:100%;">
-      
+
     </el-scrollbar>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-import { getTabFunNumOverview } from '@/api/scan/request'
+import { getTabFunNumObjInstance } from '@/api/scan/request'
 
 export default {
   computed: {

+ 3 - 1
src/components/screen/integrateresults/realtimeData.vue

@@ -34,10 +34,12 @@ export default {
           this.loading = false
           if(res.Content[0] && res.Content[0].Data){
             let data = res.Content[0].Data
-            this.newData = data.Data + (data.Unit?data.Unit:'')
+            this.newData = data.Data==null?data.Data:'' + (data.Unit?data.Unit:'')
             this.lastTime = data.Time
           }
         })
+      } else {
+        this.loading = false
       }
     },
   },