Shannon_mu vor 3 Jahren
Ursprung
Commit
b0a6452639

+ 8 - 2
energyManagement/src/views/instrumentManagement/popups/tabIndex.vue

@@ -124,7 +124,12 @@ export default {
                 currentPage: 1,
                 pageSizes: [15, 30, 60, 120]
             },
-            Cols: [],
+            Cols: [
+                { label: '上报时间', prop: 'receiveTime' },
+                { label: '止度', prop: 'receiveTime' },
+                { label: '阀门状态', prop: 'receiveTime' },
+                { label: '设备状态', prop: 'receiveTime' }
+            ],
             AlertsCols,
             valveInfoCols,
             historyCols, //告警列表表头
@@ -278,8 +283,9 @@ export default {
                     .then(({ status, msg, data = [] }) => {
                         if (status === 0) {
                             this.pointList = data;
-                            this.Cols.push({ label: '时间', prop: 'receiveTime', width: 200 });
+
                             if (data.length) {
+                                this.Cols = [{ label: '上报时间', prop: 'receiveTime', width: 200 }];
                                 data.map((item, index) => {
                                     this.Cols.push({
                                         label: item.measuringName,

+ 1 - 1
operationSupport/src/views/assetManagement/housingManagement/index.vue

@@ -242,7 +242,7 @@ export default {
         },
         buildingInformation(data) {
             if (!!data.type && data.type == 'community') {
-                this.mixins_query = {communityId:data.value};
+                 this.mixins_query = {communityId:data.value,buildingType:1};
             } else {
                 this.mixins_query.communityId = data.communityId;
                 this.mixins_query.id = data.roomId;

+ 1 - 1
operationSupport/src/views/assetManagement/shopManagement/index.vue

@@ -264,7 +264,7 @@ export default {
         },
         buildingInformation(data) {
             if (!!data.type && data.type == 'community') {
-               this.mixins_query = {communityId:data.value};
+               this.mixins_query = {communityId:data.value,buildingType:2};
             } else {
                 this.mixins_query.communityId = data.communityId;
                 this.mixins_query.id = data.roomId;