From b9f71f75d9f2a72495a7716825c7c359408c1c9a Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 3 Nov 2020 16:37:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=A7=E6=9C=AC?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E4=BD=9C=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/script.js | 8 ++++++++ src/jmapNew/theme/haerbin_01/menus/menuButton.vue | 10 +++++++++- src/views/scriptManage/allScriptRole.vue | 7 +++++-- src/views/scriptManage/getAction.vue | 14 +++++++++++++- src/views/scriptManage/tipScriptRecord.vue | 8 +++++++- 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/api/script.js b/src/api/script.js index dfff747cf..f316ea3d9 100644 --- a/src/api/script.js +++ b/src/api/script.js @@ -118,3 +118,11 @@ export function getScriptExport(id) { method: 'get' }); } + +/** 删除会话动作（新版）*/ +export function deleteScriptAction(group, actionId) { + return request({ + url: `/api/scriptSimulation/${group}/${actionId}/delete`, + method: 'delete' + }); +} diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 4c499bd83..8048deb70 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -152,7 +152,9 @@ export default { this.oldDevice = this.selectedObj; break; case 'StationStand': - this.handleStandMenu(); + if (this.$store.state.menuOperation.subType == 'trainSetButton') { + this.handleStandMenu(); + } break; case 'DirectionRod': this.handleDirectionRodMenu(); @@ -432,10 +434,16 @@ export default { }, handleStandMenu() { this.clearAllMenuShow(); + if (this.$store.state.training.prdType === '02') { + this.deviceHighLight(this.oldDevice, false); + this.deviceHighLight(this.selectedObj, true); + this.oldDevice = this.selectedObj; + } this.centralizedStationList = new Array(15).fill({}); this.standParamList.forEach((stand, index) => { this.centralizedStationList[index] = stand; }); + this.tempData = []; const data = Object.assign(this.selectedObj); const station = this.$store.getters['map/getDeviceByCode'](this.selectedObj.stationCode); diff --git a/src/views/scriptManage/allScriptRole.vue b/src/views/scriptManage/allScriptRole.vue index 0cf6ae66c..f32d3ea3f 100644 --- a/src/views/scriptManage/allScriptRole.vue +++ b/src/views/scriptManage/allScriptRole.vue @@ -116,11 +116,14 @@ export default { .settingBtn{ color: #409eff; cursor: pointer; - padding: 5px 10px; + padding: 2px 10px; border-radius: 4px; + border: 1px #409eff solid; } .hasSetted{ - + width: 50px; + text-align: center; + display: inline-block; } From 5bf5c3bac341209af6b3317d823447ee828e831e Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 3 Nov 2020 17:13:49 +0800 Subject: [PATCH 2/2] =?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/views/scriptManage/getAction.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue index 566ed8989..dcdff645e 100644 --- a/src/views/scriptManage/getAction.vue +++ b/src/views/scriptManage/getAction.vue @@ -46,7 +46,7 @@ {{ $t('scriptRecord.modifyConversitionButton') }} 确定 取消 - 删除 + 删除