1、消息日志管理完善

package.json

@@ -15,7 +15,7 @@
     "testc": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config node_modules/icore-icp/build/webpack.test.conf.js --require node_modules/icore-icp/test/setup.js node_modules/icore-icp/test/**/*.spec.js"
   },
   "dependencies": {
-    "icore-icp": "1.2.2-at.1.7"
+    "icore-icp": "1.2.2-at.1.9"
   },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.24",

src/views/basicInformation/components/measurementPlace.vue

@@ -494,7 +494,10 @@
                         label="转供工序"
                         width="90px"
                         :show-overflow-tooltip="true"
-                    ></el-table-column>
+                    >
+                    <template slot-scope="scope">
+                        <span>{{ nameObj.workprocid.obj[scope.row.transfer] ? nameObj.workprocid.obj[scope.row.transfer] : scope.row.transfer }}</span>
+                    </template></el-table-column>
                     <el-table-column
                         class-name="gn-TableDownloadExcel-none"
                         v-if="butPrivilege.PUT || butPrivilege.DELETE"

src/views/energyOperationSupport/components/securitys/SecurityFile.vue

@@ -157,7 +157,7 @@
                         <el-button
                             class="button"
                             type="primary"
-                            size="mini"
+                            size="small"
                             icon="el-icon-edit-outline"
                             v-privilege="activeMenu + 'UPDATA'"
                             @click="but_edit_plural()"
@@ -166,7 +166,7 @@
                         <el-button
                             class="button"
                             type="danger"
-                            size="mini"
+                            size="small"
                             icon="el-icon-delete"
                             v-privilege="activeMenu + 'DELETE'"
                             @click="but_del_plural()"
@@ -176,14 +176,14 @@
                             <el-button
                                 class="button"
                                 type="primary"
-                                size="mini"
+                                size="small"
                                 icon="el-icon-search"
                                 v-privilege="activeMenu + 'QUERY'"
                                 @click="getTableData(1)"
                                 :loading="loading"
                             >查询</el-button>
                             <el-button
-                                size="mini"
+                                size="small"
                                 :icon="filterForm.show ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
                                 :title="filterForm.show ? '收起搜索区' : '展开搜索区'"
                                 @click="filterForm.show = !filterForm.show;
@@ -368,7 +368,7 @@
           :visible.sync="dialogVisible"
           destroy-on-close
           width="90%"
-          top="10vh">
+          top="10vh">
           <iframe :src="previewUrl" width="100%" :height="singleTableHeight"></iframe>
         </el-dialog>
         <el-dialog

src/views/energyPerformance/components/supplyAnddemand/ProjectData.vue

