From 49593b2851a7ef4547ed9e4ce2651e0c8bdd02fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=BA=20=E8=91=A3?= <58670809@qq.com> Date: Thu, 30 Jun 2022 18:13:23 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=94=B6=E4=BB=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/dispatcherStation/shouxinxiang.png | Bin 0 -> 3914 bytes src/jmapNew/theme/datie_02/menus/index.vue | 42 ++- src/store/modules/socket.js | 8 + .../dispatcherStationManage/cmdManage.vue | 254 ++++++++++++++++++ .../dispatcherStationManage/dispatchCmd.vue | 196 ++++++++++++-- 5 files changed, 468 insertions(+), 32 deletions(-) create mode 100644 src/assets/dispatcherStation/shouxinxiang.png create mode 100644 src/views/dispatcherStationManage/cmdManage.vue diff --git a/src/assets/dispatcherStation/shouxinxiang.png b/src/assets/dispatcherStation/shouxinxiang.png new file mode 100644 index 0000000000000000000000000000000000000000..bd285bc83c42c3b0027b586fd780c1b6a58ad64c GIT binary patch literal 3914 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
-
调度命令
+
调度命令
阶段计划
阶段记事
@@ -57,11 +57,12 @@ +
- + diff --git a/src/views/dispatcherStationManage/dispatchCmd.vue b/src/views/dispatcherStationManage/dispatchCmd.vue index 0350bc925..6451080ca 100644 --- a/src/views/dispatcherStationManage/dispatchCmd.vue +++ b/src/views/dispatcherStationManage/dispatchCmd.vue @@ -18,11 +18,9 @@
-
数据库正常
-
缓存命令
-
接受命令
-
发送命令
-
签收完成
+
+ 新建调度命令 +
@@ -49,13 +47,20 @@ - + - + + + @@ -65,7 +70,7 @@ - + @@ -75,22 +80,43 @@ - + - + + + - + + + - + + + @@ -106,23 +132,24 @@
-
+
受令列表 - 全选 +
- + - - - - - + + + + +
- 下达 + 下达 + 关闭
@@ -136,6 +163,8 @@ + From 1ab714dab90e4e9f3098f38c62891f031a504a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=BA=20=E8=91=A3?= <58670809@qq.com> Date: Mon, 4 Jul 2022 09:59:15 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dispatcherStationManage/signedCmd.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/dispatcherStationManage/signedCmd.vue b/src/views/dispatcherStationManage/signedCmd.vue index 151fd1943..51ecbc4d6 100644 --- a/src/views/dispatcherStationManage/signedCmd.vue +++ b/src/views/dispatcherStationManage/signedCmd.vue @@ -199,6 +199,7 @@ export default { this.$emit('signedCmdClose'); }, getSignedData() { + this.signedData = {}; if (this.dispatchCommandMsg.type == 'ADD') { this.signedData = this.dispatchCommandMsg.body; } From eb0dc5661692b63c3df8db49ddab16e64fce1d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=BA=20=E8=91=A3?= <58670809@qq.com> Date: Mon, 4 Jul 2022 11:17:35 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/index.vue | 8 +++-- .../dispatcherStationManage/cmdManage.vue | 32 +++++++++---------- .../dispatcherStationManage/signedCmd.vue | 12 ++++--- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index f15639eb9..645d03ed7 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -58,7 +58,7 @@ - +
@@ -246,10 +246,14 @@ export default { window.onclick = function (e) {}; }, methods: { + changeSignedStatus(info) { + this.isCtc && this.$refs.cmdManage.changeSignedStatus(info); + }, signedCmdClose() { - this.$refs.cmdManage.doShow(); + this.isCtc && this.$refs.cmdManage.doShow(); }, showCmdManage() { + if (!this.isCtc) { return; } if (this.hasCommandMsg) { this.$refs.signedCmd.doShow(); } else { diff --git a/src/views/dispatcherStationManage/cmdManage.vue b/src/views/dispatcherStationManage/cmdManage.vue index 6d5b2aaba..ddf67e608 100644 --- a/src/views/dispatcherStationManage/cmdManage.vue +++ b/src/views/dispatcherStationManage/cmdManage.vue @@ -219,27 +219,14 @@ export default { }, signCmd(status) { if (!this.commandId) { return; } + const signInfo = { commandId: this.commandId, signedBy: this.getActiveUser.memberId, signedStatus: status }; const data = { - signInfo: { - commandId: this.commandId, - signedBy: this.getActiveUser.memberId, - signedStatus: status - } + signInfo: signInfo }; sendCommandNew(this.group, 'CTC_SIGN_DISPATCH_COMMAND', data).then((res) => { console.log(res, '---res'); if (res.code == 200) { - const index = this.cmdTableData.findIndex(item => { - return item.id == this.commandId; - }); - if (index >= 0) { - const obj = this.cmdTableData[index]; - const mId = this.getActiveUser.memberId; - obj.receiverInfos[mId].signedBy = mId; - obj.receiverInfos[mId].signedStatus = status; - obj.receiverInfos[mId].time = parseTime(this.initTime); - this.cmdTableData.splice(index, 1, obj); - } + this.changeSignedStatus(signInfo); } else { this.$messageBox(`${this.signedStatusObj[status]}调度命令失败：${res.message}`); } @@ -247,6 +234,19 @@ export default { this.$messageBox(`${this.signedStatusObj[status]}调度命令失败：${error.message}`); }); }, + changeSignedStatus(signInfo) { + const index = this.cmdTableData.findIndex(item => { + return item.id == signInfo.commandId; + }); + if (index >= 0) { + const obj = this.cmdTableData[index]; + const mId = signInfo.signedBy; + obj.receiverInfos[mId].signedBy = mId; + obj.receiverInfos[mId].signedStatus = signInfo.signedStatus; + obj.receiverInfos[mId].time = parseTime(this.initTime); + this.cmdTableData.splice(index, 1, obj); + } + }, searchCmd() { sendCommandNew(this.group, 'CTC_QUERY_DISPATCH_COMMAND').then((res) => { console.log(res, '---res'); diff --git a/src/views/dispatcherStationManage/signedCmd.vue b/src/views/dispatcherStationManage/signedCmd.vue index 51ecbc4d6..38841a6e5 100644 --- a/src/views/dispatcherStationManage/signedCmd.vue +++ b/src/views/dispatcherStationManage/signedCmd.vue @@ -99,6 +99,7 @@ export default { needRead: false, needprint: false, dialogShow: false, + signedId: '', signedBy: '', typeObj: { NORMAL: '正常调度命令' @@ -182,11 +183,14 @@ export default { return val ? parseTime(val, f) : ''; }, getSenderName() { + this.signedBy = ''; + this.signedId = ''; const activeUser = this.simulationUserList.find(item => { return item.userId == this.$store.state.user.id; }); if (activeUser) { this.signedBy = activeUser.nickName; + this.signedId = activeUser.memberId; } }, doShow() { @@ -220,15 +224,13 @@ export default { }, signCmd(status) { if (!this.commandId) { return; } + const signInfo = { commandId: this.commandId, signedBy: this.signedId, signedStatus: status }; const data = { - signInfo: { - commandId: this.commandId, - signedBy: this.signedBy, - signedStatus: status - } + signInfo: signInfo }; sendCommandNew(this.group, 'CTC_SIGN_DISPATCH_COMMAND', data).then((res) => { console.log(res, '---res'); + this.$emit('changeSignedStatus', signInfo); this.doClose(); }).catch(error => { this.$messageBox('查询调度命令失败：' + error.message); From e2b2f80e4d6147d0ba134162af5fff5753ebe8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=BA=20=E8=91=A3?= <58670809@qq.com> Date: Mon, 4 Jul 2022 14:28:06 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispatcherStationManage/cmdManage.vue | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/views/dispatcherStationManage/cmdManage.vue b/src/views/dispatcherStationManage/cmdManage.vue index ddf67e608..dbfb0745c 100644 --- a/src/views/dispatcherStationManage/cmdManage.vue +++ b/src/views/dispatcherStationManage/cmdManage.vue @@ -25,7 +25,7 @@
收令箱
- + @@ -193,6 +193,13 @@ export default { this.searchCmd(); }, methods:{ + tableRowClassName({row, rowIndex}) { + const status = this.getSignInfo(row.receiverInfos).signedStatus; + if (status === 'SIGNED') { + return 'signed-row'; + } + return 'unsigned-row'; + }, doShow() { this.dialogShow = true; this.$store.commit('socket/clearDispatchCommandMsg'); @@ -298,6 +305,16 @@ export default { .content-box { width: calc(100% - 150px); padding-left: 10px; + .box-top { + .el-table { + /deep/ .signed-row { + color: red; + } + /deep/ .unsigned-row { + color: blue; + } + } + } .box-middle { padding-top: 10px; display: flex; From 8555ae081a5627d119b6f7c93d2dfbbad9584ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=BA=20=E8=91=A3?= <58670809@qq.com> Date: Mon, 4 Jul 2022 14:46:00 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dispatcherStationManage/dispatchCmd.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/dispatcherStationManage/dispatchCmd.vue b/src/views/dispatcherStationManage/dispatchCmd.vue index 140427c7e..53b3c352f 100644 --- a/src/views/dispatcherStationManage/dispatchCmd.vue +++ b/src/views/dispatcherStationManage/dispatchCmd.vue @@ -19,7 +19,7 @@
- 新建调度命令 + 新建调度命令
@@ -253,6 +253,16 @@ export default { beforeDestroy() {}, mounted() {}, methods:{ + createCmd() { + this.$confirm('当前调度命令已经被编辑修改过了，你要放弃所有的修改吗？', '操作提示', { + confirmButtonText: '是', + cancelButtonText: '否' + }).then(() => { + this.initData(); + }).catch(() => { + console.log('取消新建调度命令!'); + }); + }, initData() { this.command = { title: '', @@ -284,7 +294,6 @@ export default { } }, getSenderName() { - debugger; this.memberDataList = Object.values(this.memberData); const activeUser = this.memberDataList.find(item => { return item.userId == this.$store.state.user.id; From 2d89a10eae4ad874ba9bfedafeca7b4f96341f18 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 4 Jul 2022 16:09:08 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=93=81=E7=A7=91=E9=99=A2=20=E5=A4=A7?= =?UTF-8?q?=E9=93=81=E7=BA=BF=E8=B7=AF=20=E6=B7=BB=E5=8A=A0=20=E5=8C=BA?= =?UTF-8?q?=E6=AE=B5=E6=95=85=E9=9A=9C=E8=A7=A3=E9=94=81=20=E6=8C=87?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/datie_tky/menus/menuSection.vue | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 src/jmapNew/theme/datie_tky/menus/menuSection.vue diff --git a/src/jmapNew/theme/datie_tky/menus/menuSection.vue b/src/jmapNew/theme/datie_tky/menus/menuSection.vue new file mode 100644 index 000000000..1abfbb0d5 --- /dev/null +++ b/src/jmapNew/theme/datie_tky/menus/menuSection.vue @@ -0,0 +1,113 @@ + +