修改能源管理bug

energyManagement/src/views/instrumentManagement/electricityMeter.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="main">
         <div class="search">
-            <el-input placeholder="输入设备编号/名称/地址" class="search-input" clearable v-model="mixins_query.deviceNo"></el-input>
+            <el-input placeholder="输入设备编号/名称/地址" class="search-input" clearable v-model="mixins_query.name"></el-input>
             <el-select v-model="mixins_query.communityId" placeholder="选择社区" clearable>
                 <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
             </el-select>

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

@@ -155,11 +155,11 @@ export default {
                 {
                     value: 'valveNote',
                     label: '阀控记录'
-                },
-                {
-                    value: 'replace',
-                    label: '换表记录'
                 }
+                // {
+                //     value: 'replace',
+                //     label: '换表记录'
+                // }
             ],
             dataUnit: '',
             dataValue: '',
@@ -260,6 +260,11 @@ export default {
         getHistorical() {
             this.historyDataList = [];
             // 获取历史数据列表
+            this.mixins_query = {
+                deviceId: this.params.id || '',
+                startDate: this.dataValue.length ? `${this.dataValue[0]}` : '',
+                endDate: this.dataValue.length ? `${this.dataValue[1]}` : ''
+            };
             if (this.params.productId) {
                 this.$http
                     .post('/sc-energy/device/getData', this.mixins_query)
@@ -384,16 +389,15 @@ export default {
                 .substr(0, 8);
         },
         exportExcel(date) {
-            date = this.dataValue;
             let downurl = '';
             let params = {
-                deviceId: this.params.productId || '',
+                deviceId: this.params.id || '',
                 startDate: this.dataValue.length ? `${this.dataValue[0]}000000` : '',
                 endDate: this.dataValue.length ? `${this.dataValue[1]}235959` : ''
             };
             if (this.value == 'history') {
                 params = {
-                    deviceId: this.params.productId || '',
+                    deviceId: this.params.id || '',
                     startDate: this.dataValue.length ? `${this.dataValue[0]}` : '',
                     endDate: this.dataValue.length ? `${this.dataValue[1]}` : ''
                 };
@@ -401,7 +405,7 @@ export default {
             } else if (this.value == 'alarm') {
                 params = Object.assign(params, {
                     categoryId: this.params.categoryId || '',
-                    deviceId: this.params.productId || ''
+                    deviceId: this.params.id || ''
                 });
                 downurl = '/sc-energy/alarm/exportExcel';
             } else if (this.value == 'replace') {

energyManagement/src/views/instrumentManagement/waterMeter.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="main">
         <div class="search">
-            <el-input placeholder="输入设备编号/名称/地址" class="search-input" clearable v-model="mixins_query.deviceNo"></el-input>
+            <el-input placeholder="输入设备编号/名称/地址" class="search-input" clearable v-model="mixins_query.name"></el-input>
             <el-select v-model="mixins_query.communityId" placeholder="选择社区" clearable>
                 <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
             </el-select>

energyManagement/src/views/settlementAudit/setPage/auditnum.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="device">
         <div class="search">
-            <el-input placeholder="输入设备编号/地址" class="search-input" clearable v-model="mixins_query.deviceNo"></el-input>
+            <el-input placeholder="输入设备编号/地址" class="search-input" clearable v-model="mixins_query.meterNo"></el-input>
             <el-select filterable v-model="mixins_query.approvalStatus" placeholder="请选择审核状态" clearable>
                 <el-option label="未审核" :value="0"></el-option>
                 <el-option label="已审核" :value="1"></el-option>
@@ -68,19 +68,22 @@ export default {
             cols: [
                 {
                     label: '所属社区',
-                    prop: 'meterNo'
+                    prop: 'communityName'
                 },
                 {
                     label: '地址',
-                    prop: 'meterNo'
+                    prop: 'location'
                 },
                 {
                     label: '设备编号',
-                    prop: 'meterNo'
+                    prop: 'deviceNo'
                 },
                 {
                     label: '用途',
-                    prop: 'meterNo'
+                    prop: 'useType',
+                    format(val, data) {
+                        return val == 1 ? '房间表' : '公摊表';
+                    }
                 },
                 {
                     label: '计量周期',
@@ -188,7 +191,7 @@ export default {
                     height: '200px',
                     props: {
                         data,
-                        type:this.params.type,
+                        type: this.params.type,
                         callback: resolve
                     },
                     title: this.params.type == 1 ? '修改水量' : '修改电量'