From bbeb6d44aacdd2a4e6e5017c95b3e7f90dc025d7 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 14 May 2020 15:19:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E9=A2=84=E8=A7=88?= =?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/api/designPlatform.js | 2 +- src/api/simulation.js | 8 ++++++++ src/views/newMap/displayNew/designIndex.vue | 14 ++++++++++++-- src/views/newMap/jlmapNew/index.vue | 4 +++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/api/designPlatform.js b/src/api/designPlatform.js index 3d7eb400a..861d4fe60 100644 --- a/src/api/designPlatform.js +++ b/src/api/designPlatform.js @@ -142,7 +142,7 @@ export function loadDraftScript(scriptId, memberId, group) { /** 剧本预览选择角色 */ export function loadDraftScriptNew(memberId, group) { return request({ - url: `/simulation/${group}/${memberId}`, + url: `/simulation/${group}/choosePlay?memberId=${memberId}`, method: 'put' }); } diff --git a/src/api/simulation.js b/src/api/simulation.js index af6e69e51..43bfb7ad1 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -285,6 +285,14 @@ export function selectScriptMembers(group, data) { }); } +/** 剧本开始执行(新版) */ +export function scriptExecuteNew(group) { + return request({ + url: `/api/scriptExecute/${group}`, + method: 'put' + }); +} + /** 选择剧本演出成员角色 (新版地图)*/ export function selectScriptMembersNew(group, data) { return request({ diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue index 7fb6a0f28..c45597e82 100644 --- a/src/views/newMap/displayNew/designIndex.vue +++ b/src/views/newMap/displayNew/designIndex.vue @@ -52,7 +52,7 @@ import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime'; import AddQuest from './demon/addQuest'; import { mapGetters } from 'vuex'; import { setGoodsTryUse } from '@/api/management/goods'; -import { clearSimulation, getSimulationInfoNew } from '@/api/simulation'; +import { clearSimulation, getSimulationInfoNew, scriptExecuteNew } from '@/api/simulation'; import { OperateMode, TrainingMode } from '@/scripts/ConstDic'; import { checkLoginLine } from '@/api/login'; import { loadNewMapDataByGroup } from '@/utils/loaddata'; @@ -145,6 +145,10 @@ export default { }, isDemon() { return this.mode === 'demon'; + }, + drawWay() { + const drawWay = this.$route.query.drawWay; + return drawWay && JSON.parse(drawWay); } // isDrive() { // return this.prdType == '04'; @@ -343,13 +347,19 @@ export default { } } this.switchMode(prdType); - const res = this.$route.query.drawWay ? await loadDraftScriptNew(id, this.group) : await loadDraftScript(row.id, id, this.group); + const res = this.drawWay ? await loadDraftScriptNew(id, this.group) : await loadDraftScript(row.id, id, this.group); if (res && res.code == 200) { this.questId = parseInt(row.id); if (mapLocation) { const newMapLocation = {'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale}; Vue.prototype.$jlmap.setOptions(newMapLocation); } + if (this.drawWay) { + scriptExecuteNew(this.group).then(data=>{ + }).catch(error=>{ + console.log(error); + }); + } // if (res.data && res.data.mapLocation) { // const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale}; // Vue.prototype.$jlmap.setOptions(mapLocation); diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 7e0d29400..670999819 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -147,7 +147,9 @@ export default { this.mapViewLoaded(true); }, '$store.state.training.prdType': function (val) { - this.changePrdType(val); + if (val) { + this.changePrdType(val); + } }, '$store.state.map.showCentralizedStationNum': function (val) { this.setShowStation(this.$store.state.map.showCentralizedStationCode); From 77a8fd7c41de22c2aaccf73b0a06ae8526a88042 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 14 May 2020 15:32:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E5=88=97=E8=BD=A6=E5=9C=A8=E7=AB=99=E5=8F=B0?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E6=97=B6=EF=BC=8C=E7=AB=99=E5=8F=B0=E6=A1=86?= =?UTF-8?q?=E4=B9=9F=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=BB=BF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/constant/deviceState.js | 1 - src/jmapNew/constant/stateTransition.js | 3 +-- src/jmapNew/shape/StationStand/index.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js index 685b10874..fc28859b7 100644 --- a/src/jmapNew/constant/deviceState.js +++ b/src/jmapNew/constant/deviceState.js @@ -124,7 +124,6 @@ deviceState[deviceType.StationStand] = { assignSkip: 0, // 是否指定跳停 runLevelTime: 0, // 区间运行时间 自动为 0 parkingTime: 0, // 站台停车时间 自动为0 - doorOpen:0, // 车门开启 自动为0 （西安二号线样式 暂时后端没加该字段） // /** 折返策略*/ // reentryStrategy: { diff --git a/src/jmapNew/constant/stateTransition.js b/src/jmapNew/constant/stateTransition.js index 98178fda3..1acf8f664 100644 --- a/src/jmapNew/constant/stateTransition.js +++ b/src/jmapNew/constant/stateTransition.js @@ -24,8 +24,7 @@ class Status { assignSkip: device.assignSkip, // 是否指定跳停 runLevelTime: device.runLevelTime, // 区间运行时间 自动为 0 parkingTime: device.parkingTime, // 站台停车时间 自动为0 - fault: device.fault, /** 非故障*/ - doorOpen:device.doorOpen /** 车门开启 自动为0 （西安二号线样式 暂时后端没加该字段）*/ + fault: device.fault /** 非故障*/ }; } handleSection(device) { diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js index 2ce6b4d69..c268329c2 100644 --- a/src/jmapNew/shape/StationStand/index.js +++ b/src/jmapNew/shape/StationStand/index.js @@ -492,7 +492,7 @@ class StationStand extends Group { model.trainParking && this.stop(); /** 列车停站*/ model.emergencyClosed && this.emergentClose(); /** 站台紧急关闭*/ - model.doorOpen && this.doorOpen(); /** 车门开启 （西安二号线样式）*/ + model.trainParking && this.doorOpen(); /** 车门开启 （西安二号线样式）*/ if (Number(model.parkingTime) > 0) { this.setManuallyArmisticeTime(model.parkingTime); // 设置站台停车时间 From f8a6908d8c9712467c38c912647f1991b1234d9c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 14 May 2020 15:37:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/xian_02.js | 2 +- src/jmapNew/shape/Signal/index.js | 3 --- src/jmapNew/shape/StationStand/index.js | 1 + src/jmapNew/shape/Switch/index.js | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js index 09fe73599..3b68afa5f 100644 --- a/src/jmapNew/config/skinCode/xian_02.js +++ b/src/jmapNew/config/skinCode/xian_02.js @@ -599,7 +599,7 @@ class SkinCode extends defaultStyle { rectWidth: 20, // 折返模块宽度 lineWidth: 3, // 折返模块线宽 fillColor: 'rgba(0,0,0,0)', // 填充色 - strokeColor: '#FFFFFF' // 线颜色 + strokeColor: '#9F9C9C' // 线颜色 }; this[deviceType.ModeStatusGroup] = { // 车站状态模式 displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js index 1b0f0875b..c60395f25 100644 --- a/src/jmapNew/shape/Signal/index.js +++ b/src/jmapNew/shape/Signal/index.js @@ -528,9 +528,6 @@ class Signal extends Group { /** 信号机封锁 */ // 缺一个功能封锁 model.blockade && this.block(); /** 设置灯的颜色 */ - // model.redOpen = 1; - // model.yellowOpen = 1; - // model.greenOpen = 0; model.redOpen && model.yellowOpen && !model.greenOpen && this.guid(); // 引导信号显示 model.redOpen && !model.yellowOpen && !model.greenOpen && this.close(); // 信号关闭 model.greenOpen && !model.redOpen && !model.yellowOpen && this.openPositive(); // 信号正向开放 diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js index 2ce6b4d69..d64cc8b5a 100644 --- a/src/jmapNew/shape/StationStand/index.js +++ b/src/jmapNew/shape/StationStand/index.js @@ -382,6 +382,7 @@ class StationStand extends Group { this.trainDepart && this.trainDepart.hideMode(); this.reentry && this.reentry.hideMode(); this.jump && this.jump.hideMode(); + this.detainCircle && this.detainCircle.setColor(this.style.StationStand.detainCar.defaultColor); } /** 空闲*/ diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index 94dfff3ee..0b9312fcf 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -162,7 +162,7 @@ export default class Switch extends Group { _subType: 'enabled', // 标识 style: { x: arrowTextX, - y: arrowTextY, + y: arrowTextY + 10, fontSize: 12, text: 'E', textAlign: 'center', From 4fec468885b66f042280711082e638ad1f62b7e9 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 14 May 2020 15:48:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E9=A2=84=E8=A7=88?= =?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 --- .../newMap/displayNew/chatView/chatContent.vue | 2 +- .../newMap/displayNew/chatView/chatMemberList.vue | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/views/newMap/displayNew/chatView/chatContent.vue b/src/views/newMap/displayNew/chatView/chatContent.vue index e09b49033..4b9a41029 100644 --- a/src/views/newMap/displayNew/chatView/chatContent.vue +++ b/src/views/newMap/displayNew/chatView/chatContent.vue @@ -8,7 +8,7 @@
- @{{ covertName(chatContent.targetName) }} + @{{ covertName(chatContent.targetName) }} {{ chatContent.message }}