Merge branch 'new5_25home' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new5_25home

energyManagement/src/views/instrumentManagement/popups/tabIndex.vue

@@ -178,7 +178,6 @@ export default {
           prop: 'operationType',
           format (val, data) {
             let name = '';
-            debugger;
             if (_this.$parent.detail.categoryId === 1) {
               name = '阀';
             } else {
@@ -318,9 +317,9 @@ export default {
                 this.historyDataList = [];
                 for (let [k, v] of data.entries()) {
                   dateTimeCol = _.map(v);
-
-                  let timeformat = this.$moment(Number(dateTimeCol[0])).format('YYYY-MM-DD HH:mm:ss');
+                  let timeformat = this.$moment(Number(dateTimeCol[1])).format('YYYY-MM-DD HH:mm:ss');
                   this.historyDataList.push(Object.assign({ receiveTime: timeformat }, data[k].measureData));
+                  console.log(this.historyDataList)
                 }
                 this.hispageset.total = data.length;
                 this.mixins_onQuery = false;

energyManagement/src/views/instrumentManagement/setPage/viewDetail.vue

@@ -94,11 +94,7 @@ export default {
                                 case 1:
                                     return '开';
                                 case 2:
-                                    let vatex = '无阀';
-                                    if (!!this.detail.categoryId && this.detail.categoryId == 2) {
-                                        catex = '无闸';
-                                    }
-                                    return vatex;
+                                    return data.categoryId == 2 ? '无闸' : '无阀';
                                 default:
                                     return '-';
                             }