From c855925ae38cc31cca5d0d417e2d09b35a28bac5 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Thu, 8 Aug 2019 09:37:35 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/config/deviceStyle.js | 4 ++-- src/jmap/shape/Switch/index.js | 7 +++---- src/jmap/theme/factory.js | 4 ++-- src/jmap/utils/JTriangle.js | 20 ++++++++++---------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/jmap/config/deviceStyle.js b/src/jmap/config/deviceStyle.js index 068b1de61..bc429b5db 100644 --- a/src/jmap/config/deviceStyle.js +++ b/src/jmap/config/deviceStyle.js @@ -1,8 +1,8 @@ const mapDeviceStyle = { '01': 'chengdu_04', '02': 'fuzhou_01', - // '03': 'bejing_01', - '03': 'chengdu_03', + '03': 'bejing_01', + '04': 'chengdu_03', '05': 'batong_01' // 暂时没有画北京八通线 }; diff --git a/src/jmap/shape/Switch/index.js b/src/jmap/shape/Switch/index.js index 64c5c5a4e..de7602a9c 100644 --- a/src/jmap/shape/Switch/index.js +++ b/src/jmap/shape/Switch/index.js @@ -20,8 +20,9 @@ export default class Switch extends Group { this.style = style; this.zlevel = model.zlevel; this.z = 6; + this.triangle = new JTriangle(model.intersection, model.skew); this.create(); - this._createLockRect(); // 创建单锁矩形框显示 + this.createLockRect(); // 创建单锁矩形框显示 this.createMouseEvent(); this.setState(model); } @@ -40,8 +41,6 @@ export default class Switch extends Group { const model = this.model; const style = this.style; - this.triangle = new JTriangle(model.intersection, model.skew); - let halfWidth = style.Section.line.width / 2; const switchWidth = style.Section.line.width + style.Section.line.beyondWidth*2 + 0.8; const swPadding = style.Switch.core.length; @@ -147,7 +146,7 @@ export default class Switch extends Group { this.add(this.name); } - _createLockRect() { + createLockRect() { const offsetX = this.model.locateType == '01' ? 3 : 0; this.lockRect = new ELockRect({ zlevel: this.zlevel, diff --git a/src/jmap/theme/factory.js b/src/jmap/theme/factory.js index ee3b2db3e..65bc48c5a 100644 --- a/src/jmap/theme/factory.js +++ b/src/jmap/theme/factory.js @@ -4,8 +4,8 @@ class Theme { this._mapMenu = { '01': 'default', // 成都4号线 '02': 'fuzhou_01', - // '03': 'beijing_01', - '03': 'chengdou_03', + '03': 'beijing_01', + '04': 'chengdou_03', '05': 'batong_01' }; } diff --git a/src/jmap/utils/JTriangle.js b/src/jmap/utils/JTriangle.js index b68ac4171..5b732c31a 100644 --- a/src/jmap/utils/JTriangle.js +++ b/src/jmap/utils/JTriangle.js @@ -13,7 +13,7 @@ JTriangle.prototype = { dricty: 0, drict: 0, - init: function (beg, end) { + init (beg, end) { this.beg = beg; this.end = end; this.abspowx = Math.pow(this.end.x - this.beg.x, 2); @@ -28,35 +28,35 @@ JTriangle.prototype = { this.diff_x = end.x - beg.x; this.diff_y = end.y - beg.y; }, - getRotation: function () { + getRotation () { return Math.atan(this.diff_y / this.diff_x); }, - getAngle: function () { + getAngle () { return 360 * Math.atan(this.diff_y / this.diff_x) / (2 * Math.PI); }, - getCos: function (n) { + getCos (n) { return this.drictx * Math.sqrt(Math.pow(n, 2) * this.abspowx / this.abspowz); }, - getSin: function (n) { + getSin (n) { return this.dricty * Math.sqrt(Math.pow(n, 2) * this.abspowy / this.abspowz); }, - getCosRate: function () { + getCosRate () { return Math.sqrt(this.abspowx / this.abspowz); }, - getSinRate: function () { + getSinRate () { return Math.sqrt(this.abspowy / this.abspowz); }, - getTanRate: function () { + getTanRate () { var diff_x = this.end.x - this.beg.x; var diff_y = this.end.y - this.beg.y; return Math.abs(diff_y / diff_x); }, - getCotRate: function () { + getCotRate () { var diff_x = this.end.x - this.beg.x; var diff_y = this.end.y - this.beg.y; return Math.abs(diff_x / diff_y); }, - middlePoint: function () { + middlePoint () { return { x: Math.min(this.end.x, this.beg.x) + Math.abs(this.end.x - this.beg.x) / 2, y: Math.min(this.end.y, this.beg.y) + Math.abs(this.end.y - this.beg.y) / 2 From f231ffd6f1a353e322d88610bd615e9ecc0a64e3 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 8 Aug 2019 09:47:39 +0800 Subject: [PATCH 02/11] =?UTF-8?q?desc:=20=E5=A2=9E=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E9=83=BD=E5=9B=9B=E5=8F=B7=E7=BA=BF=E5=9C=B0=E5=9B=BE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/config/deviceStyle.js | 4 +- src/jmap/config/skinStyle/chengdu_04.js | 129 +- src/jmap/shape/Train/TrainBody/EMouse.js | 2 +- .../beijing_01/planSchedule/schedule.vue | 896 ++++++------ .../chengdou_03/menus/dialog/trainControl.vue | 326 ----- .../menus/dialog/alxeEffective.vue | 0 .../menus/dialog/cancelAllLimit.vue | 0 .../childDialog/childDialog/noticeInfo.vue | 0 .../dialog/childDialog/confirmControl.vue | 0 .../childDialog/confirmControlSpeed.vue | 0 .../childDialog/confirmSignalUnlock.vue | 0 .../menus/dialog/childDialog/confirmTip.vue | 0 .../menus/dialog/childDialog/confirmTrain.vue | 0 .../menus/dialog/childDialog/password.vue | 0 .../dialog/childDialog/passwordInputBox.vue | 0 .../menus/dialog/childDialog/popupAlarm.vue | 0 .../menus/dialog/routeControl.vue | 0 .../menus/dialog/routeDetail.vue | 0 .../menus/dialog/routeGuide.vue | 0 .../menus/dialog/routeSelection.vue | 0 .../menus/dialog/sectionCmdControl.vue | 0 .../menus/dialog/sectionControl.vue | 0 .../menus/dialog/sectionDetail.vue | 0 .../menus/dialog/speedCmdControl.vue | 0 .../menus/dialog/standControl.vue | 0 .../menus/dialog/standDetail.vue | 0 .../menus/dialog/stationCmdControl.vue | 0 .../menus/dialog/switchCmdControl.vue | 0 .../menus/dialog/switchControl.vue | 0 .../chengdu_03/menus/dialog/trainControl.vue | 342 +++++ .../menus/dialog/trainCreate.vue | 0 .../menus/dialog/trainCreateNumber.vue | 0 .../menus/dialog/trainDelete.vue | 0 .../menus/dialog/trainDeleteNumber.vue | 0 .../menus/dialog/trainDetailInfo.vue | 0 .../menus/dialog/trainEditNumber.vue | 0 .../menus/dialog/trainMove.vue | 0 .../menus/dialog/trainMoveNumber.vue | 0 .../menus/dialog/trainSwitch.vue | 0 .../menus/index.vue | 0 .../menus/menuBar.vue | 0 .../menus/menuCancel.vue | 0 .../childDialog/twoConfirmation.vue | 0 .../menus/menuDialog/childDialog/userAdd.vue | 0 .../menuDialog/childDialog/userDelete.vue | 0 .../menus/menuDialog/childDialog/userEdit.vue | 0 .../menus/menuDialog/helpAbout.vue | 0 .../menus/menuDialog/limitSpeed.vue | 0 .../menus/menuDialog/manageUser.vue | 0 .../menus/menuDialog/passwordBox.vue | 0 .../menus/menuDialog/setLimitSpeed.vue | 0 .../menuDialog/stationControlConvert.vue | 0 .../menus/menuDialog/trainAdd.vue | 0 .../menus/menuDialog/trainDelete.vue | 0 .../menus/menuDialog/trainTranstalet.vue | 0 .../menus/menuDialog/viewDevice.vue | 0 .../menus/menuDialog/viewName.vue | 0 .../menus/menuDialog/viewTrainId.vue | 0 .../menus/menuLimit.vue | 0 .../menus/menuSection.vue | 0 .../menus/menuSignal.vue | 0 .../menus/menuStation.vue | 0 .../menus/menuStationControl.vue | 0 .../menus/menuStationStand.vue | 0 .../menus/menuSwitch.vue | 0 .../menus/menuTool.vue | 0 .../menus/menuTrain.vue | 0 .../menus/passiveDialog/alarm.vue | 0 .../menus/passiveDialog/control.vue | 0 .../menus/passiveDialog/timeout.vue | 0 .../menus/statusBar.vue | 0 .../menus/statusDownTrainDetail.vue | 0 .../menus/statusUpTrainDetail.vue | 0 .../menus/utils/menuItemStatus.js | 0 .../menusPlan/addTask.vue | 0 .../menusPlan/chooseTemplatePlan.vue | 0 .../menusPlan/components/dataTable.vue | 0 .../menusPlan/createTodayPlan.vue | 0 .../menusPlan/createWeekPlan.vue | 0 .../menusPlan/deleteTask.vue | 0 .../menusPlan/deleteTodayPlan.vue | 0 .../menusPlan/managePlanList.vue | 0 .../menusPlan/modifyingPlan.vue | 0 .../menusPlan/modifyingTask.vue | 0 .../{chengdou_03 => chengdu_03}/model.js | 0 .../planConvert.js | 0 .../planSchedule/index.vue | 190 ++- .../planSchedule/menuBar.vue | 0 .../planSchedule/menuTool.vue | 0 .../planSchedule/schedule.vue | 2 +- .../planSchedule/statusBar.vue | 0 .../planSchedule/titleBar.vue | 0 .../chengdu_04/menus/dialog/alxeEffective.vue | 381 ++++++ .../menus/dialog/cancelAllLimit.vue | 355 +++++ .../childDialog/childDialog/noticeInfo.vue | 77 ++ .../dialog/childDialog/confirmControl.vue | 360 +++++ .../childDialog/confirmControlSpeed.vue | 153 +++ .../childDialog/confirmSignalUnlock.vue} | 83 +- .../menus/dialog/childDialog/confirmTip.vue | 68 + .../menus/dialog/childDialog/confirmTrain.vue | 168 +++ .../menus/dialog/childDialog/password.vue} | 0 .../dialog/childDialog/passwordInputBox.vue | 206 +++ .../menus/dialog/childDialog/popupAlarm.vue | 90 ++ .../chengdu_04/menus/dialog/routeControl.vue | 363 +++++ .../chengdu_04/menus/dialog/routeDetail.vue | 140 ++ .../chengdu_04/menus/dialog/routeGuide.vue | 269 ++++ .../menus/dialog/routeSelection.vue | 256 ++++ .../menus/dialog/sectionCmdControl.vue | 435 ++++++ .../menus/dialog/sectionControl.vue | 215 +++ .../chengdu_04/menus/dialog/sectionDetail.vue | 115 ++ .../menus/dialog/speedCmdControl.vue | 783 +++++++++++ .../chengdu_04/menus/dialog/standControl.vue | 621 +++++++++ .../chengdu_04/menus/dialog/standDetail.vue | 211 +++ .../menus/dialog/stationCmdControl.vue | 389 ++++++ .../menus/dialog/switchCmdControl.vue | 459 +++++++ .../chengdu_04/menus/dialog/switchControl.vue | 416 ++++++ src/jmap/theme/chengdu_04/menus/index.vue | 360 +++++ src/jmap/theme/chengdu_04/menus/menuBar.vue | 1213 +++++++++++++++++ .../theme/chengdu_04/menus/menuCancel.vue | 151 ++ .../childDialog/twoConfirmation.vue | 127 ++ .../menus/menuDialog/childDialog/userAdd.vue | 162 +++ .../menuDialog/childDialog/userDelete.vue | 134 ++ .../menus/menuDialog/childDialog/userEdit.vue | 178 +++ .../chengdu_04/menus/menuDialog/helpAbout.vue | 131 ++ .../menus/menuDialog/limitSpeed.vue | 135 ++ .../menus/menuDialog/manageUser.vue | 290 ++++ .../menus/menuDialog/passwordBox.vue | 221 +++ .../menus/menuDialog/setLimitSpeed.vue | 275 ++++ .../menuDialog/stationControlConvert.vue | 414 ++++++ .../chengdu_04/menus/menuDialog/trainAdd.vue | 162 +++ .../menus/menuDialog/trainDelete.vue | 149 ++ .../menus/menuDialog/trainTranstalet.vue | 152 +++ .../menus/menuDialog/viewDevice.vue | 166 +++ .../chengdu_04/menus/menuDialog/viewName.vue | 248 ++++ .../menus/menuDialog/viewTrainId.vue | 183 +++ src/jmap/theme/chengdu_04/menus/menuLimit.vue | 118 ++ .../theme/chengdu_04/menus/menuSection.vue | 403 ++++++ .../theme/chengdu_04/menus/menuSignal.vue | 584 ++++++++ .../theme/chengdu_04/menus/menuStation.vue | 153 +++ .../chengdu_04/menus/menuStationControl.vue | 69 + .../chengdu_04/menus/menuStationStand.vue | 372 +++++ .../theme/chengdu_04/menus/menuSwitch.vue | 462 +++++++ src/jmap/theme/chengdu_04/menus/menuTool.vue | 205 +++ src/jmap/theme/chengdu_04/menus/menuTrain.vue | 39 + .../chengdu_04/menus/passiveDialog/alarm.vue | 214 +++ .../menus/passiveDialog/control.vue | 285 ++++ .../menus/passiveDialog/timeout.vue | 106 ++ src/jmap/theme/chengdu_04/menus/statusBar.vue | 31 + .../menus/statusDownTrainDetail.vue | 31 + .../chengdu_04/menus/statusUpTrainDetail.vue | 31 + .../menus/utils/menuItemStatus.js | 0 .../theme/chengdu_04/menusPlan/addTask.vue | 163 +++ .../menusPlan/chooseTemplatePlan.vue | 119 ++ .../menusPlan/components/dataTable.vue | 203 +++ .../chengdu_04/menusPlan/createTodayPlan.vue | 153 +++ .../chengdu_04/menusPlan/createWeekPlan.vue | 127 ++ .../theme/chengdu_04/menusPlan/deleteTask.vue | 64 + .../chengdu_04/menusPlan/deleteTodayPlan.vue | 53 + .../chengdu_04/menusPlan/managePlanList.vue | 124 ++ .../chengdu_04/menusPlan/modifyingPlan.vue | 179 +++ .../chengdu_04/menusPlan/modifyingTask.vue | 315 +++++ .../theme/{default => chengdu_04}/model.js | 0 src/jmap/theme/chengdu_04/planConvert.js | 309 +++++ .../theme/chengdu_04/planSchedule/index.vue | 407 ++++++ .../theme/chengdu_04/planSchedule/menuBar.vue | 519 +++++++ .../chengdu_04/planSchedule/menuTool.vue | 172 +++ .../chengdu_04/planSchedule/schedule.vue | 500 +++++++ .../chengdu_04/planSchedule/statusBar.vue | 100 ++ .../chengdu_04/planSchedule/titleBar.vue | 75 + .../default/menus/dialog/routecancel.vue | 114 -- .../default/menus/dialog/routerelieve.vue | 91 -- .../default/menus/dialog/routesetting.vue | 171 --- .../default/menus/dialog/sectioncontrol.vue | 145 -- .../default/menus/dialog/sectionfault.vue | 237 ---- .../menus/dialog/standearlydeparture.vue | 137 -- .../default/menus/dialog/standjumpstop.vue | 242 ---- .../default/menus/dialog/switchcontrol.vue | 151 -- .../default/menus/dialog/traincreate.vue | 135 -- src/jmap/theme/default/menus/index.vue | 251 ---- src/jmap/theme/default/menus/menuButton.vue | 305 ----- src/jmap/theme/default/menus/menuCancel.vue | 119 -- src/jmap/theme/default/menus/menuSection.vue | 357 ----- src/jmap/theme/default/menus/menuSignal.vue | 351 ----- .../default/menus/menuStationControl.vue | 206 --- .../theme/default/menus/menuStationStand.vue | 277 ---- src/jmap/theme/default/menus/menuSwitch.vue | 277 ---- src/jmap/theme/default/menus/menuTrain.vue | 201 --- src/jmap/theme/factory.js | 6 +- src/main.js | 1 - src/router/index.js | 16 +- .../map/mapdraft/mapedit/mapoperate/link.vue | 4 +- src/views/map/runplan/chart.vue | 709 +++++----- src/views/map/runplan/manage/check.vue | 111 +- src/views/map/runplan/manage/create.vue | 14 +- src/views/map/runplan/manage/import.vue | 3 +- src/views/map/runplan/manage/list.vue | 223 +-- src/views/map/runplan/manage/operateMenu.vue | 4 +- src/views/map/runplan/manage/publish.vue | 146 +- 198 files changed, 19693 insertions(+), 5351 deletions(-) delete mode 100644 src/jmap/theme/chengdou_03/menus/dialog/trainControl.vue rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/alxeEffective.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/cancelAllLimit.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/childDialog/noticeInfo.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/confirmControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/confirmControlSpeed.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/confirmSignalUnlock.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/confirmTip.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/confirmTrain.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/password.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/passwordInputBox.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/childDialog/popupAlarm.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/routeControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/routeDetail.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/routeGuide.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/routeSelection.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/sectionCmdControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/sectionControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/sectionDetail.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/speedCmdControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/standControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/standDetail.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/stationCmdControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/switchCmdControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/switchControl.vue (100%) create mode 100644 src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainCreate.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainCreateNumber.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainDelete.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainDeleteNumber.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainDetailInfo.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainEditNumber.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainMove.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainMoveNumber.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/dialog/trainSwitch.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/index.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuBar.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuCancel.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/childDialog/twoConfirmation.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/childDialog/userAdd.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/childDialog/userDelete.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/childDialog/userEdit.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/helpAbout.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/limitSpeed.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/manageUser.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/passwordBox.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/setLimitSpeed.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/stationControlConvert.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/trainAdd.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/trainDelete.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/trainTranstalet.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/viewDevice.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/viewName.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuDialog/viewTrainId.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuLimit.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuSection.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuSignal.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuStation.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuStationControl.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuStationStand.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuSwitch.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuTool.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/menuTrain.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/passiveDialog/alarm.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/passiveDialog/control.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/passiveDialog/timeout.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/statusBar.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/statusDownTrainDetail.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/statusUpTrainDetail.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menus/utils/menuItemStatus.js (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/addTask.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/chooseTemplatePlan.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/components/dataTable.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/createTodayPlan.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/createWeekPlan.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/deleteTask.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/deleteTodayPlan.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/managePlanList.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/modifyingPlan.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/menusPlan/modifyingTask.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/model.js (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/planConvert.js (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/planSchedule/index.vue (70%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/planSchedule/menuBar.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/planSchedule/menuTool.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/planSchedule/schedule.vue (99%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/planSchedule/statusBar.vue (100%) rename src/jmap/theme/{chengdou_03 => chengdu_03}/planSchedule/titleBar.vue (100%) create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/alxeEffective.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/cancelAllLimit.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/childDialog/childDialog/noticeInfo.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControlSpeed.vue rename src/jmap/theme/{default/menus/dialog/signalreopen.vue => chengdu_04/menus/dialog/childDialog/confirmSignalUnlock.vue} (54%) create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTip.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTrain.vue rename src/jmap/theme/{default/menus/menuStation.vue => chengdu_04/menus/dialog/childDialog/password.vue} (100%) create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/childDialog/passwordInputBox.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/childDialog/popupAlarm.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/routeControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/routeDetail.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/routeGuide.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/sectionCmdControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/sectionControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/sectionDetail.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/speedCmdControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/standControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/stationCmdControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/switchCmdControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/dialog/switchControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/index.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuBar.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuCancel.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userAdd.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userEdit.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/helpAbout.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/limitSpeed.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/manageUser.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/passwordBox.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/setLimitSpeed.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/stationControlConvert.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/trainAdd.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/trainDelete.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/trainTranstalet.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/viewDevice.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/viewName.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuDialog/viewTrainId.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuLimit.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuSection.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuSignal.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuStation.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuStationControl.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuStationStand.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuSwitch.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuTool.vue create mode 100644 src/jmap/theme/chengdu_04/menus/menuTrain.vue create mode 100644 src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue create mode 100644 src/jmap/theme/chengdu_04/menus/passiveDialog/control.vue create mode 100644 src/jmap/theme/chengdu_04/menus/passiveDialog/timeout.vue create mode 100644 src/jmap/theme/chengdu_04/menus/statusBar.vue create mode 100644 src/jmap/theme/chengdu_04/menus/statusDownTrainDetail.vue create mode 100644 src/jmap/theme/chengdu_04/menus/statusUpTrainDetail.vue rename src/jmap/theme/{default => chengdu_04}/menus/utils/menuItemStatus.js (100%) create mode 100644 src/jmap/theme/chengdu_04/menusPlan/addTask.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/components/dataTable.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue create mode 100644 src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue rename src/jmap/theme/{default => chengdu_04}/model.js (100%) create mode 100644 src/jmap/theme/chengdu_04/planConvert.js create mode 100644 src/jmap/theme/chengdu_04/planSchedule/index.vue create mode 100644 src/jmap/theme/chengdu_04/planSchedule/menuBar.vue create mode 100644 src/jmap/theme/chengdu_04/planSchedule/menuTool.vue create mode 100644 src/jmap/theme/chengdu_04/planSchedule/schedule.vue create mode 100644 src/jmap/theme/chengdu_04/planSchedule/statusBar.vue create mode 100644 src/jmap/theme/chengdu_04/planSchedule/titleBar.vue delete mode 100644 src/jmap/theme/default/menus/dialog/routecancel.vue delete mode 100644 src/jmap/theme/default/menus/dialog/routerelieve.vue delete mode 100644 src/jmap/theme/default/menus/dialog/routesetting.vue delete mode 100644 src/jmap/theme/default/menus/dialog/sectioncontrol.vue delete mode 100644 src/jmap/theme/default/menus/dialog/sectionfault.vue delete mode 100644 src/jmap/theme/default/menus/dialog/standearlydeparture.vue delete mode 100644 src/jmap/theme/default/menus/dialog/standjumpstop.vue delete mode 100644 src/jmap/theme/default/menus/dialog/switchcontrol.vue delete mode 100644 src/jmap/theme/default/menus/dialog/traincreate.vue delete mode 100644 src/jmap/theme/default/menus/index.vue delete mode 100644 src/jmap/theme/default/menus/menuButton.vue delete mode 100644 src/jmap/theme/default/menus/menuCancel.vue delete mode 100644 src/jmap/theme/default/menus/menuSection.vue delete mode 100644 src/jmap/theme/default/menus/menuSignal.vue delete mode 100644 src/jmap/theme/default/menus/menuStationControl.vue delete mode 100644 src/jmap/theme/default/menus/menuStationStand.vue delete mode 100644 src/jmap/theme/default/menus/menuSwitch.vue delete mode 100644 src/jmap/theme/default/menus/menuTrain.vue diff --git a/src/jmap/config/deviceStyle.js b/src/jmap/config/deviceStyle.js index 068b1de61..bc429b5db 100644 --- a/src/jmap/config/deviceStyle.js +++ b/src/jmap/config/deviceStyle.js @@ -1,8 +1,8 @@ const mapDeviceStyle = { '01': 'chengdu_04', '02': 'fuzhou_01', - // '03': 'bejing_01', - '03': 'chengdu_03', + '03': 'bejing_01', + '04': 'chengdu_03', '05': 'batong_01' // 暂时没有画北京八通线 }; diff --git a/src/jmap/config/skinStyle/chengdu_04.js b/src/jmap/config/skinStyle/chengdu_04.js index 3b2709cb0..bb62da1b5 100644 --- a/src/jmap/config/skinStyle/chengdu_04.js +++ b/src/jmap/config/skinStyle/chengdu_04.js @@ -6,8 +6,8 @@ class SkinStyle extends defaultStyle { super(); this[deviceType.Link] = { lineWidthColor: '#FFFFFF', // line 颜色 - linkWidth: 4.4, // link 宽度 - linkColor: '#3F3F3F', // link 线条颜色 + linkWidth: 4, // link 宽度 + linkColor: '#4e8de6', // link 线条颜色 linkTextColor: '#FFFFFF' // link 字体颜色 }; @@ -17,12 +17,12 @@ class SkinStyle extends defaultStyle { distance: 10, // 文字离区段距离 fontSize: 12, // 字体大小 fontWeight: 'normal', // 字体粗细 - fontColor: '#FFFFFF', // 字体颜色 + fontColor: 'lightgreen', // 字体颜色 textAlign: 'center', // 水平对齐方式 textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 }, - logicText: { + logicText: { // 逻辑区段名称 position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 12, // 文字离区段距离 fontSize: 11, // 字体大小 @@ -32,7 +32,7 @@ class SkinStyle extends defaultStyle { textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 }, - standText: { + standText: { // 站台 position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 24, // 文字离区段距离 fontSize: 11, // 字体大小 @@ -42,7 +42,7 @@ class SkinStyle extends defaultStyle { textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 }, - reentryText: { + reentryText: { // 折返 position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 36, // 文字离区段距离 fontSize: 11, // 字体大小 @@ -52,7 +52,7 @@ class SkinStyle extends defaultStyle { textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 }, - transferText: { + transferText: { // 转换轨 position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 36, // 文字离区段距离 fontSize: 11, // 字体大小 @@ -62,7 +62,7 @@ class SkinStyle extends defaultStyle { textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 }, - destinationText: { + destinationText: { // 目的地 opposite: true, // 对称相反 position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 distance: 12, // 文字离区段距离 @@ -78,25 +78,25 @@ class SkinStyle extends defaultStyle { beyondWidth: 0, // 区段宽超出宽度 invadeColor: '#FFFFFF', // 区段侵入颜色 spareColor: '#5578B6', // 区段空闲颜色 - communicationOccupiedColor: '#FF00FF', // 区段通信车占用颜色 - unCommunicationOccupiedColor: '#DE310C', // 区段非通讯车占用颜色 - routeLockColor: '#FFFFFF', // 区段路由锁定颜色 - faultLockColor: '#006400', // 区段故障锁定颜色 + communicationOccupiedColor: 'lightpink', // 区段通信车占用颜色 + unCommunicationOccupiedColor: 'red', // 区段非通讯车占用颜色 + routeLockColor: 'rgba(0, 255, 0, 1)', // 区段路由锁定颜色 + faultLockColor: 'white', // 区段故障锁定颜色 undefinedColor: '#0071C1', // 区段未定义颜色 protectionLockedColor: '#FFFFFF', // 保护区段锁闭 - blockColor: '#00FF00', // 区段封锁颜色 + blockColor: 'pink', // 区段封锁颜色 atcExcisionColor: '#A0522D', // 区段atc切除颜色 atsExcisionColor: '#A0522D', // 区段ats切除颜色 timeReleaseColor: '#3F3F3F', // 区段延时释放颜色 - protectiveLockColor: '#FFFF00', // 区段保护锁闭 + protectiveLockColor: '#92D14F', // 区段保护锁闭 protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁 logicalColor: '#FFFF00', // 逻辑区段颜色 (未用) - logicalTextColor: '#C0C0C0' // 逻辑区段名称颜色 (未用) + logicalTextColor: 'white' // 逻辑区段名称颜色 (未用) }, axle: { radius: 3, // 计轴 半径 distance: 5, // 计轴和区段之间的距离 （未用） - color: '#C0C0C0', // 区段计轴颜色 + color: 'white', // 区段计轴颜色 resetColor: '#00FFFF', // 区段计轴预复位颜色 Failure: '#E6A23C' // #FFFF00 计轴失效 }, @@ -118,17 +118,14 @@ class SkinStyle extends defaultStyle { width: 1.5, // 分隔符宽度 endWidth: 1.5, // 尽头分隔符宽度 endColor: '#FFFFFF', // 尽头分隔符颜色 - color: '#FFFFFF' // 区段边界符颜色 - }, - shuttleBack: { // 折返进路 (存在此对象 显示折返箭头) - distance: 5 // 限速线距离区段距离 + color: 'white' // 区段边界符颜色 } }; this[deviceType.Signal] = { - distance: 10, // 设备距离区段的距离 + distance: 3, // 设备距离区段的距离 post: { - standardColor: '#FFFFFF', // 灯柱颜色 + standardColor: '#C0C0C0', // 灯柱颜色 standardWidth: 2 // 灯柱宽度 }, text: { @@ -137,7 +134,7 @@ class SkinStyle extends defaultStyle { isAlignCenter: false, // 信号字体对其方式 fontSize: 11, // 信号机名称字体大小 fontWeight: 'bold', // 信号机名称字体粗细 - defaultColor: '#FFFFFF', // 信号灯字体默认色 + defaultColor: 'white', // 信号灯字体默认色 blockColor: '#EF0C08', // 信号灯字体锁定颜色 checkColor: '#00FF00' // 信号保护区段检查颜色 }, @@ -146,12 +143,12 @@ class SkinStyle extends defaultStyle { stopWidth: 2, // 禁止线宽度 borderWidth: 2, // 信号灯边框线宽度 borderColor: '#3149C3', // 信号灯边框线颜色 - radiusR: 6, // 信号灯半径 + radiusR: 3, // 信号灯半径 blockColor: '#EF0C08', // 信号灯锁闭 - grayColor: '#7F7F7F', // 信号灯灰色 - redColor: '#FF0000', // 信号灯红色 - greenColor: '#00FF00', // 信号灯绿色 - yellowColor: '#FFFF00', // 信号灯黄色 + grayColor: '#C0C0C0', // 信号灯灰色 + redColor: 'red', // 信号灯红色 + greenColor: 'green', // 信号灯绿色 + yellowColor: 'yellow', // 信号灯黄色 whiteColor: '#FFFFFF', // 信号灯白色 blueColor: '#0070C0' // 信号灯蓝色 }, @@ -181,7 +178,7 @@ class SkinStyle extends defaultStyle { distance: 5, // 信号灯按钮距离区段的距离 borderDashColor: '#FFFFFF', // 信号灯按钮边线 buttonColor: 'darkgreen', // 信号灯按钮颜色 - buttonLightenColor: '#E4EF50' // 信号灯按钮闪烁颜色 + buttonLightenColor: 'yellow' // 信号灯按钮闪烁颜色 } }; @@ -192,21 +189,21 @@ class SkinStyle extends defaultStyle { }, safetyDoor: { // 屏蔽门 height: 3, // 站台屏蔽门高度 - distance: 8, // 站台和屏蔽门之间的距离 - defaultColor: '#00FF00', // 屏蔽门默认颜色 - splitDoorColor: '#C00808' // 屏蔽门切除颜色 + distance: 4, // 站台和屏蔽门之间的距离 + defaultColor: 'green', // 屏蔽门默认颜色 + splitDoorColor: 'green' // 屏蔽门切除颜色 }, stand: { // 站台 headFontSize: 10, // 站台首端字体大小 - spareColor: '#808080', // 站台空闲颜色 - stopColor: '#FFF000', // 站台列车停站颜色 - jumpStopColor: '#808080', // 站台跳停颜色 - designatedJumpStopColor: '#808080' // 站台指定列车跳停颜色 + spareColor: 'white', // 站台空闲颜色 + stopColor: 'yellow', // 站台列车停站颜色 + jumpStopColor: 'blue', // 站台跳停颜色 + designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色 }, standEmergent: { // 紧急关闭 mergentR: 4, // 站台紧急关闭半径 offset: {x: 0, y: 40}, // 站台紧急关闭偏移量 - closeColor: '#F61107' // 站台紧急关闭颜色 + closeColor: 'red' // 站台紧急关闭颜色 }, reentry: { // 站台折返策略 position: 0, // 折返方向 @@ -218,15 +215,15 @@ class SkinStyle extends defaultStyle { text: '扣', // 扣车显示内容 position: -1, // 扣车方向 offset: {x: -8, y: -20}, // 扣车偏移量 - trainColor: '#FFFF00', // 车站扣车颜色 - centerTrainColor: '#C0C0C0', // 中心扣车颜色 - andCenterTrainColor: '#C0C0C0', // 车站+中心扣车颜色 + trainColor: 'yellow', // 车站扣车颜色 + centerTrainColor: 'white', // 中心扣车颜色 + andCenterTrainColor: 'red', // 车站+中心扣车颜色 detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色 }, stopTime: { // 停站时间 position: 1, // 运行时间方向 offset: {x: -8, y: -4}, // 运行时间偏移量 - textColor: '#C0C0C0' // 停站时间字体颜色 + textColor: 'white' // 停站时间字体颜色 }, jump: { text: '跳', // 停跳显示内容 @@ -247,7 +244,7 @@ class SkinStyle extends defaultStyle { this[deviceType.StationControl] = { text: { distance: 2, // 灯和文字之间的距离 - fontSize: 11, // 字体大小 + fontSize: 12, // 字体大小 fontFormat: 'consolas', // 字体格式 fontColor: '#ffffff', // 字体颜色 fontWeight: 'normal', // 字体粗细 @@ -257,15 +254,15 @@ class SkinStyle extends defaultStyle { lamp: { count: 4, // 控制模式的个数 offset: {x: 0, y: 0}, // 偏移量 - radiusR: 6, // 控制模式灯的半径 + radiusR: 4, // 控制模式灯的半径 distance: 36, // 控制模式之间灯之间的距离 - grayColor: '#7F7F7F', // 控制模式灰色 - greenColor: '#00FF00', // 控制模式绿色 - redColor: '#FF0000', // 控制模式红色 - yellowColor: '#FFFF00' // 控制模式黄色 + grayColor: '#C0C0C0', // 控制模式灰色 + greenColor: 'green', // 控制模式绿色 + redColor: 'red', // 控制模式红色 + yellowColor: 'yellow' // 控制模式黄色 }, arrow: { - show: true // 控制模式箭头显隐 + show: false // 控制模式箭头显隐 } }; @@ -291,30 +288,30 @@ class SkinStyle extends defaultStyle { this[deviceType.Switch] = { text: { - position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 - offset: {x: 5, y: -10}, // 道岔名称与区段距离 + position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 + offset: {x: 5, y: -10}, // 道岔名称与区段距离 fontSize: 11, // 字体大小 fontWeight: 'normal', // 字体粗细 borderColor: '#FE0000', // 道岔边框颜色 - lossColor: '#C00808', // 道岔失去颜色 - locateColor: '#00FF00', // 道岔定位颜色 - inversionColor: '#FFFF00', // 道岔反位颜色 + lossColor: 'lightgreen', // 道岔失去颜色 + locateColor: 'lightgreen', // 道岔定位颜色 + inversionColor: 'lightgreen', // 道岔反位颜色 monolockColor: '#FFFFFF' // 道岔单锁颜色 }, core: { - length: 6 // 道岔单边长度 + length: 10 // 道岔单边长度 }, monolock: { // 道岔单锁配置 locationColor: '#00FF00', // 道岔单锁'定位'颜色 (绿色) inversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色) rectShow: true, // 道岔单锁 矩形框是否显示 - rectWidth: 18, // 矩形框 宽高 - rectBorderColor: '#fff' // 矩形边框颜色 + rectWidth: 18, // 矩形框 宽高 + rectBorderColor: '#fff' // 矩形边框颜色 }, - block: { // 道岔封锁配置 - nameBorderShow: false, // 道岔名称是否有包围框 显示 - contentRectShow: true, // 道岔封锁显示 - contentRectColor: 'red' // 道岔封锁边框颜色 + block: { // 道岔封锁配置 + nameBorderShow: false, // 道岔名称是否有包围框 显示 + contentRectShow: true, // 道岔封锁显示 + contentRectColor: 'red' // 道岔封锁边框颜色 } }; @@ -392,7 +389,7 @@ class SkinStyle extends defaultStyle { hsda: { lrPaddingHSDA: 3, // HSDA两边间隔 upPaddingHSDA: 4, // HSDA上边距离 - trainHSDATextFontSize: 9, // 列车HDSA字号 + trainHSDATextFontSize: 8, // 列车HDSA字号 textHContent: '扣', // textH文本 textSContent: '跳', // textS文本 textDContent: '门', // textD文本 @@ -420,19 +417,19 @@ class SkinStyle extends defaultStyle { trainTargetNumberOffset: {x: 0, y: 0}// 车组号偏移量 }, trainHead: { - trainMoreLength: 0, // 列车车头比车身高出的长度,上下相比车体伸出去的边框 + trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框 trainHeadTriangleFirst: { x: 7, y: 1}, // 列车车头三角坐标1偏移量 trainHeadTriangleSecond: { x: 13, y: 10}, // 列车车头三角坐标2偏移量 trainHeadTriangleThird: { x: 7, y: 19}, // 列车车头三角坐标3偏移量 - trainConntWidth: 3, // 列车竖杠的宽度 + trainConntWidth: 4, // 列车竖杠的宽度 trainHeadFillColor: '#000000', // 列车车头矩形填充颜色 trainHeadRectHeight: 20 // 列车车头矩形高度 }, common: { trainHeight: 20, // 列车高度 - trainHeadDistance: 4, // 列车和车头之间的间距 - trainWidth: 48, // 列车长度 - trainTextFontSize: 12, // 列车字号 + trainHeadDistance: 2, // 列车和车头之间的间距 + trainWidth: 55, // 列车长度 + trainTextFontSize: 16, // 列车字号 fontFamily: 'consolas', // 默认字体 族类 haveTextHSDA: true, // 是否需创建textHSDA对象 haveArrowText: true, // 是否需创建arrowText对象 diff --git a/src/jmap/shape/Train/TrainBody/EMouse.js b/src/jmap/shape/Train/TrainBody/EMouse.js index 1279457ad..190727be6 100644 --- a/src/jmap/shape/Train/TrainBody/EMouse.js +++ b/src/jmap/shape/Train/TrainBody/EMouse.js @@ -20,7 +20,7 @@ class EMouse extends Group { // 文字描述 this.arrowText = new Text({ zlevel: this.device.model.zlevel, - z: this.device.model.z, + z: this.device.model.z + 10, style: { x: this.device.model.point.x + 50, y: this.device.model.point.y + 25, diff --git a/src/jmap/theme/beijing_01/planSchedule/schedule.vue b/src/jmap/theme/beijing_01/planSchedule/schedule.vue index 443a57bff..4c80e8471 100644 --- a/src/jmap/theme/beijing_01/planSchedule/schedule.vue +++ b/src/jmap/theme/beijing_01/planSchedule/schedule.vue @@ -1,471 +1,481 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainControl.vue b/src/jmap/theme/chengdou_03/menus/dialog/trainControl.vue deleted file mode 100644 index b99a7c642..000000000 --- a/src/jmap/theme/chengdou_03/menus/dialog/trainControl.vue +++ /dev/null @@ -1,326 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdou_03/menus/dialog/alxeEffective.vue b/src/jmap/theme/chengdu_03/menus/dialog/alxeEffective.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/alxeEffective.vue rename to src/jmap/theme/chengdu_03/menus/dialog/alxeEffective.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/cancelAllLimit.vue b/src/jmap/theme/chengdu_03/menus/dialog/cancelAllLimit.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/cancelAllLimit.vue rename to src/jmap/theme/chengdu_03/menus/dialog/cancelAllLimit.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/childDialog/noticeInfo.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmControlSpeed.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmSignalUnlock.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmTip.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmTip.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmTrain.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/confirmTrain.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/password.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/password.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/password.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/password.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/passwordInputBox.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/passwordInputBox.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/childDialog/popupAlarm.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/childDialog/popupAlarm.vue rename to src/jmap/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/routeControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/routeControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/routeDetail.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/routeDetail.vue rename to src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/routeGuide.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/routeGuide.vue rename to src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/routeSelection.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/routeSelection.vue rename to src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/sectionCmdControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionCmdControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/sectionCmdControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/sectionCmdControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/sectionControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/sectionControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/sectionDetail.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionDetail.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/sectionDetail.vue rename to src/jmap/theme/chengdu_03/menus/dialog/sectionDetail.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/speedCmdControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/speedCmdControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/speedCmdControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/speedCmdControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/standControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/standControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/standControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/standControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/standDetail.vue b/src/jmap/theme/chengdu_03/menus/dialog/standDetail.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/standDetail.vue rename to src/jmap/theme/chengdu_03/menus/dialog/standDetail.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/stationCmdControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/stationCmdControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/stationCmdControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/stationCmdControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/switchCmdControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/switchCmdControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/switchCmdControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/switchCmdControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/switchControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/switchControl.vue rename to src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue new file mode 100644 index 000000000..6a5a0cfaa --- /dev/null +++ b/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue @@ -0,0 +1,342 @@ + + + + diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainCreate.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainCreate.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainCreateNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainCreateNumber.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainDelete.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainDelete.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainDeleteNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainDeleteNumber.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainDetailInfo.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainDetailInfo.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainEditNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainEditNumber.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainMove.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainMove.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainMove.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainMove.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainMoveNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainMoveNumber.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue diff --git a/src/jmap/theme/chengdou_03/menus/dialog/trainSwitch.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainSwitch.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/dialog/trainSwitch.vue rename to src/jmap/theme/chengdu_03/menus/dialog/trainSwitch.vue diff --git a/src/jmap/theme/chengdou_03/menus/index.vue b/src/jmap/theme/chengdu_03/menus/index.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/index.vue rename to src/jmap/theme/chengdu_03/menus/index.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuBar.vue b/src/jmap/theme/chengdu_03/menus/menuBar.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuBar.vue rename to src/jmap/theme/chengdu_03/menus/menuBar.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuCancel.vue b/src/jmap/theme/chengdu_03/menus/menuCancel.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuCancel.vue rename to src/jmap/theme/chengdu_03/menus/menuCancel.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/childDialog/twoConfirmation.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/childDialog/userAdd.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/childDialog/userAdd.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/childDialog/userDelete.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/childDialog/userDelete.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/childDialog/userEdit.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/helpAbout.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/helpAbout.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/helpAbout.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/helpAbout.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/limitSpeed.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/limitSpeed.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/limitSpeed.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/limitSpeed.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/manageUser.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/manageUser.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/manageUser.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/manageUser.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/passwordBox.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/passwordBox.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/passwordBox.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/passwordBox.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/setLimitSpeed.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/setLimitSpeed.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/stationControlConvert.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/stationControlConvert.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/trainAdd.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/trainAdd.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/trainAdd.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/trainAdd.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/trainDelete.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/trainDelete.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/trainDelete.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/trainDelete.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/trainTranstalet.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/trainTranstalet.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/viewDevice.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewDevice.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/viewDevice.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/viewDevice.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/viewName.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/viewName.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuDialog/viewTrainId.vue rename to src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuLimit.vue b/src/jmap/theme/chengdu_03/menus/menuLimit.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuLimit.vue rename to src/jmap/theme/chengdu_03/menus/menuLimit.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuSection.vue b/src/jmap/theme/chengdu_03/menus/menuSection.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuSection.vue rename to src/jmap/theme/chengdu_03/menus/menuSection.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuSignal.vue b/src/jmap/theme/chengdu_03/menus/menuSignal.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuSignal.vue rename to src/jmap/theme/chengdu_03/menus/menuSignal.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuStation.vue b/src/jmap/theme/chengdu_03/menus/menuStation.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuStation.vue rename to src/jmap/theme/chengdu_03/menus/menuStation.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuStationControl.vue b/src/jmap/theme/chengdu_03/menus/menuStationControl.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuStationControl.vue rename to src/jmap/theme/chengdu_03/menus/menuStationControl.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuStationStand.vue b/src/jmap/theme/chengdu_03/menus/menuStationStand.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuStationStand.vue rename to src/jmap/theme/chengdu_03/menus/menuStationStand.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuSwitch.vue b/src/jmap/theme/chengdu_03/menus/menuSwitch.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuSwitch.vue rename to src/jmap/theme/chengdu_03/menus/menuSwitch.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuTool.vue b/src/jmap/theme/chengdu_03/menus/menuTool.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuTool.vue rename to src/jmap/theme/chengdu_03/menus/menuTool.vue diff --git a/src/jmap/theme/chengdou_03/menus/menuTrain.vue b/src/jmap/theme/chengdu_03/menus/menuTrain.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/menuTrain.vue rename to src/jmap/theme/chengdu_03/menus/menuTrain.vue diff --git a/src/jmap/theme/chengdou_03/menus/passiveDialog/alarm.vue b/src/jmap/theme/chengdu_03/menus/passiveDialog/alarm.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/passiveDialog/alarm.vue rename to src/jmap/theme/chengdu_03/menus/passiveDialog/alarm.vue diff --git a/src/jmap/theme/chengdou_03/menus/passiveDialog/control.vue b/src/jmap/theme/chengdu_03/menus/passiveDialog/control.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/passiveDialog/control.vue rename to src/jmap/theme/chengdu_03/menus/passiveDialog/control.vue diff --git a/src/jmap/theme/chengdou_03/menus/passiveDialog/timeout.vue b/src/jmap/theme/chengdu_03/menus/passiveDialog/timeout.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/passiveDialog/timeout.vue rename to src/jmap/theme/chengdu_03/menus/passiveDialog/timeout.vue diff --git a/src/jmap/theme/chengdou_03/menus/statusBar.vue b/src/jmap/theme/chengdu_03/menus/statusBar.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/statusBar.vue rename to src/jmap/theme/chengdu_03/menus/statusBar.vue diff --git a/src/jmap/theme/chengdou_03/menus/statusDownTrainDetail.vue b/src/jmap/theme/chengdu_03/menus/statusDownTrainDetail.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/statusDownTrainDetail.vue rename to src/jmap/theme/chengdu_03/menus/statusDownTrainDetail.vue diff --git a/src/jmap/theme/chengdou_03/menus/statusUpTrainDetail.vue b/src/jmap/theme/chengdu_03/menus/statusUpTrainDetail.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menus/statusUpTrainDetail.vue rename to src/jmap/theme/chengdu_03/menus/statusUpTrainDetail.vue diff --git a/src/jmap/theme/chengdou_03/menus/utils/menuItemStatus.js b/src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js similarity index 100% rename from src/jmap/theme/chengdou_03/menus/utils/menuItemStatus.js rename to src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js diff --git a/src/jmap/theme/chengdou_03/menusPlan/addTask.vue b/src/jmap/theme/chengdu_03/menusPlan/addTask.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/addTask.vue rename to src/jmap/theme/chengdu_03/menusPlan/addTask.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/chooseTemplatePlan.vue rename to src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/components/dataTable.vue b/src/jmap/theme/chengdu_03/menusPlan/components/dataTable.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/components/dataTable.vue rename to src/jmap/theme/chengdu_03/menusPlan/components/dataTable.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/createTodayPlan.vue rename to src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/createWeekPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/createWeekPlan.vue rename to src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/deleteTask.vue b/src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/deleteTask.vue rename to src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/deleteTodayPlan.vue rename to src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/managePlanList.vue b/src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/managePlanList.vue rename to src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/modifyingPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/modifyingPlan.vue rename to src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue diff --git a/src/jmap/theme/chengdou_03/menusPlan/modifyingTask.vue b/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue similarity index 100% rename from src/jmap/theme/chengdou_03/menusPlan/modifyingTask.vue rename to src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue diff --git a/src/jmap/theme/chengdou_03/model.js b/src/jmap/theme/chengdu_03/model.js similarity index 100% rename from src/jmap/theme/chengdou_03/model.js rename to src/jmap/theme/chengdu_03/model.js diff --git a/src/jmap/theme/chengdou_03/planConvert.js b/src/jmap/theme/chengdu_03/planConvert.js similarity index 100% rename from src/jmap/theme/chengdou_03/planConvert.js rename to src/jmap/theme/chengdu_03/planConvert.js diff --git a/src/jmap/theme/chengdou_03/planSchedule/index.vue b/src/jmap/theme/chengdu_03/planSchedule/index.vue similarity index 70% rename from src/jmap/theme/chengdou_03/planSchedule/index.vue rename to src/jmap/theme/chengdu_03/planSchedule/index.vue index 31c94ac96..be031cdc6 100644 --- a/src/jmap/theme/chengdou_03/planSchedule/index.vue +++ b/src/jmap/theme/chengdu_03/planSchedule/index.vue @@ -1,102 +1,102 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdou_03/planSchedule/menuBar.vue b/src/jmap/theme/chengdu_03/planSchedule/menuBar.vue similarity index 100% rename from src/jmap/theme/chengdou_03/planSchedule/menuBar.vue rename to src/jmap/theme/chengdu_03/planSchedule/menuBar.vue diff --git a/src/jmap/theme/chengdou_03/planSchedule/menuTool.vue b/src/jmap/theme/chengdu_03/planSchedule/menuTool.vue similarity index 100% rename from src/jmap/theme/chengdou_03/planSchedule/menuTool.vue rename to src/jmap/theme/chengdu_03/planSchedule/menuTool.vue diff --git a/src/jmap/theme/chengdou_03/planSchedule/schedule.vue b/src/jmap/theme/chengdu_03/planSchedule/schedule.vue similarity index 99% rename from src/jmap/theme/chengdou_03/planSchedule/schedule.vue rename to src/jmap/theme/chengdu_03/planSchedule/schedule.vue index e575987ac..443a57bff 100644 --- a/src/jmap/theme/chengdou_03/planSchedule/schedule.vue +++ b/src/jmap/theme/chengdu_03/planSchedule/schedule.vue @@ -228,7 +228,7 @@ ]) }, mounted() { - this.PlanConvert = this.$theme().loadPlanConvert(this.skinStyle); + this.PlanConvert = this.$theme.loadPlanConvert(this.skinStyle); }, beforeDestroy() { this.destroy(); diff --git a/src/jmap/theme/chengdou_03/planSchedule/statusBar.vue b/src/jmap/theme/chengdu_03/planSchedule/statusBar.vue similarity index 100% rename from src/jmap/theme/chengdou_03/planSchedule/statusBar.vue rename to src/jmap/theme/chengdu_03/planSchedule/statusBar.vue diff --git a/src/jmap/theme/chengdou_03/planSchedule/titleBar.vue b/src/jmap/theme/chengdu_03/planSchedule/titleBar.vue similarity index 100% rename from src/jmap/theme/chengdou_03/planSchedule/titleBar.vue rename to src/jmap/theme/chengdu_03/planSchedule/titleBar.vue diff --git a/src/jmap/theme/chengdu_04/menus/dialog/alxeEffective.vue b/src/jmap/theme/chengdu_04/menus/dialog/alxeEffective.vue new file mode 100644 index 000000000..37b8fda24 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/alxeEffective.vue @@ -0,0 +1,381 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/cancelAllLimit.vue b/src/jmap/theme/chengdu_04/menus/dialog/cancelAllLimit.vue new file mode 100644 index 000000000..15fbc4750 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/cancelAllLimit.vue @@ -0,0 +1,355 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/childDialog/noticeInfo.vue new file mode 100644 index 000000000..85c64832c --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/childDialog/noticeInfo.vue @@ -0,0 +1,77 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControl.vue new file mode 100644 index 000000000..bbb3a2587 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControl.vue @@ -0,0 +1,360 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControlSpeed.vue new file mode 100644 index 000000000..31d4587e0 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControlSpeed.vue @@ -0,0 +1,153 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/signalreopen.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmSignalUnlock.vue similarity index 54% rename from src/jmap/theme/default/menus/dialog/signalreopen.vue rename to src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmSignalUnlock.vue index 8892e3f8a..c6f069ffe 100644 --- a/src/jmap/theme/default/menus/dialog/signalreopen.vue +++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmSignalUnlock.vue @@ -1,25 +1,14 @@ - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTip.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTip.vue new file mode 100644 index 000000000..6917c9a94 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTip.vue @@ -0,0 +1,68 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTrain.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTrain.vue new file mode 100644 index 000000000..ccfcf9036 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTrain.vue @@ -0,0 +1,168 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuStation.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/password.vue similarity index 100% rename from src/jmap/theme/default/menus/menuStation.vue rename to src/jmap/theme/chengdu_04/menus/dialog/childDialog/password.vue diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/passwordInputBox.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/passwordInputBox.vue new file mode 100644 index 000000000..dda9defa7 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/passwordInputBox.vue @@ -0,0 +1,206 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/popupAlarm.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/popupAlarm.vue new file mode 100644 index 000000000..e3375f76f --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/popupAlarm.vue @@ -0,0 +1,90 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/routeControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/routeControl.vue new file mode 100644 index 000000000..4c7ab1437 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/routeControl.vue @@ -0,0 +1,363 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/routeDetail.vue b/src/jmap/theme/chengdu_04/menus/dialog/routeDetail.vue new file mode 100644 index 000000000..c93dc7380 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/routeDetail.vue @@ -0,0 +1,140 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/routeGuide.vue b/src/jmap/theme/chengdu_04/menus/dialog/routeGuide.vue new file mode 100644 index 000000000..ee9fee4d6 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/routeGuide.vue @@ -0,0 +1,269 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue b/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue new file mode 100644 index 000000000..56cfab690 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue @@ -0,0 +1,256 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/sectionCmdControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/sectionCmdControl.vue new file mode 100644 index 000000000..96bd8f04b --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/sectionCmdControl.vue @@ -0,0 +1,435 @@ + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/sectionControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/sectionControl.vue new file mode 100644 index 000000000..13ac35839 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/sectionControl.vue @@ -0,0 +1,215 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/sectionDetail.vue b/src/jmap/theme/chengdu_04/menus/dialog/sectionDetail.vue new file mode 100644 index 000000000..21c0c7e13 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/sectionDetail.vue @@ -0,0 +1,115 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/speedCmdControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/speedCmdControl.vue new file mode 100644 index 000000000..a454c1bab --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/speedCmdControl.vue @@ -0,0 +1,783 @@ + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/standControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/standControl.vue new file mode 100644 index 000000000..7e019bfd0 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/standControl.vue @@ -0,0 +1,621 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue b/src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue new file mode 100644 index 000000000..f5656c12b --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue @@ -0,0 +1,211 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/stationCmdControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/stationCmdControl.vue new file mode 100644 index 000000000..4680847c6 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/stationCmdControl.vue @@ -0,0 +1,389 @@ + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/switchCmdControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/switchCmdControl.vue new file mode 100644 index 000000000..ae66d1d28 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/switchCmdControl.vue @@ -0,0 +1,459 @@ + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/switchControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/switchControl.vue new file mode 100644 index 000000000..c45f04de0 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/dialog/switchControl.vue @@ -0,0 +1,416 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/index.vue b/src/jmap/theme/chengdu_04/menus/index.vue new file mode 100644 index 000000000..2cb7de849 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/index.vue @@ -0,0 +1,360 @@ + + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuBar.vue b/src/jmap/theme/chengdu_04/menus/menuBar.vue new file mode 100644 index 000000000..946595e3a --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuBar.vue @@ -0,0 +1,1213 @@ + + + + diff --git a/src/jmap/theme/chengdu_04/menus/menuCancel.vue b/src/jmap/theme/chengdu_04/menus/menuCancel.vue new file mode 100644 index 000000000..f92ddd305 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuCancel.vue @@ -0,0 +1,151 @@ + + + diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue new file mode 100644 index 000000000..747b7cbfc --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue @@ -0,0 +1,127 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userAdd.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userAdd.vue new file mode 100644 index 000000000..2bea83e3e --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userAdd.vue @@ -0,0 +1,162 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue new file mode 100644 index 000000000..9316bb37b --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue @@ -0,0 +1,134 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userEdit.vue new file mode 100644 index 000000000..95e4e8fa8 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userEdit.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/helpAbout.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/helpAbout.vue new file mode 100644 index 000000000..698bd5429 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/helpAbout.vue @@ -0,0 +1,131 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/limitSpeed.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/limitSpeed.vue new file mode 100644 index 000000000..0ac49d4d4 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/limitSpeed.vue @@ -0,0 +1,135 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/manageUser.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/manageUser.vue new file mode 100644 index 000000000..f7a2e1589 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/manageUser.vue @@ -0,0 +1,290 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/passwordBox.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/passwordBox.vue new file mode 100644 index 000000000..9feaf8232 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/passwordBox.vue @@ -0,0 +1,221 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/setLimitSpeed.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/setLimitSpeed.vue new file mode 100644 index 000000000..6f19587a8 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/setLimitSpeed.vue @@ -0,0 +1,275 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/stationControlConvert.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/stationControlConvert.vue new file mode 100644 index 000000000..b1bbe1318 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/stationControlConvert.vue @@ -0,0 +1,414 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/trainAdd.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/trainAdd.vue new file mode 100644 index 000000000..7ddcff22c --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/trainAdd.vue @@ -0,0 +1,162 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/trainDelete.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/trainDelete.vue new file mode 100644 index 000000000..398ccb370 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/trainDelete.vue @@ -0,0 +1,149 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/trainTranstalet.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/trainTranstalet.vue new file mode 100644 index 000000000..c82352003 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/trainTranstalet.vue @@ -0,0 +1,152 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/viewDevice.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/viewDevice.vue new file mode 100644 index 000000000..dd4fc2e38 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/viewDevice.vue @@ -0,0 +1,166 @@ + + + + diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/viewName.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/viewName.vue new file mode 100644 index 000000000..aa1ccd4f0 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/viewName.vue @@ -0,0 +1,248 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/viewTrainId.vue new file mode 100644 index 000000000..888ba8d38 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuDialog/viewTrainId.vue @@ -0,0 +1,183 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuLimit.vue b/src/jmap/theme/chengdu_04/menus/menuLimit.vue new file mode 100644 index 000000000..d8600220a --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuLimit.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuSection.vue b/src/jmap/theme/chengdu_04/menus/menuSection.vue new file mode 100644 index 000000000..3cc709001 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuSection.vue @@ -0,0 +1,403 @@ + + + diff --git a/src/jmap/theme/chengdu_04/menus/menuSignal.vue b/src/jmap/theme/chengdu_04/menus/menuSignal.vue new file mode 100644 index 000000000..fa0da51e5 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuSignal.vue @@ -0,0 +1,584 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuStation.vue b/src/jmap/theme/chengdu_04/menus/menuStation.vue new file mode 100644 index 000000000..a4e2e0c7d --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuStation.vue @@ -0,0 +1,153 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuStationControl.vue b/src/jmap/theme/chengdu_04/menus/menuStationControl.vue new file mode 100644 index 000000000..b569ec165 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuStationControl.vue @@ -0,0 +1,69 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuStationStand.vue b/src/jmap/theme/chengdu_04/menus/menuStationStand.vue new file mode 100644 index 000000000..5350140d1 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuStationStand.vue @@ -0,0 +1,372 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuSwitch.vue b/src/jmap/theme/chengdu_04/menus/menuSwitch.vue new file mode 100644 index 000000000..d6c79e675 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuSwitch.vue @@ -0,0 +1,462 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuTool.vue b/src/jmap/theme/chengdu_04/menus/menuTool.vue new file mode 100644 index 000000000..dc32a9673 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuTool.vue @@ -0,0 +1,205 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/menuTrain.vue b/src/jmap/theme/chengdu_04/menus/menuTrain.vue new file mode 100644 index 000000000..cc1f69691 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/menuTrain.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue b/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue new file mode 100644 index 000000000..268e5011f --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue @@ -0,0 +1,214 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/passiveDialog/control.vue b/src/jmap/theme/chengdu_04/menus/passiveDialog/control.vue new file mode 100644 index 000000000..c9ec4589c --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/passiveDialog/control.vue @@ -0,0 +1,285 @@ + + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/passiveDialog/timeout.vue b/src/jmap/theme/chengdu_04/menus/passiveDialog/timeout.vue new file mode 100644 index 000000000..91cb2849d --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/passiveDialog/timeout.vue @@ -0,0 +1,106 @@ + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/statusBar.vue b/src/jmap/theme/chengdu_04/menus/statusBar.vue new file mode 100644 index 000000000..0fad48767 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/statusBar.vue @@ -0,0 +1,31 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/statusDownTrainDetail.vue b/src/jmap/theme/chengdu_04/menus/statusDownTrainDetail.vue new file mode 100644 index 000000000..ce4f82f65 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/statusDownTrainDetail.vue @@ -0,0 +1,31 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/statusUpTrainDetail.vue b/src/jmap/theme/chengdu_04/menus/statusUpTrainDetail.vue new file mode 100644 index 000000000..9bd682637 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menus/statusUpTrainDetail.vue @@ -0,0 +1,31 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/default/menus/utils/menuItemStatus.js b/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js similarity index 100% rename from src/jmap/theme/default/menus/utils/menuItemStatus.js rename to src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js diff --git a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue new file mode 100644 index 000000000..10a8fd228 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue @@ -0,0 +1,163 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue new file mode 100644 index 000000000..9677b8e13 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue @@ -0,0 +1,119 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/components/dataTable.vue b/src/jmap/theme/chengdu_04/menusPlan/components/dataTable.vue new file mode 100644 index 000000000..6d0ad3146 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/components/dataTable.vue @@ -0,0 +1,203 @@ + + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue new file mode 100644 index 000000000..34d738a6d --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue @@ -0,0 +1,153 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue new file mode 100644 index 000000000..c6f6f74b7 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue @@ -0,0 +1,127 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue b/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue new file mode 100644 index 000000000..b661ed20e --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue @@ -0,0 +1,64 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue new file mode 100644 index 000000000..284028f97 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue @@ -0,0 +1,53 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue b/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue new file mode 100644 index 000000000..ea2a60641 --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue @@ -0,0 +1,124 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue new file mode 100644 index 000000000..c9b645b7c --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue @@ -0,0 +1,179 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue b/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue new file mode 100644 index 000000000..5f197a1ff --- /dev/null +++ b/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue @@ -0,0 +1,315 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/default/model.js b/src/jmap/theme/chengdu_04/model.js similarity index 100% rename from src/jmap/theme/default/model.js rename to src/jmap/theme/chengdu_04/model.js diff --git a/src/jmap/theme/chengdu_04/planConvert.js b/src/jmap/theme/chengdu_04/planConvert.js new file mode 100644 index 000000000..ef5489b20 --- /dev/null +++ b/src/jmap/theme/chengdu_04/planConvert.js @@ -0,0 +1,309 @@ +import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan'; + +export default { + /** 边缘高度*/ + EdgeHeight: 600, + + /** 间隔高度*/ + CoordMultiple: 1, + + /** 偏移时间*/ + TranslationTime: 60 * 60 * 2, + + /** excel解析配置*/ + ExcelConfig: { + beginRow: 1, + beginCol: 0, + fieldNum: 10, + sepField: '车次', + columns: { + '车站名': { key: 'stationName', formatter: (val) => { return val; } }, + '到点': { key: 'arriveTime', formatter: (val) => { return val; } }, + '发点': { key: 'departureTime', formatter: (val) => { return val; } } + } + }, + + /** 解析exal数据转换为Json后台数据*/ + importData(Sheet, JsonData) { + var dataList = convertSheetToList(Sheet, true); + var needList = Object.keys(this.ExcelConfig.columns); + + if (dataList && dataList.length) { + for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += this.ExcelConfig.fieldNum + 1) { + var isContinue = true; + var tripObj = { code: '', arrivalList: [] }; + + for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) { + isContinue = false; + + var stationObj = {}; + for (var index = 0; index < this.ExcelConfig.fieldNum; index += 1) { + if (dataList[colIndex + index]) { + var title = dataList[colIndex + index][0]; + var value = dataList[colIndex + index][rowIndex]; + + if (title && value) { + // 数据列解析 + isContinue = true; + var titleStr = `${title}`.trim(); + var valueStr = `${value}`.trim(); + + if (titleStr == this.ExcelConfig.sepField) { + if (tripObj.code) { + const length = tripObj.arrivalList.length; + if (length == 1) { + tripObj.arrivalList[0]['flag'] = true; + } + JsonData.push(tripObj); + tripObj = { code: valueStr, arrivalList: [] }; + } else { + tripObj.code = valueStr; + } + } + + // 取需要的字段 + if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) { + stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr); + } + } + } + } + + // 添加字段值 + if (Object.keys(stationObj).length) { + tripObj.arrivalList.push(stationObj); + } + } + + // 添加最后那条没有车次的记录 + if (tripObj.code) { + const length = tripObj.arrivalList.length; + if (length) { + tripObj.arrivalList[length - 1]['flag'] = true; + } + JsonData.push(tripObj); + } + } + } + + return JsonData; + }, + + /** 将后台数据解析成图表*/ + convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) { + var models = []; + + if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) { + /** 按服务遍历数据*/ + data.serviceNumberDataList.forEach((service) => { + /** 按车次遍历数据*/ + var opt = { name: '', markPointData: [], data: [] }; + if (service.tripNumberDataList && service.tripNumberDataList.length) { + service.tripNumberDataList.forEach((train, j) => { + var pointdata = {}; + var idx = 0; + var num = 0; + var lastPoint = null; + var nextPoint = null; + + /** 如果车次号为空，不显示名称*/ + if (train.tripNumber) { + /** 创建标记点名称和坐标*/ + pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`; + pointdata.color = '#000' || lineStyle.color; + pointdata.directionCode = train.directionCode; + pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)]; + + /** 给服务对象添加服务名称和标记点*/ + opt.markPointData.push(createMartPoint(pointdata)); + /** 创建服务号名称*/ + opt.name = `${service.serviceNumber}`; + } + + /** 计算非折返点车次点坐标集合*/ + train.stationTimeList.forEach((elem, index) => { + idx = index; + if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode || + index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime || + index > 0 && index < train.stationTimeList.length - 1) { + opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode]); + } + }); + + /** 计算折返点车次坐标点集合*/ + if (!service.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) { + lastPoint = train.stationTimeList[idx - 1]; + nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1]; + num = this.computedReentryNumber(train.tripNumber); + opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode]); + opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode]); + } + + /** 如果是备用车，按车次添加线*/ + if (service.backup) { + /** 创建一条完成的服务数据*/ + opt.name += j; + var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle)); + if (model) { + models.push(model); + opt = { name: '', markPointData: [], data: [] }; + } + } + }); + + // 不是备用车，按服务添加线 + if (!service.backup) { + /** 创建一条完成的服务数据*/ + var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle)); + if (model) { + models.push(model); + } + } + } + }); + return models; + } else { + return []; + } + }, + + /** 更新数据并解析成图表*/ + updateDataToModels(data, stations, kmRangeCoordMap, runPlanData, series, lineStyle) { + if (data && data.length) { + data.forEach(elem => { + /** 判断此条记录的服务号是否存在*/ + if (!runPlanData[elem.serviceNumber]) { + /** 创建一个新服务号标记*/ + runPlanData[elem.serviceNumber] = {}; + + /** 不存在此服务号，则需要创建一条新的line*/ + series.push(createSeriesModel({ + zlevel: 1, + name: `run${elem.serviceNumber}`, + data: [], + markPointData: [] + }, Object.assign({ color: hexColor.toCreate() }, lineStyle))); + } + + /** 添加数据*/ + series.forEach(serie => { + /** 找到服务号所在图数据的位置*/ + if (serie.name == `run${elem.serviceNumber}`) { + /** 添加车组号记录标记*/ + if (!runPlanData[elem.serviceNumber][elem.tripNumber]) { + runPlanData[elem.serviceNumber][elem.tripNumber] = []; + } + + runPlanData[elem.serviceNumber][elem.tripNumber].push(elem); + runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => { + return parseInt(a.secondTime) - parseInt(b.secondTime); + }); + + /** 如果此记录车组号的数据为第一条时，则打上标签*/ + if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) { + serie.markPoint.data.push(createMartPoint({ + directionCode: elem.directionCode, + coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)], + name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`, + color: lineStyle.color || '#000' + })); + } + + /** 计算折返点*/ + var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode]; + if (serie.data.length > 0) { + var lastPoint = serie.data[serie.data.length - 1]; + if (lastPoint[2] !== nextPoint[2]) { + var num = this.computedReentryNumber(elem.tripNumber); + serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[2], num), lastPoint[2]]); + serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[2], num), lastPoint[2]]); + } + } + + /** 添加车组号数据到对应的服务图数据中*/ + serie.data.push(nextPoint); + + /** 保证原始数据排序*/ + serie.data.sort((a, b) => { + return parseInt(a[0]) - parseInt(b[0]); + }); + } + }); + }); + } + + return series; + }, + + /** 初始化Y轴*/ + initializeYaxis(stations) { + return createMarkLineModels(stations, (elem) => { + return this.EdgeHeight + elem.kmRange * this.CoordMultiple; + }); + }, + + /** 将后台数据转换为试图序列模型*/ + convertStationsToMap(stations) { + var map = {}; + if (stations && stations.length) { + stations.forEach((elem) => { + map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple; + }); + } + + return map; + }, + + /** 计算y轴最小值*/ + computedYaxisMinValue(stations) { + return stations[0].kmRange * this.CoordMultiple; + }, + + /** 计算y轴最大值*/ + computedYaxisMaxValue(stations) { + return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2; + }, + + /** 格式化y轴数据*/ + computedFormatYAxis(stations, params) { + var yText = ''; + + stations.forEach(elem => { + if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) { + yText = elem.kmRange + 'm'; + } + }); + + return yText; + }, + + /** 根据是否和上一个车次是否相交，计算下一个车次的折返的高度*/ + computedReentryNumber(code) { + return parseInt(code || 1) % 2 ? 1 : 2; + }, + + /** 根据方向计算y折返偏移量*/ + getYvalueByDirectionCode(defaultVlue, directionCode, num) { + if (directionCode === '1') { + defaultVlue -= this.EdgeHeight / 2 * num; + } else if (directionCode === '2') { + defaultVlue += this.EdgeHeight / 2 * num; + } + + return defaultVlue; + }, + + /** 根据elem计算y值*/ + getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial, num) { + var defaultVlue = 0; + var station = stations.find(it => { return it.code == elem.stationCode; }); + if (station) { + defaultVlue = kmRangeCoordMap[`${station.kmRange}`]; + if (isSpecial) { + defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode, num); + } + } + + return defaultVlue; + } +}; diff --git a/src/jmap/theme/chengdu_04/planSchedule/index.vue b/src/jmap/theme/chengdu_04/planSchedule/index.vue new file mode 100644 index 000000000..5403a914c --- /dev/null +++ b/src/jmap/theme/chengdu_04/planSchedule/index.vue @@ -0,0 +1,407 @@ + + + + + diff --git a/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue b/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue new file mode 100644 index 000000000..5ceaedc8f --- /dev/null +++ b/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue @@ -0,0 +1,519 @@ + + + + diff --git a/src/jmap/theme/chengdu_04/planSchedule/menuTool.vue b/src/jmap/theme/chengdu_04/planSchedule/menuTool.vue new file mode 100644 index 000000000..d3ecde016 --- /dev/null +++ b/src/jmap/theme/chengdu_04/planSchedule/menuTool.vue @@ -0,0 +1,172 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/planSchedule/schedule.vue b/src/jmap/theme/chengdu_04/planSchedule/schedule.vue new file mode 100644 index 000000000..4c80e8471 --- /dev/null +++ b/src/jmap/theme/chengdu_04/planSchedule/schedule.vue @@ -0,0 +1,500 @@ + + + + diff --git a/src/jmap/theme/chengdu_04/planSchedule/statusBar.vue b/src/jmap/theme/chengdu_04/planSchedule/statusBar.vue new file mode 100644 index 000000000..f85d6c6ce --- /dev/null +++ b/src/jmap/theme/chengdu_04/planSchedule/statusBar.vue @@ -0,0 +1,100 @@ + + + + + \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/planSchedule/titleBar.vue b/src/jmap/theme/chengdu_04/planSchedule/titleBar.vue new file mode 100644 index 000000000..689c3486a --- /dev/null +++ b/src/jmap/theme/chengdu_04/planSchedule/titleBar.vue @@ -0,0 +1,75 @@ + + + + \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/routecancel.vue b/src/jmap/theme/default/menus/dialog/routecancel.vue deleted file mode 100644 index 2f1245b34..000000000 --- a/src/jmap/theme/default/menus/dialog/routecancel.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/routerelieve.vue b/src/jmap/theme/default/menus/dialog/routerelieve.vue deleted file mode 100644 index 59767ec8b..000000000 --- a/src/jmap/theme/default/menus/dialog/routerelieve.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/routesetting.vue b/src/jmap/theme/default/menus/dialog/routesetting.vue deleted file mode 100644 index ed2b35a74..000000000 --- a/src/jmap/theme/default/menus/dialog/routesetting.vue +++ /dev/null @@ -1,171 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/sectioncontrol.vue b/src/jmap/theme/default/menus/dialog/sectioncontrol.vue deleted file mode 100644 index e6a9de274..000000000 --- a/src/jmap/theme/default/menus/dialog/sectioncontrol.vue +++ /dev/null @@ -1,145 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/sectionfault.vue b/src/jmap/theme/default/menus/dialog/sectionfault.vue deleted file mode 100644 index ea05a0fb7..000000000 --- a/src/jmap/theme/default/menus/dialog/sectionfault.vue +++ /dev/null @@ -1,237 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/standearlydeparture.vue b/src/jmap/theme/default/menus/dialog/standearlydeparture.vue deleted file mode 100644 index 19f488a54..000000000 --- a/src/jmap/theme/default/menus/dialog/standearlydeparture.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/standjumpstop.vue b/src/jmap/theme/default/menus/dialog/standjumpstop.vue deleted file mode 100644 index a0a5f2e33..000000000 --- a/src/jmap/theme/default/menus/dialog/standjumpstop.vue +++ /dev/null @@ -1,242 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/switchcontrol.vue b/src/jmap/theme/default/menus/dialog/switchcontrol.vue deleted file mode 100644 index c1ccee409..000000000 --- a/src/jmap/theme/default/menus/dialog/switchcontrol.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/dialog/traincreate.vue b/src/jmap/theme/default/menus/dialog/traincreate.vue deleted file mode 100644 index d68876cf2..000000000 --- a/src/jmap/theme/default/menus/dialog/traincreate.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/index.vue b/src/jmap/theme/default/menus/index.vue deleted file mode 100644 index 69112ae99..000000000 --- a/src/jmap/theme/default/menus/index.vue +++ /dev/null @@ -1,251 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuButton.vue b/src/jmap/theme/default/menus/menuButton.vue deleted file mode 100644 index 8cb2a393e..000000000 --- a/src/jmap/theme/default/menus/menuButton.vue +++ /dev/null @@ -1,305 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuCancel.vue b/src/jmap/theme/default/menus/menuCancel.vue deleted file mode 100644 index f0e06159f..000000000 --- a/src/jmap/theme/default/menus/menuCancel.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuSection.vue b/src/jmap/theme/default/menus/menuSection.vue deleted file mode 100644 index db9e278e2..000000000 --- a/src/jmap/theme/default/menus/menuSection.vue +++ /dev/null @@ -1,357 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuSignal.vue b/src/jmap/theme/default/menus/menuSignal.vue deleted file mode 100644 index 0cceede77..000000000 --- a/src/jmap/theme/default/menus/menuSignal.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuStationControl.vue b/src/jmap/theme/default/menus/menuStationControl.vue deleted file mode 100644 index 5e8f9ae50..000000000 --- a/src/jmap/theme/default/menus/menuStationControl.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuStationStand.vue b/src/jmap/theme/default/menus/menuStationStand.vue deleted file mode 100644 index e7da83773..000000000 --- a/src/jmap/theme/default/menus/menuStationStand.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuSwitch.vue b/src/jmap/theme/default/menus/menuSwitch.vue deleted file mode 100644 index 826bad038..000000000 --- a/src/jmap/theme/default/menus/menuSwitch.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/default/menus/menuTrain.vue b/src/jmap/theme/default/menus/menuTrain.vue deleted file mode 100644 index de066cb30..000000000 --- a/src/jmap/theme/default/menus/menuTrain.vue +++ /dev/null @@ -1,201 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/factory.js b/src/jmap/theme/factory.js index ee3b2db3e..96b539ded 100644 --- a/src/jmap/theme/factory.js +++ b/src/jmap/theme/factory.js @@ -2,10 +2,10 @@ class Theme { constructor(code) { this._code = '02'; this._mapMenu = { - '01': 'default', // 成都4号线 + '01': 'chengdu_04', '02': 'fuzhou_01', - // '03': 'beijing_01', - '03': 'chengdou_03', + '03': 'beijing_01', + '04': 'chengdu_03', '05': 'batong_01' }; } diff --git a/src/main.js b/src/main.js index 120439637..f406c8395 100644 --- a/src/main.js +++ b/src/main.js @@ -20,7 +20,6 @@ import '@/scripts/GlobalPlugin'; import '@/directives'; window.THREE = require('@/jlmap3d/main/three.min.js'); window.zlib = require('@/jlmap3d/main/inflate.min.js'); -console.log(zlib); Vue.use(ElementUI); Vue.config.productionTip = false; diff --git a/src/router/index.js b/src/router/index.js index 1fde59b45..d74331231 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -49,7 +49,7 @@ export const UrlConfig = { runPlan: '/map/runPlan', runPlanView: '/map/runPlan/view', product: '/map/product', - productDraft: '/map/product/draft', + productDraft: '/map/product/draft' }, lesson: { prefix: '/lesson', @@ -60,7 +60,7 @@ export const UrlConfig = { prefix: '/teach', detail: '/teach/detail', practical: '/teach/practical', - pay: '/teach/pay', + pay: '/teach/pay' }, exam: { prefix: '/exam', @@ -102,7 +102,7 @@ export const UrlConfig = { runPlanEveryDay: '/publish/runPlan/everyDay', runPlanTemplate: '/publish/runPlan/template', runPlanCommon: '/publish/runPlan/common', - runPlanView: '/publish/runPlan/view', + runPlanView: '/publish/runPlan/view' }, orderauthor: { prefix: '/orderauthor', @@ -136,30 +136,30 @@ export const constantRoutes = [ }, // 扫码登录 { - path: '/dp/login', + path: '/dp/login', component: resolve => require(['@/views/login/loginNewScreen'], resolve), hidden: true }, // 密码登录 { - path: '/dp/login1', + path: '/dp/login1', component: resolve => require(['@/views/login/loginScreen'], resolve), hidden: true }, // 扫码登录 { - path: '/plan/login', + path: '/plan/login', component: resolve => require(['@/views/login/loginNewPlan'], resolve), hidden: true }, // 密码登录 { - path: '/plan/login1', + path: '/plan/login1', component: resolve => require(['@/views/login/loginPlan'], resolve), hidden: true }, { - path: '/jlmap3d/edit', + path: '/jlmap3d/edit', component: resolve => require(['@/views/jlmap3d/jlmap3dedit'], resolve), hidden: true }, diff --git a/src/views/map/mapdraft/mapedit/mapoperate/link.vue b/src/views/map/mapdraft/mapedit/mapoperate/link.vue index eb02cdb5b..aa77154be 100644 --- a/src/views/map/mapdraft/mapedit/mapoperate/link.vue +++ b/src/views/map/mapdraft/mapedit/mapoperate/link.vue @@ -215,7 +215,7 @@ export default { items: [ { prop: 'code', label: '基础Link:', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.linkList }, { prop: 'direct', label: '方向:', type: 'radio', border: true, radioList: this.LinkDriectTypeList }, - { prop: 'lengthShow', label: '显示长度:', type: 'number', min: 0, placeholder: 'px', isHidden: !this.isSd }, + { prop: 'lengthShow', label: '显示长度:', type: 'number', min: 0, placeholder: 'px', isHidden: this.isSd }, { prop: 'lengthFact', label: '真实长度:', type: 'number', min: 0, placeholder: '米' }, { prop: 'color', label: '颜色:', type: 'color' } ] @@ -228,7 +228,7 @@ export default { items: [ { prop: 'lfd', label: '左侧正向Link:', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.linkList }, { prop: 'rfd', label: '右侧正向Link:', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.linkList }, - { prop: 'lengthShow', label: '显示长度:', type: 'number', min: 0, placeholder: 'px', isHidden: !this.isSd }, + { prop: 'lengthShow', label: '显示长度:', type: 'number', min: 0, placeholder: 'px', isHidden: this.isSd }, { prop: 'lengthFact', label: '真实长度:', type: 'number', min: 0, placeholder: '米' }, { prop: 'color', label: '颜色:', type: 'color' } ] diff --git a/src/views/map/runplan/chart.vue b/src/views/map/runplan/chart.vue index c3343b585..8d7fe3d83 100644 --- a/src/views/map/runplan/chart.vue +++ b/src/views/map/runplan/chart.vue @@ -1,363 +1,364 @@ \ No newline at end of file + this.myChart && this.myChart.dispatchAction({ + type: 'dataZoom', + dataZoomIndex: [0, 1], + startValue: parseInt(data.startValue / 1000), + endValue: parseInt(data.endValue / 1000) + }); + }, + reSize(opt) { + if (this.myChart) { + this.myChart.resize({ + width: opt.width, + height: opt.height, + silent: false + }); + } + }, + destroy() { + if (this.myChart && this.myChart.isDisposed) { + this.myChart.dispose(); + this.myChart = null; + } + }, + back() { + if (this.$route.params.mode === 'everyDay') { + this.$router.replace({ path: `${UrlConfig.publish.runPlanEveryDay}` }); + } else if (this.$route.params.mode === 'template') { + this.$router.replace({ path: `${UrlConfig.publish.runPlanTemplate}` }); + } else if (this.$route.params.mode === 'common') { + this.$router.replace({ path: `${UrlConfig.publish.runPlanCommon}` }); + } else { + this.$router.go(-1); + } + } + } +}; + diff --git a/src/views/map/runplan/manage/check.vue b/src/views/map/runplan/manage/check.vue index b358b83f1..dbf95c575 100644 --- a/src/views/map/runplan/manage/check.vue +++ b/src/views/map/runplan/manage/check.vue @@ -1,59 +1,68 @@ \ No newline at end of file + diff --git a/src/views/map/runplan/manage/create.vue b/src/views/map/runplan/manage/create.vue index a3961a8a5..67fa08f4f 100644 --- a/src/views/map/runplan/manage/create.vue +++ b/src/views/map/runplan/manage/create.vue @@ -77,7 +77,7 @@ import { mapGetters } from 'vuex'; -import { getSpeedLevels, newSpeedLevels, newRunPlan } from '@/api/runplan'; +import { getStationListBySkinStyle, getSpeedLevels, newSpeedLevels, newRunPlan } from '@/api/runplan'; import { getSkinStyleList } from '@/api/management/mapskin'; export default { @@ -127,6 +127,7 @@ export default { loading: false, disabled: false, active: 0, + stationList: [], RunDirectionTypeList: [], SkinStyleList: [], levelModel: { @@ -218,7 +219,12 @@ export default { this.SkinStyleList = response.data; }); }, - show() { + show(select) { + getStationListBySkinStyle(select.id).then(response => { + if (response.code == 200) { + this.stationList = response.data; + } + }); this.dialogShow = true; this.initLoadData(); }, diff --git a/src/views/map/runplan/manage/import.vue b/src/views/map/runplan/manage/import.vue index bfb274112..f057ed5fd 100644 --- a/src/views/map/runplan/manage/import.vue +++ b/src/views/map/runplan/manage/import.vue @@ -78,9 +78,8 @@ export default { } if (wb) { - const resultJSONData = {}; for (const index in wb.Sheets) { - const jsonData = sheet_to_json(wb.Sheets[index]); + sheet_to_json(wb.Sheets[index]); } that.model.filename = ''; // 清空上次导入文件 loading.close(); diff --git a/src/views/map/runplan/manage/list.vue b/src/views/map/runplan/manage/list.vue index e2d4cc458..2f92e5849 100644 --- a/src/views/map/runplan/manage/list.vue +++ b/src/views/map/runplan/manage/list.vue @@ -1,115 +1,124 @@ \ No newline at end of file + diff --git a/src/views/map/runplan/manage/operateMenu.vue b/src/views/map/runplan/manage/operateMenu.vue index 2fd8f166e..95a440214 100644 --- a/src/views/map/runplan/manage/operateMenu.vue +++ b/src/views/map/runplan/manage/operateMenu.vue @@ -97,7 +97,7 @@ export default { createChart() { this.doClose(); if (this.$refs && this.$refs.create) { - this.$refs.create.show(); + this.$refs.create.show(this.selected); } }, publishChart() { @@ -159,7 +159,7 @@ export default { for (const index in wb.Sheets) { jsonData = PlanConvert.importData(wb.Sheets[index], jsonData); } - + console.log(jsonData, '数列表'); importRunPlan({ skinStyle: skinStyle, runPlanList: jsonData }).then(response => { loading.close(); that.refresh(); diff --git a/src/views/map/runplan/manage/publish.vue b/src/views/map/runplan/manage/publish.vue index 61600f2f4..62b33e057 100644 --- a/src/views/map/runplan/manage/publish.vue +++ b/src/views/map/runplan/manage/publish.vue @@ -1,79 +1,79 @@ \ No newline at end of file + } + } +}; + From d014007d25111ba85e982272bc286e0fdd4e995e Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 8 Aug 2019 10:16:14 +0800 Subject: [PATCH 03/11] =?UTF-8?q?desc:=20=E4=BF=AE=E6=94=B9=E4=BB=BF?= =?UTF-8?q?=E7=9C=9F=E7=B3=BB=E7=BB=9F=EF=BC=8C=E6=95=99=E5=AD=A6=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=EF=BC=8C=E8=80=83=E8=AF=95=E7=B3=BB=E7=BB=9F=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=A6=96=E9=A1=B5=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/filterCity/index.vue | 370 ++++++++++--------- src/views/demonstration/deomonList/index.vue | 211 ++++++----- src/views/demonstration/home.vue | 104 +++--- src/views/demonstration/index.vue | 114 +++--- src/views/demonstration/list/demonList.vue | 239 ++++++------ src/views/exam/index.vue | 176 ++++----- src/views/exam/list/examList.vue | 261 +++++++------ src/views/exam/list/questionList.vue | 229 ++++++------ src/views/exam/result.vue | 241 ++++++------ 9 files changed, 1004 insertions(+), 941 deletions(-) diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue index 7a80ec0fd..31fa093f8 100644 --- a/src/views/components/filterCity/index.vue +++ b/src/views/components/filterCity/index.vue @@ -1,204 +1,206 @@ \ No newline at end of file + diff --git a/src/views/demonstration/home.vue b/src/views/demonstration/home.vue index 59ddee229..ff9aa535e 100644 --- a/src/views/demonstration/home.vue +++ b/src/views/demonstration/home.vue @@ -1,60 +1,60 @@ \ No newline at end of file + diff --git a/src/views/demonstration/index.vue b/src/views/demonstration/index.vue index 984c12f1a..7ab775df4 100644 --- a/src/views/demonstration/index.vue +++ b/src/views/demonstration/index.vue @@ -1,65 +1,65 @@ \ No newline at end of file + diff --git a/src/views/exam/list/examList.vue b/src/views/exam/list/examList.vue index 61cc25e8c..7576eb23f 100644 --- a/src/views/exam/list/examList.vue +++ b/src/views/exam/list/examList.vue @@ -1,128 +1,151 @@ \ No newline at end of file + diff --git a/src/views/exam/list/questionList.vue b/src/views/exam/list/questionList.vue index 03c1d2ff9..5fe000b98 100644 --- a/src/views/exam/list/questionList.vue +++ b/src/views/exam/list/questionList.vue @@ -1,117 +1,124 @@ \ No newline at end of file + diff --git a/src/views/exam/result.vue b/src/views/exam/result.vue index a1c264ed8..56d90b274 100644 --- a/src/views/exam/result.vue +++ b/src/views/exam/result.vue @@ -1,125 +1,130 @@ \ No newline at end of file + From b166dbd769064213a058caef93aa94e7897f1e46 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 8 Aug 2019 10:31:46 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=89=A7=E6=9C=AC=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BD=95=E5=88=B6=E6=A8=A1=E5=9D=97=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quest.js | 62 ++-- src/api/simulation.js | 17 + src/router/index.js | 14 +- src/scripts/DeviceTypeDic.js | 13 +- src/store/index.js | 4 +- src/store/modules/scriptRecord.js | 81 +++++ src/views/display/scriptRecord/addAction.vue | 238 ++++++++++++-- .../display/scriptRecord/addBehavior.vue | 281 ++++++++++++----- .../display/scriptRecord/deviceCondition.vue | 172 ++++++++++ src/views/display/scriptRecord/getAction.vue | 51 ++- .../display/scriptRecord/getBehavior.vue | 82 ++--- .../display/scriptRecord/roleSection.vue | 81 ++--- .../display/scriptRecord/targetCondition.vue | 294 +++++------------- src/views/display/scriptRecord/taskScript.vue | 199 ++++++++++++ src/views/display/tipScriptRecord.vue | 183 +++++------ src/views/lesson/scriptmanage/list.vue | 1 - 16 files changed, 1207 insertions(+), 566 deletions(-) create mode 100644 src/store/modules/scriptRecord.js create mode 100644 src/views/display/scriptRecord/deviceCondition.vue create mode 100644 src/views/display/scriptRecord/taskScript.vue diff --git a/src/api/quest.js b/src/api/quest.js index 690ec938f..4ee4bf778 100644 --- a/src/api/quest.js +++ b/src/api/quest.js @@ -2,46 +2,54 @@ import request from '@/utils/request'; /** 分页查找仿真任务*/ export function getQuestPageList(params) { - return request({ - url: `/api/quest/paging`, - method: 'get', - params: params - }); + return request({ + url: `/api/quest/paging`, + method: 'get', + params: params + }); } /** 创建任务 */ export function createQuest(data) { - return request({ - url: `/api/quest`, - method: 'post', - data - }); + return request({ + url: `/api/quest`, + method: 'post', + data + }); } /** 根据任务id删除任务 */ export function deleteQuest(id) { - return request({ - url: `/api/quest/${id}`, - method: 'delete' - }); + return request({ + url: `/api/quest/${id}`, + method: 'delete' + }); } /** 根据id查询任务基础信息 */ export function getQuestById(id) { - return request({ - url: `/api/quest/${id}`, - method: 'get' - }); + return request({ + url: `/api/quest/${id}`, + method: 'get', + }); } /** 根据id查询任务基础信息 */ export function getQuestByIdList(id) { - return request({ - url: `/api/quest/${id}/detail`, - method: 'get' - }); + return request({ + url: `/api/quest/${id}/detail`, + method: 'get', + }); } /** 更新任务基本信息 */ export function updateQuest(id, data) { - return request({ - url: `/api/quest/${id}`, - method: 'put', - data - }); + return request({ + url: `/api/quest/${id}`, + method: 'put', + data + }); +} +/** 更新任务地图定位信息 */ +export function updateMapLocation(id, data) { + return request({ + url: `/api/quest/${id}/mapLocation`, + method: 'put', + data + }); } diff --git a/src/api/simulation.js b/src/api/simulation.js index 8deaed2ec..a532ca9de 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -367,4 +367,21 @@ export function getSimulationInfo(group) { url: `/api/simulation/${group}`, method: 'get' }) +} + +/** 获取可用的设备指令*/ +export function getAvailableDeviceCommand() { + return request({ + url: `/api/simulation/deviceCommand/available`, + method: 'get' + }) +} + +/** 保存/修改任务剧本*/ +export function saveTaskScript(group,data) { + return request({ + url: `/api/simulation/${group}/questRecord/script`, + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index d74331231..4c304906b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -370,10 +370,18 @@ export const asyncRouter = [ meta: { title: '课程编辑' } - }, + } + ] + }, + { + path: '/script', + component: Layout, + meta: { + roles: [admin, user] + }, + children: [ { - path: 'manage/scriptmanage', - name: '剧本管理', + path: 'scriptmanage', component: resolve => require(['@/views/lesson/scriptmanage/list'], resolve), meta: { title: '剧本管理' diff --git a/src/scripts/DeviceTypeDic.js b/src/scripts/DeviceTypeDic.js index ce014bfd8..7305153ff 100644 --- a/src/scripts/DeviceTypeDic.js +++ b/src/scripts/DeviceTypeDic.js @@ -1,7 +1,7 @@ export default { ConstSelect: { + // 剧本录制模块枚举 deviceType: [ - {label: 'Link', value: 'Link'}, {label: '进路', value: 'Route'}, {label: '区段', value: 'Section'}, {label: '信号机', value: 'Signal'}, @@ -10,6 +10,17 @@ export default { {label: '控制模式', value: 'StationControl'}, {label: '道岔', value: 'Switch'}, {label: '列车', value: 'Train'}, + ], + // 行为触发条件类型 + triggerType:[ + {label: '对话', value: 'Conversation'}, + {label: '设备', value: 'DeviceCondition'}, + {label: '无', value: 'None'}, + ], + // 动作类型 + actionType:[ + {label: '对话', value: 'Conversation'}, + {label: '指令', value: 'Command'}, ] } }; \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index cdf9ee6f9..e0c721334 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -12,6 +12,7 @@ import trainingList from './modules/trainingList'; import exam from './modules/exam'; import runPlan from './modules/runplan'; import socket from './modules/socket'; +import scriptRecord from './modules/scriptRecord'; import getters from './getters'; @@ -30,7 +31,8 @@ const store = new Vuex.Store({ trainingList, exam, runPlan, - socket + socket, + scriptRecord }, getters }); diff --git a/src/store/modules/scriptRecord.js b/src/store/modules/scriptRecord.js new file mode 100644 index 000000000..b0717003c --- /dev/null +++ b/src/store/modules/scriptRecord.js @@ -0,0 +1,81 @@ +/** + * 实训状态数据 + */ +const scriptRecord = { + namespaced: true, + state: { + deviceConditionList: [], //任务目标列表 + memberList:[], //角色列表, + script:[], //剧本列表, + memberName:"", //角色名称, + behaviorName:"", //动作名称 + }, + getters: { + deviceConditionList: (state) => { + return state.deviceConditionList; + }, + memberList:(state)=>{ + return state.memberList; + }, + script:(state)=>{ + return state.script; + }, + memberName:(state)=>{ + return state.memberName; + }, + behaviorName:(state)=>{ + return state.behaviorName; + }, + }, + mutations: { + setDeviceCondition: (state, deviceConditionList) => { + state.deviceConditionList = deviceConditionList; + }, + setMemberList: (state, memberList) => { + state.memberList = memberList; + }, + setScript:(state, script) => { + state.script = script; + }, + setMemberName:(state, memberName) => { + state.memberName = memberName; + }, + setBehaviorName:(state, behaviorName) => { + state.behaviorName = behaviorName; + }, + }, + actions: { + /** + * 设置任务目标列表 + */ + updateDeviceCondition: ({ commit }, deviceConditionList) => { + commit('setDeviceCondition', deviceConditionList); + }, + /** + * 设置角色列表 + */ + updateMemberList: ({ commit }, memberList) => { + commit('setMemberList', memberList); + }, + /** + * 设置剧本列表 + */ + updateScript: ({ commit }, script) => { + commit('setScript', script); + }, + /** + * 设置角色名称 + */ + updateMemberName:({ commit }, memberName) => { + commit('setMemberName', memberName); + }, + /** + * 设置动作名称 + */ + updateBehaviorName:({ commit }, behaviorName) => { + commit('setBehaviorName', behaviorName); + }, + + } +}; +export default scriptRecord; \ No newline at end of file diff --git a/src/views/display/scriptRecord/addAction.vue b/src/views/display/scriptRecord/addAction.vue index ead8c36a1..daa353296 100644 --- a/src/views/display/scriptRecord/addAction.vue +++ b/src/views/display/scriptRecord/addAction.vue @@ -1,30 +1,45 @@ diff --git a/src/views/display/scriptRecord/getAction.vue b/src/views/display/scriptRecord/getAction.vue index 5d27fc21b..2ee946d2d 100644 --- a/src/views/display/scriptRecord/getAction.vue +++ b/src/views/display/scriptRecord/getAction.vue @@ -2,19 +2,22 @@
- 动作列表 + {{memberName}}角色/{{behaviorName}}行为/动作信息
+ - + v-loading="loading" + :data="actionList" border class="actionListTable"> + - + - + - + @@ -24,9 +27,10 @@ @@ -100,11 +128,14 @@ margin-top: 20px; margin-left: 5px; font-size: 15px; - width:502px; + width:802px; } .actionList{ margin-top: 20px; margin-left: 5px; font-size: 15px; } + .titleStyle{ + margin-left:10px; + } diff --git a/src/views/display/scriptRecord/getBehavior.vue b/src/views/display/scriptRecord/getBehavior.vue index ef961f198..625d973d0 100644 --- a/src/views/display/scriptRecord/getBehavior.vue +++ b/src/views/display/scriptRecord/getBehavior.vue @@ -1,48 +1,41 @@