能源管理bug

energyManagement/public/index.html

@@ -15,7 +15,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico" type="image/x-icon" />
   <link rel="stylesheet" href="//at.alicdn.com/t/font_2251662_mafxfh566lg.css">
-  <title>智慧社区管理平台</title>
+  <title>智慧社区管理平台 <%=111 %></title>
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
   <!-- <script src="https://webapi.amap.com/maps?v=1.4.15&key=def65c683e32ae89dd7f8982b433b7f8&plugin=AMap.Autocomplete"></script> -->
@@ -27,20 +27,21 @@
     <strong>We're sorry but vms doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
   </noscript>
   <div id="app"></div>
-  <script src="https://cdn.bootcdn.net/ajax/libs/vue/2.6.12/vue.min.js"></script>
-  <script src="https://cdn.bootcdn.net/ajax/libs/vue-router/3.4.3/vue-router.min.js"></script>
-  <script src="https://cdn.bootcdn.net/ajax/libs/vuex/3.5.1/vuex.min.js"></script>
-  <script src="https://cdn.bootcdn.net/ajax/libs/element-ui/2.13.2/index.js"></script>
-  <script src="https://cdn.bootcdn.net/ajax/libs/axios/0.20.0/axios.min.js"></script>
+
+  <script src="https://cdn.staticfile.org/vue/2.6.12/vue.min.js"></script>
+  <script src="https://cdn.staticfile.org/vue-router/3.4.3/vue-router.min.js"></script>
+  <script src="https://cdn.staticfile.org/vuex/3.5.1/vuex.min.js"></script>
+  <script src="https://cdn.staticfile.org/element-ui/2.13.2/index.js"></script>
+  <script src="https://cdn.staticfile.org/axios/0.20.0/axios.min.js"></script>
   <!-- promise-polyfill -->
-  <script src="https://cdn.bootcdn.net/ajax/libs/promise-polyfill/8.1.3/polyfill.min.js"></script>
+  <script src="https://cdn.staticfile.org/promise-polyfill/8.1.3/polyfill.min.js"></script>
   <!-- JavaScript 实用工具库 -->
-  <script src="https://cdn.bootcdn.net/ajax/libs/lodash.js/4.17.11/lodash.min.js"></script>
+  <script src="https://cdn.staticfile.org/lodash.js/4.17.11/lodash.min.js"></script>
   <!-- 日期格式化插件dayjs -->
-  <script src="https://cdn.bootcdn.net/ajax/libs/dayjs/1.8.36/dayjs.min.js"></script>
+  <script src="https://cdn.staticfile.org/dayjs/1.8.36/dayjs.min.js"></script>
   <!-- 百度图表echarts -->
-  <script src="https://cdn.bootcdn.net/ajax/libs/echarts/4.8.0/echarts.min.js"></script>
+  <script src="https://cdn.staticfile.org/echarts/4.8.0/echarts.min.js"></script>
   <!-- built files will be auto injected -->
 </body>
 
-</html>
+</html>

energyManagement/src/views/instrumentManagement/baseData.js

