修复

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

@@ -263,8 +263,9 @@ export default {
             this.mixins_post = 'get';
             this.mixins_dataUrl = '/sc-energy/device/command/page';
             this.mixins_query = {
-                categoryId: this.params.categoryId || '',
-                communityId: this.params.communityId || '',
+                // categoryId: this.params.categoryId || '',
+                // communityId: this.params.communityId || '',
+                deviceId: this.params.id || '',
                 startDate: this.dataValue.length ? `${this.dataValue[0]}` : '',
                 endDate: this.dataValue.length ? `${this.dataValue[1]}` : ''
             };
@@ -329,8 +330,8 @@ export default {
             let downurl = '';
             let params = {
                 deviceId: this.params.id || '',
-                startDate: this.dataValue.length ? `${this.dataValue[0]}000000` : '',
-                endDate: this.dataValue.length ? `${this.dataValue[1]}235959` : ''
+                startDate: this.dataValue.length ? `${this.dataValue[0]}` : '',
+                endDate: this.dataValue.length ? `${this.dataValue[1]}` : ''
             };
             if (this.value == 'history') {
                 params = {
@@ -345,22 +346,12 @@ export default {
                     deviceId: this.params.id || ''
                 });
                 downurl = '/sc-energy/alarm/exportExcel';
-            } else if (this.value == 'replace') {
-                return;
-                params = {
-                    deviceNo: this.params.deviceNo || '',
-                    replaceMethod: this.params.replaceMethod || '',
-                    startDate: this.dataValue.length ? `${this.dataValue[0]}000000` : '',
-                    endDate: this.dataValue.length ? `${this.dataValue[1]}235959` : ''
-                };
-                downurl = '/zoniot-rmcp-web/device/meter/replace/export/excel';
             } else {
                 downurl = '/sc-energy/device/command/export/excel';
                 params = {
-                    categoryId: this.params.categoryId,
-                    startDate: this.dataValue.length ? `${this.dataValue[0]}000000` : '',
-                    endDate: this.dataValue.length ? `${this.dataValue[1]}235959` : '',
-                    type: '' //操作类型
+                    deviceId: this.params.id || '',
+                    startDate: this.dataValue.length ? `${this.dataValue[0]}` : '',
+                    endDate: this.dataValue.length ? `${this.dataValue[1]}` : ''
                 };
             }
             this.__exportExcel(downurl, params);

energyManagement/src/views/meterReadingManagement/index.vue

@@ -19,6 +19,7 @@
                 type="date"
                 :picker-options="pickerOptions"
                 placeholder="选择日期"
+                @input="toggleTime"
             >
             </el-date-picker>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
@@ -144,6 +145,9 @@ export default {
         },
         exportExcel() {
             this.__exportExcel('/sc-energy/meter/read/record/excel', this.mixins_query);
+        },
+        toggleTime(e) {
+            this.$forceUpdate();
         }
     }
 };

energyManagement/src/views/settlementAudit/electricityAudit.vue

@@ -123,7 +123,7 @@ export default {
                 arr = ['', ''];
             }
             this.mixins_query.clearingStartDate = arr[0];
