离线规则

energyManagement/src/views/meterReadingManagement/index.vue

@@ -129,8 +129,17 @@ export default {
             if (!dateNum) return '-';
             let da = new Date(Number(dateNum));
             return (
-                [da.getFullYear(), da.getMonth() + 1, da.getDate()].join('-') +
-                [(da.getHours(), da.getMinutes(), da.getSeconds())].join(':')
+                [
+                    da.getFullYear().toString().padStart(2, '0'),
+                    (da.getMonth() + 1).toString().padStart(2, '0'),
+                    da.getDate().toString().padStart(2, '0')
+                ].join('-') +
+                ' ' +
+                [
+                    da.getHours().toString().padStart(2, '0'),
+                    da.getMinutes().toString().padStart(2, '0'),
+                    da.getSeconds().toString().padStart(2, '0')
+                ].join(':')
             );
         },
         initDate(type) {

energyManagement/src/views/overview/index.vue

@@ -28,7 +28,7 @@ export default {
             communityArr: [],
             communityId: '',
             dataElectricity: {
-                type: 1,
+                type: 2,
                 title: '用电分析',
                 block: ['电表总数(个)', '本月用电量(度)'],
                 echartText: {
@@ -37,7 +37,7 @@ export default {
                 }
             },
             dataWater: {
-                type: 2,
+                type: 1,
                 title: '用水分析',
                 block: ['水表总数(个)', '本月用水量(吨)'],
                 echartText: {

operationSupport/src/views/alarmManagement/popups/addoreditalarm.vue

@@ -834,11 +834,9 @@ export default {
     created() {
         this.copyoperatorOptions = operatorOptions.slice();
         this.alarmCategory = this.params.alarmCategory;
-        // this.deviceOptions=this.params.deviceOptions;
         this.productOptions = this.params.productOptions;
         if (this.alarmCategory == '2') {
-            console.log(addCols[0])
-            let newaddCols = addCols[0].slice(0, 5);
+            let newaddCols = addCols[0].slice(0, 6);
             this.cols = [newaddCols];
         } else {
             this.cols = addCols;

operationSupport/src/views/assetManagement/housingManagement/details.vue

@@ -4,7 +4,8 @@
             <h1>房屋号：{{ detailsData.roomNumber }}<span class="titleType">住宅</span></h1>
             <el-button class="right" type="primary" @click="close()">返回</el-button>
             <div class="text">
-                <span>所属社区：{{ detailsData.communityId }}</span> <span>楼栋：{{ detailsData.communityName }}</span>
+                <span>所属社区： {{ detailsData.communityId | matchingVal($store.getters['getCommunityArray']) }}</span>
+                <span>楼栋：{{ detailsData.communityName }}</span>
             </div>
         </div>
         <div class="content">
@@ -260,6 +261,23 @@ export default {
             }
         };
     },
+    filters: {
+        matchingVal(val, arr) {
+            let v = '--';
+            if (!!val) {
+                arr.forEach((item) => {
+                    if (!!item.code && item.code === val) {
+                        v = item.name;
+                    } else if (item.type === val) {
+                        v = item.lable;
+                    } else if (!!item.communityName && item.id === val) {
+                        v = item.communityName;
+                    }
+                });
+            }
+            return v;
+        }
+    },
     created() {
         this.id = this.$route.query.id;
         this.getDetails();

operationSupport/src/views/assetManagement/shopManagement/details.vue

@@ -4,7 +4,7 @@
             <h1>房屋号：{{ detailsData.roomNumber }}<span class="titleType">商铺</span></h1>
             <el-button class="right" type="primary" @click="close()">返回</el-button>
             <div class="text">
-                <span>所属社区：{{ detailsData.communityId }}</span> <span>楼栋：{{ detailsData.communityName }}</span>
+                <span>所属社区： {{ detailsData.communityId | matchingVal($store.getters['getCommunityArray']) }}</span> <span>楼栋：{{ detailsData.communityName }}</span>
             </div>
         </div>
         <div class="content">
@@ -41,7 +41,7 @@ import householdTable from '../stepPage/householdTable.vue';
 export default {
     components: { householdTable },
     mixins: [list],
-    name:"shopManagementDetails",
+    name: 'shopManagementDetails',
     data() {
         let _this = this;
         return {
@@ -301,6 +301,23 @@ export default {
             ]
         };
     },
+    filters: {
+        matchingVal(val, arr) {
+            let v = '--';
+            if (!!val) {
+                arr.forEach((item) => {
+                    if (!!item.code && item.code === val) {
+                        v = item.name;
+                    } else if (item.type === val) {
+                        v = item.lable;
+                    } else if (!!item.communityName && item.id === val) {
+                        v = item.communityName;
+                    }
+                });
+            }
+            return v;
+        }
+    },
     created() {
         this.id = this.$route.query.id;
         this.getDetails();