@@ -757,15 +757,39 @@ export const AlertsCols = [
 export const valveInfoCols = [
   {
     label: '操作原因',
-    prop: 'operationType'
+    prop: 'operationCause',
   },
   {
     label: '操作类型',
-    prop: 'commandType',
+    prop: 'operationType',
+    format(val, data) {
+      let name = '';
+      switch (val) {
+        case 0:
+          return '关' + name;
+        case 1:
+          return '开' + name;
+        default:
+          return '-';
+      }
+    }
   }, {
     label: '操作结果',
-    slot: 'commandStatus',
-    prop: 'commandStatus',
+    slot: 'operationResult',
+    format(val, data) {
+      switch (val) {
+        case 0:
+          return '发送';
+        case 1:
+          return '超时';
+        case 2:
+          return '成功';
+        case 3:
+          return '失败';
+        default:
+          return '-';
+      }
+    }
   }, {
     label: '操作时间',
     prop: 'issueDate'

energyManagement/src/views/instrumentManagement/electricityMeter.vue

@@ -295,19 +295,19 @@ export default {
             });
         },
         valveToggle(satus) {
+            let ids = [];
             if (!this.selectRow.length) {
                 this.$message.error('您尚未选择要操作的记录，请选择后再操作');
                 return;
-            } else if (this.selectRow.length > 1) {
-                this.$message.error('请选择单条数据操作');
-                return;
             }
+            this.selectRow.forEach((v) => {
+                ids.push(v.id);
+            });
 
             this.$http
-                .post('/sc-energy/api/valveControl', {
-                    categoryId: this.mixins_query.categoryId,
+                .post('/sc-energy/device/batchValve', {
                     valveStatus: satus,
-                    houseId: this.selectRow[0].houseId
+                    ids: ids
                 })
                 .then(({ status, data, msg }) => {
                     if (status === 0) {

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

@@ -70,22 +70,6 @@
                     :pageset="mixins_pageset"
                     @page-change="pageChange"
                 >
-                    <template slot-scope="scope" slot="commandStatus">
-                        <span
-                            :style="{
-                                color: scope.row.commandStatus == '正常' || scope.row.commandStatus == '报警' ? '#ff5c58' : '#606266'
-                            }"
-                            >{{ scope.row.commandStatus }}</span
-                        >
-                        <el-tooltip
-                            placement="right"
-                            v-if="scope.row.commandStatus == '正常' || scope.row.commandStatus == '报警'"
-                            class="tooltip_style"
-                            content="如需重新下发，请到【设备列表】找到该设备手动触发指令"
-                        >
-                            <i style="color: red" class="iconfont icon-icon_attention"></i>
-                        </el-tooltip>
-                    </template>
                 </zz-table>
             </div>
             <div class="box__wrap" ref="replacebox" v-show="value == 'replace'">

energyManagement/src/views/instrumentManagement/waterMeter.vue

@@ -239,17 +239,15 @@ export default {
         Scrap(id) {
             this.$msgBox(`确认提示`, '设备报废后将无法正常接收数据，请问是否继续?')
                 .then(() => {
-                    this.$http
-                        .post('/sc-energy/device/edit/status', { id: id, deviceStatus: 5 })
-                        .then(({ status, data, msg }) => {
-                            if (0 === status) {
-                                this.$message({
-                                    type: 'success',
-                                    message: '报废成功!'
-                                });
-                                this.mixins_search();
-                            }
-                        });
+                    this.$http.post('/sc-energy/device/edit/status', { id: id, deviceStatus: 5 }).then(({ status, data, msg }) => {
+                        if (0 === status) {
+                            this.$message({
+                                type: 'success',
+                                message: '报废成功!'
+                            });
+                            this.mixins_search();
+                        }
+                    });
                 })
                 .catch(() => {});
         },
@@ -297,19 +295,19 @@ export default {
             });
         },
         valveToggle(satus) {
+            let ids = [];
             if (!this.selectRow.length) {
                 this.$message.error('您尚未选择要操作的记录，请选择后再操作');
                 return;
-            } else if (this.selectRow.length > 1) {
-                this.$message.error('请选择单条数据操作');
-                return;
             }
+            this.selectRow.forEach((v) => {
+                ids.push(v.id);
+            });
 
             this.$http
-                .post('/sc-energy/api/valveControl', {
-                    categoryId: this.mixins_query.categoryId,
+                .post('/sc-energy/device/batchValve', {
                     valveStatus: satus,
-                    houseId: this.selectRow[0].houseId
+                    ids: ids
                 })
                 .then(({ status, data, msg }) => {
                     if (status === 0) {
@@ -325,7 +323,7 @@ export default {
                 path: '/instrumentViewDetail',
                 query: {
                     id: row.id,
-                    type:this.mixins_query.categoryId
+                    type: this.mixins_query.categoryId
                 }
             });
         }

energyManagement/src/views/meterReadingManagement/index.vue

@@ -15,7 +15,7 @@
             </el-select>
             <el-date-picker
                 v-model="mixins_query.date"
-                value-format="yyyy-MM-dd"
+                value-format="yyyyMMdd"
                 type="date"
                 :picker-options="pickerOptions"
                 placeholder="选择日期"

energyManagement/src/views/valveControlRecords/index.vue

@@ -9,9 +9,9 @@
             <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>
-            <el-select v-model="mixins_query.readStatus" placeholder="选择操作类型" clearable>
-                <el-option label="关阀" :value="1"></el-option>
-                <el-option label="开阀" :value="2"></el-option>
+            <el-select v-model="mixins_query.operationType" placeholder="选择操作类型" clearable>
+                <el-option label="关阀" :value="0"></el-option>
+                <el-option label="开阀" :value="1"></el-option>
             </el-select>
             <el-date-picker
                 v-model="times"
@@ -49,6 +49,7 @@ import list from '@utils/list.js';
 export default {
     mixins: [list],
     data() {
+        let _this = this;
         return {
             cols: [
                 {
@@ -57,49 +58,83 @@ export default {
                 },
                 {
                     label: '地址',
-                    prop: 'paymentDays'
+                    prop: 'address'
                 },
                 {
                     label: '设备编号',
-                    prop: 'receivablePropertyFee'
+                    prop: 'deviceNo'
                 },
                 {
                     label: '设备名称',
-                    prop: 'receivedPropertyFee'
+                    prop: 'deviceName'
                 },
                 {
                     label: '用途',
-                    prop: 'collectionRateDict'
+                    prop: 'useType',
+                    format(val, data) {
+                        return val == 1 ? '房间表' : '公摊表';
+                    }
                 },
                 {
                     label: '操作类型',
-                    prop: 'receivedPropertyFee'
+                    prop: 'operationType',
+                    format(val, data) {
+                        let name = '';
+                        if (_this.mixins_query.categoryId === 1) {
+                            name = '阀';
+                        } else {
+                            name = '闸';
+                        }
+
+                        switch (val) {
+                            case 0:
+                                return '关' + name;
+                            case 1:
+                                return '开' + name;
+                            default:
+                                return '-';
+                        }
+                    }
                 },
                 {
                     label: '操作原因',
-                    prop: 'receivedPropertyFee'
+                    prop: 'operationCause'
                 },
                 {
                     label: '操作结果',
-                    prop: 'receivedPropertyFee'
+                    prop: 'operationResult',
+                    format(val, data) {
+                        switch (val) {
+                            case 0:
+                                return '发送';
+                            case 1:
+                                return '超时';
+                            case 2:
+                                return '成功';
+                            case 3:
+                                return '失败';
+                            default:
+                                return '-';
+                        }
+                    }
                 },
                 {
                     label: '操作时间',
-                    prop: 'receivedPropertyFee'
+                    prop: 'finishDate'
                 },
                 {
                     label: '执行时间',
-                    prop: 'receivedPropertyFee'
+                    prop: 'finishDate'
                 },
                 {
                     label: '操作员',
-                    prop: 'id'
+                    prop: 'createBy'
                 }
             ],
             accountType: 2,
             mixins_post: 'get',
             communityArr: [],
-            times:[],
+            times: []
         };
     },
     created() {