-            this.mixins_query.clearingEndDate = arr[1] + 'T23:59:59';
+             this.mixins_query.clearingEndDate = !!arr[1] ? arr[1] + 'T23:59:59' : '';
         },
         lookPage(row) {
             this.showDialog = true;

energyManagement/src/views/settlementAudit/waterAudit.vue

@@ -93,7 +93,7 @@ export default {
             ],
             mixins_post: 'post',
             communityArr: [],
-            times:[],
+            times: []
         };
     },
     created() {
@@ -123,7 +123,7 @@ export default {
                 arr = ['', ''];
             }
             this.mixins_query.clearingStartDate = arr[0];
-            this.mixins_query.clearingEndDate = arr[1] +'T23:59:59';
+            this.mixins_query.clearingEndDate = !!arr[1] ? arr[1] + 'T23:59:59' : '';
         },
         lookPage(row) {
             this.showDialog = true;

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

@@ -87,7 +87,12 @@
                     <div class="lixian_class" v-if="alarmCategory == 1">
                         <el-form-item slot="row" class="tip-info" label="测点" prop="measuringCode">
                             <el-select v-model="measuringCode" placeholder="请选择测点" clearable @change="measureSelect">
-                                <el-option v-for="item in measureOptions" :key="item.id" :value="item.identifier" :label="item.name"></el-option>
+                                <el-option
+                                    v-for="item in measureOptions"
+                                    :key="item.id"
+                                    :value="item.identifier"
+                                    :label="item.name"
+                                ></el-option>
                             </el-select>
                         </el-form-item>
                         <el-table class="avg_table" :data="data.rules" stripe="true">
@@ -392,7 +397,9 @@ export default {
                 { id: 7, name: '周六', checked: false },
                 { id: 1, name: '周日', checked: false }
             ],
-            checkFlag: true
+            checkFlag: true,
+            firstiotDeviceId: true,
+            firstiotProductId: true
         };
     },
     computed: {
@@ -668,12 +675,12 @@ export default {
         getQueryInfo(id) {
             if (this.params && this.params.todo == 'edit') {
                 this.$http.get(`/sc-community/system/alarmType/findAlarmTypeById?id=${id}`).then(({ data }) => {
-                    this.data = Object.assign(this.data, data);
-                    this.data.productId = [null, null, data.productId + ''];
                     this.getDeviceOptions(data.productId);
                     this.getMeasurePointOptions(data.productId);
+                    this.data = Object.assign(this.data, data);
+                    this.data.productId = [null, null, data.productId + ''];
                     this.measuringCode = this.data.rules[0].measuringCode ? this.data.rules[0].measuringCode : '';
-                    this.getOperator(this.data.attributeId);
+                    this.getOperator(data.attributeId);
                     this.setDaysAndTimes(data.days, data.times);
                 });
             }
@@ -803,6 +810,27 @@ export default {
                 .catch(() => {});
         }
     },
+    watch: {
+        'data.productId'(e) {
+            debugger;
+            if (this.firstiotProductId && !!e) {
+                let lat = _.last(e);
+                this.data.productId = e;
+                this.getDeviceOptions(lat);
+                this.getMeasurePointOptions(lat);
+                let rec = this.getCascaderObj(lat, this.productOptions);
+                this.data.iotProductId = rec.iotId || '';
+                this.firstiotProductId = false;
+            }
+        },
+        deviceOptions(e) {
+            if (this.firstiotDeviceId && !!this.data.deviceId) {
+                let item = _.find(this.deviceOptions, (it) => it.id == this.data.deviceId);
+                this.$set(this.data, 'iotDeviceId', item.iotDeviceId || '');
+                this.firstiotDeviceId = false;
+            }
+        }
+    },
     created() {
         this.copyoperatorOptions = operatorOptions.slice();
         this.alarmCategory = this.params.alarmCategory;

operationSupport/src/views/communityManagement/pageJump/AddOrEdit.vue

@@ -253,7 +253,7 @@ export default {
             if (!isLt2M) {
                 this.$message.error('上传头像图片大小不能超过 2MB!');
             }
-            return  isLt2M;
+            return isLt2M;
         },
         addressQueryClick() {
             this.mapPopUpStatus = true;
@@ -266,6 +266,7 @@ export default {
                     if (0 === status) {
                         this.ruleForm = data;
                         this.regionId = [data.provinceId, data.cityId, data.regionId];
+                        this.ruleForm.companyOrgId = data.beCompanyOrgId;
                         // this.companyOrgId = [null, null, data.companyOrgId];
                         // this.deptOrgId = [null, null, data.deptOrgId];
                     } else {

operationSupport/src/views/ownerManagement/stepPage/add.vue

@@ -650,7 +650,7 @@ export default {
                 .catch(() => {});
         },
         getTenantsTree() {
-            this.$http.get('/sc-community/assets/tree/community/find').then(({ status, data, msg }) => {
+            this.$http.get('/sc-community/assets/tree/community/find', { buildingType: 1 }).then(({ status, data, msg }) => {
                 if (status === 0 && data) {
                     this.dimension(data);
                     this.communityArr = data;

operationSupport/src/views/parkingLotAdministration/pageJump/partitionManagement.vue

@@ -44,7 +44,7 @@
 import list from '@utils/list.js';
 export default {
     mixins: [list],
-    name:'zoningManagement',
+    name: 'zoningManagement',
     data() {
         return {
             areaName: '',
@@ -168,12 +168,13 @@ export default {
             this.selectRow = val;
         },
         close() {
+            debugger;
             let activeRout = this.$route;
             let tagsList = this.$store.getters['getTagsList'];
             tagsList.forEach((item, index) => {
                 if (item.title == activeRout.meta.title || item.path == activeRout.path) {
                     tagsList.splice(index, 1);
-                    history.go(-1);
+                    this.$router.push({ path: tagsList[tagsList.length - 1].path });
                     return true;
                 }
             });

operationSupport/src/views/parkingLotAdministration/pageJump/zoneAddEdit.vue

@@ -5,7 +5,7 @@
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="车库名称" prop="garageId">
-                            <el-select v-model="ruleForm.garageId" placeholder="请选择车库名称">
+                            <el-select v-model="ruleForm.garageId" disabled placeholder="请选择车库名称">
                                 <el-option
                                     v-for="(item, index) in garageList"
                                     :label="item.label"
@@ -91,7 +91,7 @@ export default {
                         .catch(() => {
                             loading.close();
                         });
-                } 
+                }
             });
         }
     },
@@ -100,6 +100,7 @@ export default {
         if (this.params.todo == 'edit') {
             this.ruleForm = this.params.data;
         }
+        this.ruleForm.garageId = this.params.data.garageId;
         this.ruleForm.communityId = this.params.data.communityId;
     }
 };