@@ -517,8 +517,8 @@
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
-                                <span :style="{color: nameObj.issettle.obj[scope.row.issettle] ? nameObj.issettle.obj[scope.row.issettle].color : ''}"
-                                >{{ nameObj.issettle.obj[scope.row.issettle] ? nameObj.issettle.obj[scope.row.issettle].name : scope.row.issettle }}</span>
+                                <span :style="{color: nameObj.issettle.obj[scope.row.issettle] ? nameObj.issettle.obj[scope.row.issettle].color : '#7a7a7a'}"
+                                >{{ nameObj.issettle.obj[scope.row.issettle] ? nameObj.issettle.obj[scope.row.issettle].name : '待审核' }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -1037,7 +1037,7 @@ export default {
                                 updateUser: item.USERID,
                                 updateTime: item.UPTIME,
                                 fid: item.FID,
-                                issettle: item.ISSETTLE,
+                                issettle: item.ISLOCK,
                                 showno: item.SHOWNO,
                                 seq: i
                                 // 修改时间
@@ -1401,14 +1401,18 @@ export default {
                 let SubmitData = [];
                 let issettle = '';
                 for (let key in that.tableFormDataObj) {
-                  issettle =  that.tableFormDataObj[key].issettle === '0' ? '1' : '0'
+                  issettle =  that.tableFormDataObj[key].issettle === '1' ? '0' : '1'
                    SubmitData.push({
-                        itemid: that.tableFormDataObj[key].itemid,
-                        issettle: issettle
+                        itemid: that.tableFormDataObj[key].itemid,
+                        clock: that.tableFormDataObj[key].clock,
+                        timegranid: that.tableFormDataObj[key].timegranid,
+                        fid: that.tableFormDataObj[key].fid,
+                        update_user: that.userInfo.data.userCode,
+                        islock: issettle
                    });
                 }
                 that.loading = true;
-                that.axios.put('pass/ems/v1/trmactitems/batchUpdate', SubmitData)
+                that.axios.put('pass/ems/v1/trmactvalues/batchupdate', SubmitData)
                 .then(function (res) {
                 if (res.code === '0') {
                    that.$message({

src/views/energyScheduling/components/measuringLocationData/measuringLocationEntry.vue

@@ -451,6 +451,7 @@
                         <el-table-column
                             sortable
                             label="期末-期初"
+                            prop="subtracts"
                             min-width="100px"
                             :show-overflow-tooltip="true"
                         >
@@ -1043,7 +1044,7 @@ export default {
         },
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
-            const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
+            const prop = ['subtracts','actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
             return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(计量点数据录入)
@@ -1293,7 +1294,8 @@ export default {
                                 // 暂时没显示
                                 itemtype: item.ITEMTYPE,
                                 timegranid: item.TIMEGRANID,
-                                propertyid: that.nameObj.propertyid.obj[item.PROPERTYID]
+                                propertyid: that.nameObj.propertyid.obj[item.PROPERTYID],
+                                subtracts: item.MENDVALUE-item.MINTVALUE
                             })
                         }
                         that.tableData = arr;

src/views/systemInterface/components/webSocketLog.vue

@@ -91,7 +91,7 @@
                                       size="mini"
                                       @click="operateRole(scope.row)"
                                       v-privilege="activeMenu + 'PUT'"
-                                  >修改</el-button>
+                                  >详情</el-button>
                               </template>
                           </el-table-column>
                       </el-table>
@@ -348,7 +348,7 @@
                     <span>创建时间：{{noticeRow.createtime}}</span>
                 </div>
                 <div class="dialog-content">
-                    <p>
+                    <p style="word-wrap: break-word;word-break:break-all">
                         {{noticeRow.message}}
                     </p>
                 </div>
@@ -614,32 +614,32 @@ export default {
         // 每条页数
         pageSizeChange (pageSize) {
             this.noticeTable.tableParams.form.pageSize = pageSize;
-            this.getNotice(0);
+            this.getNotice('0');
         },
         //当前页
         pageCurrentChange (pageNum) {
             this.noticeTable.tableParams.form.pageNum = pageNum;
-            this.getNotice(0);
+            this.getNotice('0');
         },
         // 每条页数
         pageSizeChange2 (pageSize) {
             this.noticeTable.tableParams2.form.pageSize = pageSize;
-            this.getNotice(1);
+            this.getNotice('1');
         },
         //当前页
         pageCurrentChange2 (pageNum) {
             this.noticeTable.tableParams2.form.pageNum = pageNum;
-            this.getNotice(1);
+            this.getNotice('1');
         },
         //当前页
         pageCurrentChange3 (pageNum) {
-            this.noticeTable.tableParams2.form.pageNum = pageNum;
-            this.getNotice(2);
+            this.noticeTable.tableParams3.form.pageNum = pageNum;
+            this.getNotice('2');
         },
         // 每条页数
         pageSizeChange3 (pageSize) {
-            this.noticeTable.tableParams2.form.pageSize = pageSize;
-            this.getNotice(2);
+            this.noticeTable.tableParams3.form.pageSize = pageSize;
+            this.getNotice('2');
         },
         //  角色table点击
         nodeClick (item) {
@@ -735,6 +735,7 @@ export default {
             this.companyName = command.companyName;
             this.noticeTable.tableParams.form.companyId = this.companyId;
             this.noticeTable.tableParams2.form.companyId = this.companyId;
+            this.noticeTable.tableParams3.form.companyId = this.companyId;
             this.getRoles();
         },
         filterRoleChange (filters) {
@@ -764,17 +765,25 @@ export default {
         getNotice (status) {
             let that = this;
             let form = {};
+            let pageNum = 1;
+            let pageSize = 20;
             if (status === '0') {
                 that.noticeInfo.loading = true;
+                pageNum = this.noticeTable.tableParams.form.pageNum;
+                pageSize = this.noticeTable.tableParams.form.pageSize;
             } else if (status === '1') {
                 that.noticeInfo.loading2 = true;
+                pageNum = this.noticeTable.tableParams2.form.pageNum;
+                pageSize = this.noticeTable.tableParams2.form.pageSize;
             } else {
               that.noticeInfo.loading3 = true;
+              pageNum = this.noticeTable.tableParams3.form.pageNum;
+              pageSize = this.noticeTable.tableParams3.form.pageSize;
             }
             form = {
                 status: status,
-                pageNum: status === '0' ? this.noticeTable.tableParams.form.pageNum : this.noticeTable.tableParams2.form.pageNum,
-                pageSize: status === '0' ? this.noticeTable.tableParams.form.pageSize : this.noticeTable.tableParams2.form.pageSize,
+                pageNum: pageNum,
+                pageSize: pageSize,
                 companyId: this.companyId
             },
             this.axios.get('pass/ems/v1/emswebsocketlogs/?state='+form.status + '&pageNum=' + form.pageNum + '&pageSize=' + form.pageSize + '&companyId=' + form.companyId).then(res => {
@@ -806,7 +815,7 @@ export default {
                                     try {
                                         if (user && user !== null && user !== '') {
                                             let userName = that.userMap[user].userName ? that.userMap[user].userName : user;
-                                            userList.push(roleName);
+                                            userList.push(userName);
                                         }
                                     } catch (err) {
                                         console.log ('错误对象:' + user);
@@ -846,7 +855,7 @@ export default {
                                   try {
                                       if (user && user !== null && user !== '') {
                                           let userName = that.userMap[user].userName ? that.userMap[user].userName : user;
-                                          userList.push(roleName);
+                                          userList.push(userName);
                                       }
                                   } catch (err) {
                                       console.log ('错误对象:' + user);
@@ -897,7 +906,7 @@ export default {
                           }
                         })
                         that.noticeInfo.loading3 = false;
-                        that.setFilterDatas(that.$refs.noticeInfo3.columns, that.noticeInfo.list, ['title', 'recRole', 'sendtime', 'sendor']);
+                        that.setFilterDatas(that.$refs.noticeInfo3.columns, that.noticeInfo.receiveList, ['title', 'recRole', 'sendtime', 'sendor']);
                         that.noticeTable.tableParams3.page.total = res.data.total;
                     }
                 } else {
@@ -921,16 +930,16 @@ export default {
             this.$confirm('确认关闭？')
             .then(_ => {
                 done();
-                if (this.activeName === 'unRead') {
-                    this.noticeInfo.list.forEach((item, index) => {
-                        if (this.noticeRow.id === item.id) {
-                            this.noticeInfo.list.splice(index, 1);
-                            this.noticeTable.tableParams.page.total -= 1;
-                            this.noticeInfo.hasReadList.unshift(item);
-                            this.noticeTable.tableParams2.page.total += 1;
-                        }
-                    })
-                }
+                // if (this.activeName === 'unRead') {
+                //     this.noticeInfo.list.forEach((item, index) => {
+                //         if (this.noticeRow.id === item.id) {
+                //             this.noticeInfo.list.splice(index, 1);
+                //             this.noticeTable.tableParams.page.total -= 1;
+                //             this.noticeInfo.hasReadList.unshift(item);
+                //             this.noticeTable.tableParams2.page.total += 1;
+                //         }
+                //     })
+                // }
             })
             .catch((err) => {
                 console.log(err);