diff --git a/src/api/login.js b/src/api/login.js index f3daeace4..3bb76e7a4 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -46,7 +46,7 @@ export function logout(token) { }); } -// 检查登录状态 +// 检查登录状态 WAIT,SCAN,SUCCESS,CANCEL,EXPIRE, export function checkLoginStatus(sessionId) { return new Promise((resolve, reject) => { request({ diff --git a/src/api/management/user.js b/src/api/management/user.js index 4c8772601..62f0f5af3 100644 --- a/src/api/management/user.js +++ b/src/api/management/user.js @@ -219,3 +219,11 @@ export function getWxQrCode(params) { params: params }); } + +// 获取微信小程序绑定二维码 +export function getBindWxQrCodeUrl() { + return request({ + url: `/api/user/bind/wm/url`, + method: 'get' + }); +} diff --git a/src/api/project.js b/src/api/project.js index 337853df6..189dfb351 100644 --- a/src/api/project.js +++ b/src/api/project.js @@ -3,22 +3,22 @@ import request from '@/utils/request'; /** 新建项目设备*/ export function createDevice(data) { return request({ - url: `/api/project/device`, + url: `/api/device`, method: 'post', data: data }); } /** 项目设备编码是否已存在 */ -export function deviceIsExist(projectCode, code) { +export function deviceIsExist(code) { return request({ - url: `/api/project/device/exist/${projectCode}/${code}`, + url: `/api/device/exist/${code}`, method: 'get' }); } -/** 分页查询项目设备 */ +/** 分页查询项目设备n */ export function getProjectDeviceList(params) { return request({ - url: `/api/project/device/paging`, + url: `/api/device/paging`, method: 'get', params:params }); @@ -26,21 +26,21 @@ export function getProjectDeviceList(params) { /** 删除项目设备 */ export function deleteProjectDevice(id) { return request({ - url: `/api/project/device/${id}`, + url: `/api/device/${id}`, method: 'delete' }); } /** 获取设备详情 */ export function getDeviceDetail(id) { return request({ - url: `/api/project/device/${id}`, + url: `/api/device/${id}`, method: 'get' }); } /** 添加/修改屏蔽门设备网关映射配置 */ export function setPsdConfig(id, data) { return request({ - url: `/api/project/device/${id}/config/psd`, + url: `/api/device/${id}/config/psd`, method: 'put', data: data }); @@ -48,7 +48,7 @@ export function setPsdConfig(id, data) { /** 添加/修改信号机设备网关映射配置 */ export function setSignalConfig(id, data) { return request({ - url: `/api/project/device/${id}/config/signal`, + url: `/api/device/${id}/config/signal`, method: 'put', data: data }); @@ -56,7 +56,7 @@ export function setSignalConfig(id, data) { /** 添加/修改信号机设备网关映射配置 */ export function setSwitchConfig(id, data) { return request({ - url: `/api/project/device/${id}/config/switch`, + url: `/api/device/${id}/config/switch`, method: 'put', data: data }); @@ -64,8 +64,31 @@ export function setSwitchConfig(id, data) { /** 查询项目下的所有设备 */ export function getAllDeviceInProject(params) { return request({ - url: `/api/project/device/project`, + url: `/api/device/project`, method: 'get', params }); } +/** 添加/修改ibp设备配置 */ +export function setIbpConfig(id, data) { + return request({ + url: `/api/device/${id}/config/ibp`, + method: 'put', + data: data + }); +} +/** 添加/修改现地工作站配置 */ +export function setLwConfig(id, data) { + return request({ + url: `/api/device/${id}/config/lw`, + method: 'put', + data: data + }); +} +/** 查询所有的某类型设备 */ +export function getDevicesByType(type) { + return request({ + url: `/api/device/${type}/all`, + method: 'get' + }); +} diff --git a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js index ce6f2aca2..8b55b8ecc 100644 --- a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js +++ b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js @@ -55,7 +55,8 @@ let passerwebwork = new Worker("../../static/workertest/passsimulation/passer.js let stationwebwork = new Worker("../../static/workertest/passsimulation/station.js"); let stationzon = new ZoneManager(); - +//老版本临时ai控制 +let olddataai = false; for(let i=0;i<5;i++){ checkdoor1[i]={ id:"c1"+i, @@ -947,6 +948,9 @@ export function Jl3dpassflow(dom,skinCode,routegroup) { }else if(humanlist.children[i].stage == 3){ humanlist.children[i].stage = 4; + if(olddataai){ + humanlist.children[i].stage = 5; + } }else if(humanlist.children[i].stage == 2){ humanlist.children[i].stage = 3; @@ -1031,64 +1035,70 @@ export function Jl3dpassflow(dom,skinCode,routegroup) { // console.log(humanlist.children.length); } function initstationlist(stationdata,standdata,psddata){ - // console.log(standdata); + let list = []; - for(let i=0,leni = standdata.length;i0){ - let stationobject = { - code : list[k][0].stationCode, - name : k, - toppsd:null, - downpsd:null, - topsection:null, - downsection:null, - }; - if(list[k][0].position.y0){ + let stationobject = { + code : list[k][0].stationCode, + name : k, + toppsd:null, + downpsd:null, + topsection:null, + downsection:null, + }; + if(list[k][0].position.y - -
- 准备 -
- - 车站 - 轨道/计轴 - - - - - - - - - - 确认 - - - -
-
-
- 确认 -
- - 车站 - 轨道/计轴 - - - - - - - - - - - - - - 确认 - - -
-
- - 操作倒计时 - - - - - - 状态 - - - - - - - - - 关闭 - - - - -
- - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/cancelAllLimit.vue b/src/jmap/theme/beijing_01/menus/dialog/cancelAllLimit.vue deleted file mode 100644 index e6737e5d2..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/cancelAllLimit.vue +++ /dev/null @@ -1,367 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmap/theme/beijing_01/menus/dialog/childDialog/childDialog/noticeInfo.vue deleted file mode 100644 index 0b3c0676a..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/childDialog/childDialog/noticeInfo.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue deleted file mode 100644 index 25e224a51..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmControlSpeed.vue deleted file mode 100644 index a4abfd9c4..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmControlSpeed.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmSignalUnlock.vue deleted file mode 100644 index 9f0177313..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmSignalUnlock.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmTip.vue b/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmTip.vue deleted file mode 100644 index 0edcbe768..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmTip.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue deleted file mode 100644 index 7b6ea7caf..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue b/src/jmap/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue deleted file mode 100644 index 617c619e0..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/routeCmdControl.vue b/src/jmap/theme/beijing_01/menus/dialog/routeCmdControl.vue deleted file mode 100644 index d53952a42..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/routeCmdControl.vue +++ /dev/null @@ -1,439 +0,0 @@ - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/routeControl.vue b/src/jmap/theme/beijing_01/menus/dialog/routeControl.vue deleted file mode 100644 index 08b7b789a..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/routeControl.vue +++ /dev/null @@ -1,223 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/routeDetail.vue b/src/jmap/theme/beijing_01/menus/dialog/routeDetail.vue deleted file mode 100644 index eff2325d1..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/routeDetail.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/routeHandControl.vue b/src/jmap/theme/beijing_01/menus/dialog/routeHandControl.vue deleted file mode 100644 index fbbaaae52..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/routeHandControl.vue +++ /dev/null @@ -1,342 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/routeLock.vue b/src/jmap/theme/beijing_01/menus/dialog/routeLock.vue deleted file mode 100644 index b3172930b..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/routeLock.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/routeSelection.vue b/src/jmap/theme/beijing_01/menus/dialog/routeSelection.vue deleted file mode 100644 index 5101fb230..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/routeSelection.vue +++ /dev/null @@ -1,253 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/sectionCmdControl.vue b/src/jmap/theme/beijing_01/menus/dialog/sectionCmdControl.vue deleted file mode 100644 index b2364f5b6..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/sectionCmdControl.vue +++ /dev/null @@ -1,435 +0,0 @@ - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/sectionControl.vue b/src/jmap/theme/beijing_01/menus/dialog/sectionControl.vue deleted file mode 100644 index 2bed358f9..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/sectionControl.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/speedCmdControl.vue b/src/jmap/theme/beijing_01/menus/dialog/speedCmdControl.vue deleted file mode 100644 index 27b1bb77a..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/speedCmdControl.vue +++ /dev/null @@ -1,895 +0,0 @@ - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/speedLimitControl.vue b/src/jmap/theme/beijing_01/menus/dialog/speedLimitControl.vue deleted file mode 100644 index d21d7f8f7..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/speedLimitControl.vue +++ /dev/null @@ -1,554 +0,0 @@ - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmap/theme/beijing_01/menus/dialog/standBackStrategy.vue deleted file mode 100644 index 2dbd2c8a4..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/standBackStrategy.vue +++ /dev/null @@ -1,212 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/standControl.vue b/src/jmap/theme/beijing_01/menus/dialog/standControl.vue deleted file mode 100644 index ab3a3799b..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/standControl.vue +++ /dev/null @@ -1,323 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/standDetail.vue b/src/jmap/theme/beijing_01/menus/dialog/standDetail.vue deleted file mode 100644 index 4ec92219e..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/standDetail.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/standDetainTrainAll.vue b/src/jmap/theme/beijing_01/menus/dialog/standDetainTrainAll.vue deleted file mode 100644 index cec1b47fd..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/standDetainTrainAll.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/standJumpStopControl.vue b/src/jmap/theme/beijing_01/menus/dialog/standJumpStopControl.vue deleted file mode 100644 index b76ddb523..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/standJumpStopControl.vue +++ /dev/null @@ -1,359 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/standRunLevel.vue b/src/jmap/theme/beijing_01/menus/dialog/standRunLevel.vue deleted file mode 100644 index f647198f8..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/standRunLevel.vue +++ /dev/null @@ -1,336 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/standStopTime.vue b/src/jmap/theme/beijing_01/menus/dialog/standStopTime.vue deleted file mode 100644 index df28e585e..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/standStopTime.vue +++ /dev/null @@ -1,238 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/stationCmdControl.vue b/src/jmap/theme/beijing_01/menus/dialog/stationCmdControl.vue deleted file mode 100644 index b77bd10f6..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/stationCmdControl.vue +++ /dev/null @@ -1,389 +0,0 @@ - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/stationHumanControlAll.vue b/src/jmap/theme/beijing_01/menus/dialog/stationHumanControlAll.vue deleted file mode 100644 index 8f1bcae54..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/stationHumanControlAll.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmap/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue deleted file mode 100644 index cef06ac81..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/switchCmdControl.vue b/src/jmap/theme/beijing_01/menus/dialog/switchCmdControl.vue deleted file mode 100644 index 1ba0d403e..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/switchCmdControl.vue +++ /dev/null @@ -1,459 +0,0 @@ - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/switchControl.vue b/src/jmap/theme/beijing_01/menus/dialog/switchControl.vue deleted file mode 100644 index b446fb596..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/switchControl.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainAddPlan.vue b/src/jmap/theme/beijing_01/menus/dialog/trainAddPlan.vue deleted file mode 100644 index c187eb6ac..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainAddPlan.vue +++ /dev/null @@ -1,176 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue b/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue deleted file mode 100644 index c201c17f7..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainDefine.vue b/src/jmap/theme/beijing_01/menus/dialog/trainDefine.vue deleted file mode 100644 index 782fe407d..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainDefine.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue b/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue deleted file mode 100644 index 155e29ee3..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainDeletePlan.vue b/src/jmap/theme/beijing_01/menus/dialog/trainDeletePlan.vue deleted file mode 100644 index 5d3c4e0d6..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainDeletePlan.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainEdit.vue b/src/jmap/theme/beijing_01/menus/dialog/trainEdit.vue deleted file mode 100644 index 11355a4da..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainEdit.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainFlag.vue b/src/jmap/theme/beijing_01/menus/dialog/trainFlag.vue deleted file mode 100644 index 53c33a4df..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainFlag.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainMove.vue b/src/jmap/theme/beijing_01/menus/dialog/trainMove.vue deleted file mode 100644 index 76e0044a5..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainMove.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainMoveEvently.vue b/src/jmap/theme/beijing_01/menus/dialog/trainMoveEvently.vue deleted file mode 100644 index 2549bf35a..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainMoveEvently.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainSetHead.vue b/src/jmap/theme/beijing_01/menus/dialog/trainSetHead.vue deleted file mode 100644 index 7557accbb..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainSetHead.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainSetPlan.vue b/src/jmap/theme/beijing_01/menus/dialog/trainSetPlan.vue deleted file mode 100644 index 3a495d805..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainSetPlan.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainSetWork.vue b/src/jmap/theme/beijing_01/menus/dialog/trainSetWork.vue deleted file mode 100644 index 1b1779caa..000000000 --- a/src/jmap/theme/beijing_01/menus/dialog/trainSetWork.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/index.vue b/src/jmap/theme/beijing_01/menus/index.vue deleted file mode 100644 index 60e92cc34..000000000 --- a/src/jmap/theme/beijing_01/menus/index.vue +++ /dev/null @@ -1,369 +0,0 @@ - - - - - diff --git a/src/jmap/theme/beijing_01/menus/menuBar.vue b/src/jmap/theme/beijing_01/menus/menuBar.vue deleted file mode 100644 index 221e19047..000000000 --- a/src/jmap/theme/beijing_01/menus/menuBar.vue +++ /dev/null @@ -1,1227 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/menuButton.vue b/src/jmap/theme/beijing_01/menus/menuButton.vue deleted file mode 100644 index 9c58482f7..000000000 --- a/src/jmap/theme/beijing_01/menus/menuButton.vue +++ /dev/null @@ -1,389 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/menuCancel.vue b/src/jmap/theme/beijing_01/menus/menuCancel.vue deleted file mode 100644 index 36896b645..000000000 --- a/src/jmap/theme/beijing_01/menus/menuCancel.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue deleted file mode 100644 index 53e1eceb7..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue deleted file mode 100644 index 0c7555a39..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue deleted file mode 100644 index ec304506c..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue deleted file mode 100644 index ec87e0f81..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue b/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue deleted file mode 100644 index 15ac09aa4..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue +++ /dev/null @@ -1,192 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue deleted file mode 100644 index cd38b1882..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/helpAbout.vue b/src/jmap/theme/beijing_01/menus/menuDialog/helpAbout.vue deleted file mode 100644 index 3881848e4..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/helpAbout.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/manageUser.vue b/src/jmap/theme/beijing_01/menus/menuDialog/manageUser.vue deleted file mode 100644 index 2ec6fadfa..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/manageUser.vue +++ /dev/null @@ -1,290 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/stationControl.vue b/src/jmap/theme/beijing_01/menus/menuDialog/stationControl.vue deleted file mode 100644 index 37fb64b72..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/stationControl.vue +++ /dev/null @@ -1,237 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/trainAdd.vue b/src/jmap/theme/beijing_01/menus/menuDialog/trainAdd.vue deleted file mode 100644 index 6bf8c82a0..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/trainAdd.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/trainDelete.vue b/src/jmap/theme/beijing_01/menus/menuDialog/trainDelete.vue deleted file mode 100644 index bbdd4bb4f..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/trainDelete.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/trainTranstalet.vue b/src/jmap/theme/beijing_01/menus/menuDialog/trainTranstalet.vue deleted file mode 100644 index 8b62effb9..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/trainTranstalet.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/viewDevice.vue b/src/jmap/theme/beijing_01/menus/menuDialog/viewDevice.vue deleted file mode 100644 index 75084ae0f..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/viewDevice.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/viewName.vue b/src/jmap/theme/beijing_01/menus/menuDialog/viewName.vue deleted file mode 100644 index 1b86114c8..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/viewName.vue +++ /dev/null @@ -1,256 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue deleted file mode 100644 index 7449859bc..000000000 --- a/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue +++ /dev/null @@ -1,192 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuLimit.vue b/src/jmap/theme/beijing_01/menus/menuLimit.vue deleted file mode 100644 index 938e1b368..000000000 --- a/src/jmap/theme/beijing_01/menus/menuLimit.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuSection.vue b/src/jmap/theme/beijing_01/menus/menuSection.vue deleted file mode 100644 index df3785d46..000000000 --- a/src/jmap/theme/beijing_01/menus/menuSection.vue +++ /dev/null @@ -1,413 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuSignal.vue b/src/jmap/theme/beijing_01/menus/menuSignal.vue deleted file mode 100644 index 13f74d900..000000000 --- a/src/jmap/theme/beijing_01/menus/menuSignal.vue +++ /dev/null @@ -1,500 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuStation.vue b/src/jmap/theme/beijing_01/menus/menuStation.vue deleted file mode 100644 index 9f2bfecb9..000000000 --- a/src/jmap/theme/beijing_01/menus/menuStation.vue +++ /dev/null @@ -1,307 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuStationControl.vue b/src/jmap/theme/beijing_01/menus/menuStationControl.vue deleted file mode 100644 index 6e394cecd..000000000 --- a/src/jmap/theme/beijing_01/menus/menuStationControl.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuStationStand.vue b/src/jmap/theme/beijing_01/menus/menuStationStand.vue deleted file mode 100644 index 341c4ba16..000000000 --- a/src/jmap/theme/beijing_01/menus/menuStationStand.vue +++ /dev/null @@ -1,508 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuSwitch.vue b/src/jmap/theme/beijing_01/menus/menuSwitch.vue deleted file mode 100644 index 2a7275c2b..000000000 --- a/src/jmap/theme/beijing_01/menus/menuSwitch.vue +++ /dev/null @@ -1,448 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/menuTool.vue b/src/jmap/theme/beijing_01/menus/menuTool.vue deleted file mode 100644 index d278e2adf..000000000 --- a/src/jmap/theme/beijing_01/menus/menuTool.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menus/menuTrain.vue b/src/jmap/theme/beijing_01/menus/menuTrain.vue deleted file mode 100644 index a37eb1d68..000000000 --- a/src/jmap/theme/beijing_01/menus/menuTrain.vue +++ /dev/null @@ -1,601 +0,0 @@ - - - diff --git a/src/jmap/theme/beijing_01/menus/passiveDialog/alarm.vue b/src/jmap/theme/beijing_01/menus/passiveDialog/alarm.vue deleted file mode 100644 index 02ffc2026..000000000 --- a/src/jmap/theme/beijing_01/menus/passiveDialog/alarm.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/passiveDialog/control.vue b/src/jmap/theme/beijing_01/menus/passiveDialog/control.vue deleted file mode 100644 index f8e1f1b62..000000000 --- a/src/jmap/theme/beijing_01/menus/passiveDialog/control.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/passiveDialog/timeout.vue b/src/jmap/theme/beijing_01/menus/passiveDialog/timeout.vue deleted file mode 100644 index e8ec3b556..000000000 --- a/src/jmap/theme/beijing_01/menus/passiveDialog/timeout.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js b/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js deleted file mode 100644 index 9778d96b3..000000000 --- a/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js +++ /dev/null @@ -1,570 +0,0 @@ -import Vue from 'vue'; -import store from '@/store/index_APP_TARGET'; -import deviceState from '@/jmap/constant/deviceState'; -import { OperateMode } from '@/scripts/ConstDic'; - -export function getCurrentStateObject() { - return store.getters['menuOperation/selected']; -} - -/** 系统类型 */ -export const SystemType = { - '01': 'local', // 现地工作站 - '02': 'central' // 中心调度工作站 -}; - -export const StationControlType = { - '01': 'center', // 中控 - '02': 'station' // 站控 -}; - -// 控制禁用 -export const MenuDisabledState = { - Section: { - // 故障解锁 - fault() { - }, - // 切除 - split() { - const device = getCurrentStateObject(); - if (device && device.cutOff != deviceState.Section.cutOff.Default) { - return true; - } - }, - // 激活 - active() { - const device = getCurrentStateObject(); - if (device && device.cutOff == deviceState.Section.cutOff.Default) { - return true; - } - }, - // 区段封锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State06) { - return true; - } - }, - // 区段解禁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Section.status.State06) { - return true; - } - }, - // 区段设置限速 - setSpeed() { - }, - // 区段取消限速 - cancelSpeed() { - const device = getCurrentStateObject(); - if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) { - return true; - } - }, - // 新建列车 - newTrain() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 设置计轴有效 - alxeEffective() { - }, - // 设置计轴失效 - alxeFailure() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State13) { - return true; - } - } - }, - Signal: { - // 进路选排 - arrangementRoute() { - - }, - // 进路取消 - cancelTrainRoute() { - }, - // 信号封闭 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State05) { - return true; - } - }, - // 信号解封 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Signal.status.State05) { - return true; - } - }, - // 信号重开 - reopenSignal() { - }, - // 进路引导 - guide() { - }, - // 设置联锁自动进路 - setAutoInterlock() { - }, - // 取消联锁自动进路 - cancelAutoInterlock() { - }, - // 设置联锁自动触发 - setAutoTrigger() { - }, - // 取消联锁自动触发 - cancelAutoTrigger() { - }, - // 关灯 - signalClose() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State01) { - return true; - } - }, - // 人工控 - humanControl() { - }, - // ats自动控 - atsAutoControl() { - }, - // 查询进路状态 - detail() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Station: { - // 全站设置联锁自动触发 - setAutoTrigger() { - }, - // 全站取消联锁自动触发 - cancelAutoTrigger() { - }, - // 上电解锁 - powerUnLock() { - }, - // 执行关键操作测试 - execKeyOperationTest() { - }, - // 所有进路自排开 - atsAutoControlALL() { - }, - // 所有进路自排关 - humanControlALL() { - }, - // 设置ZC故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消ZC故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationControl: { - // 紧急站控 - emergencyStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State03) { - return true; - } - }, - // 请求站控 - requestStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 强行站控 - forcedStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 请求中控 - requestCentralControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State01) { - return true; - } - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationStand: { - // 设置扣车 - setDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 取消扣车 - cancelDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 强制取消扣车 - cancelDetainTrainForce() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 设置全站扣车 - cancelDetainTrainAll() { - }, - // 设置运行等级 - setRunLevel() { - }, - // 设置停站时间 - setStopTime() { - }, - // 设置跳停 - setJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 取消跳停 - cancelJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 提前发车 - earlyDeparture() { - }, - // 站台详细信息 - detail() { - }, - // 设置折返策略 - setBackStrategy() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Switch: { - // 单锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State10) { - return true; - } - }, - // 解锁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State10) { - return true; - } - }, - // 封锁 - block() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State14) { - return true; - } - }, - // 解封 - unblock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State14) { - return true; - } - }, - // 强扳 - switchTurnoutForce() { - }, - // 转动 - switchTurnout() { - }, - // 道岔故障解锁 - fault() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 道岔切除 - split() { - }, - // 道岔激活 - active() { - }, - // 道岔设置速度 - setSpeed() { - // const device = getCurrentStateObject(); - }, - // 设置计轴有效 - alxeEffective() { - }, - // 道岔取消速度 - cancelSpeed() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Train: { - // 添加列车识别号 - addTrainId() { - }, - // 删除列车识别号 - delTrainId() { - }, - // 修改列车识别号 - editTrainId() { - }, - // 修改车组号 - editTrainNo() { - }, - // 移动列车识别号 - moveTrainId() { - }, - // 交换列车识别号 - switchTrainId() { - }, - // 设置限速 - limitSpeed() { - }, - // 设置通信故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消通信故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - }, - // 添加计划车 - addPlanTrain() { - }, - // 设置计划车 - setPlanTrain() { - }, - // 设置头码车 - setHeadTrain() { - }, - // 设置人工车 - setWorkTrain() { - }, - // 标记重点车 - trainToFlag() { - }, - // 取消标记重点车 - trainUnFlag() { - } - } -}; - -/** - * 将menu的disabled属性使用disabledCallback计算并返回 - * @param {Array} menu - */ -export function menuConvert(menu) { - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - if (elem.disabledCallback.constructor === Function) { - if (!elem.defaultDisabled) { - elem.disabled = elem.disabledCallback(); - } - } - }); - } - return menu; -} - -/** - * 根据产品类型,返回对应的menuBar - * @param {*} menuObj - */ -export function menuBarConvert(menu, mode) { - if (menu) { - if (mode === OperateMode.NORMAL) { - menu.forEach(item => { - if (item.type === 'separator') { - item.show = true; - return; - } - - item.show = false; - if (!item.click) { - item.click = () => { }; - } - - if (!item.froce) { - item.show = true; - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - } - }); - } else if (mode === OperateMode.ADMIN) { - menu.forEach(item => { - item.show = true; - if (!item.click) { - item.click = () => { }; - } - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - }); - } - } - return menu || []; -} - -/** - * 将menu的show属性过滤返回 - * @param {Array} menu - */ -export function menuFiltration(menuObj) { - var selected = getCurrentStateObject(); - var control; - var menu = []; - - if (selected._type == 'StationStand') { - control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode); - } else if (selected._type == 'Station') { - control = store.getters['map/getStationControlByStationCode'](selected.code); - } else { - control = store.getters['map/getStationControlByStationCode'](selected.stationCode); - } - - if (control) { - if (store.state.training.prdType != '') { - const type = SystemType[store.state.training.prdType]; - const status = StationControlType[control.status]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - elem.defaultDisabled = !elem.auth[status]; - } - }); - } - } - } - return menu; -} - -/** - * 将train menu的show属性过滤返回 - */ -export function trainMenuFiltration(menuObj) { - var menu = []; - if (store.state.training.prdType != '') { - const type = SystemType[store.state.training.prdType]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - } - }); - } - } - return menu; -} - -/** - * 离开菜单以及执行完菜单取消选中状态 - */ -export function mouseCancelState(selected) { - const device = Vue.prototype.$jlmap.getDeviceByCode(selected.code); - const instance = (device || {}).instance; - if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) { - device['down'] = false; - instance.mouseEvent.mouseout(Vue.prototype.$jlmap.$zr.curEvent); - } -} diff --git a/src/jmap/theme/beijing_01/menusPlan/addTask.vue b/src/jmap/theme/beijing_01/menusPlan/addTask.vue deleted file mode 100644 index 009c19f02..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/addTask.vue +++ /dev/null @@ -1,175 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue deleted file mode 100644 index 947163306..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/components/dataTable.vue b/src/jmap/theme/beijing_01/menusPlan/components/dataTable.vue deleted file mode 100644 index fa98a48e7..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/components/dataTable.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue deleted file mode 100644 index 0c483abb4..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue deleted file mode 100644 index 2eabc8044..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue b/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue deleted file mode 100644 index cd79c305f..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue deleted file mode 100644 index 2e22a7c64..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue b/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue deleted file mode 100644 index 7fcd45639..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/modifyingPlan.vue b/src/jmap/theme/beijing_01/menusPlan/modifyingPlan.vue deleted file mode 100644 index 1d2b31102..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/modifyingPlan.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/menusPlan/modifyingTask.vue b/src/jmap/theme/beijing_01/menusPlan/modifyingTask.vue deleted file mode 100644 index 8cc14cd09..000000000 --- a/src/jmap/theme/beijing_01/menusPlan/modifyingTask.vue +++ /dev/null @@ -1,327 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/model.js b/src/jmap/theme/beijing_01/model.js deleted file mode 100644 index 3dd21ca8f..000000000 --- a/src/jmap/theme/beijing_01/model.js +++ /dev/null @@ -1,68 +0,0 @@ -import deviceType from '../../constant/deviceType'; - -class Model { - constructor() { - // 公共字段部分默认初始值 - this['public'] = {}; - this['public'][deviceType.Signal] = { - lampPositionType: '02', - lampPostType: '02' - }; - - // 私有字段部分默认初始值 - this['private'] = {}; - this['private'][deviceType.StationControl] = { - indicatorShow: true // 标识灯名称显示 - }; - this['private'][deviceType.Switch] = { - nameShow: true - }; - this['private'][deviceType.Section] = { - nameShow: true, - borderBorderShow: true, // 区段边界显示 - destinationNameShow: true, // 目的地码名称显示 - standTrackNameShow: true, // 站台轨名称显示 - reentryTrackNameShow: true, // 折返轨名称显示 - transferTrackNameShow: true // 转换轨名称显示 - }; - this['private'][deviceType.Signal] = { - linkageAutoRouteShow: true, // 联锁自动进路表示灯显示 - atsAutoTriggerShow: true // ATS自动触发表示灯显示 - }; - this['private'][deviceType.Train] = { - nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式 - nameFontSize: 10 // 字体大小 - }; - this['private'][deviceType.TrainWindow] = { - trainWindowShow: true - }; - } - - initPublicProps(model) { - if (model) { - var modelInitial = this.public[model._type]; - if (modelInitial) { - for (var prop in modelInitial) { - model[prop] = modelInitial[prop]; - } - } - } - - return model; - } - - initPrivateProps(model) { - if (model) { - var modelInitial = this.private[model._type]; - if (modelInitial) { - for (var prop in modelInitial) { - model[prop] = modelInitial[prop]; - } - } - } - - return model; - } -} - -export default new Model(); diff --git a/src/jmap/theme/beijing_01/planConvert.js b/src/jmap/theme/beijing_01/planConvert.js deleted file mode 100644 index 6806a9052..000000000 --- a/src/jmap/theme/beijing_01/planConvert.js +++ /dev/null @@ -1,314 +0,0 @@ -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 isBackup = true; - 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) { - const aa = `${train.directionCode}${train.tripNumber}`; - opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]); - } - }); - - /** 计算折返点车次坐标点集合*/ - if (!train.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); - const aa = `${train.directionCode}${train.tripNumber}`; - opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]); - opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]); - } - - /** 如果是备用车,按车次添加线*/ - if (train.backup) { - /** 创建一条完成的服务数据*/ - opt.name += j; - var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle)); - if (model) { - models.push(model); - opt = { name: '', markPointData: [], data: [] }; - } - } - - isBackup = train.backup; - }); - - // 不是备用车,按服务添加线 - if (!isBackup) { - /** 创建一条完成的服务数据*/ - 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/beijing_01/planSchedule/index.vue b/src/jmap/theme/beijing_01/planSchedule/index.vue deleted file mode 100644 index 6fa39ed23..000000000 --- a/src/jmap/theme/beijing_01/planSchedule/index.vue +++ /dev/null @@ -1,403 +0,0 @@ - - - - - diff --git a/src/jmap/theme/beijing_01/planSchedule/menuBar.vue b/src/jmap/theme/beijing_01/planSchedule/menuBar.vue deleted file mode 100644 index e64ae3063..000000000 --- a/src/jmap/theme/beijing_01/planSchedule/menuBar.vue +++ /dev/null @@ -1,514 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/planSchedule/menuTool.vue b/src/jmap/theme/beijing_01/planSchedule/menuTool.vue deleted file mode 100644 index d3ecde016..000000000 --- a/src/jmap/theme/beijing_01/planSchedule/menuTool.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/beijing_01/planSchedule/schedule.vue b/src/jmap/theme/beijing_01/planSchedule/schedule.vue deleted file mode 100644 index 6434528f8..000000000 --- a/src/jmap/theme/beijing_01/planSchedule/schedule.vue +++ /dev/null @@ -1,471 +0,0 @@ - - - - diff --git a/src/jmap/theme/beijing_01/planSchedule/statusBar.vue b/src/jmap/theme/beijing_01/planSchedule/statusBar.vue deleted file mode 100644 index 28b29b1e5..000000000 --- a/src/jmap/theme/beijing_01/planSchedule/statusBar.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - - diff --git a/src/jmap/theme/beijing_01/planSchedule/titleBar.vue b/src/jmap/theme/beijing_01/planSchedule/titleBar.vue deleted file mode 100644 index 689c3486a..000000000 --- a/src/jmap/theme/beijing_01/planSchedule/titleBar.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue deleted file mode 100644 index 85c64832c..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue deleted file mode 100644 index bbb3a2587..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue deleted file mode 100644 index 31d4587e0..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue deleted file mode 100644 index c6f069ffe..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue deleted file mode 100644 index 6917c9a94..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue deleted file mode 100644 index ccfcf9036..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/password.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/password.vue deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue deleted file mode 100644 index b706da32d..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue +++ /dev/null @@ -1,196 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue deleted file mode 100644 index e3375f76f..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue deleted file mode 100644 index 6af5a13b5..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue +++ /dev/null @@ -1,312 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue deleted file mode 100644 index 1450d834a..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue deleted file mode 100644 index 847ab9fd2..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeHandControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeHandControl.vue deleted file mode 100644 index 1d0b730c5..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/routeHandControl.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue deleted file mode 100644 index 549952d84..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue +++ /dev/null @@ -1,272 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue deleted file mode 100644 index ddf690e1e..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/sectionDetail.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionDetail.vue deleted file mode 100644 index 21c0c7e13..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/sectionDetail.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/standControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/standControl.vue deleted file mode 100644 index 2c4e47ce4..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/standControl.vue +++ /dev/null @@ -1,726 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/standDetail.vue b/src/jmap/theme/chengdu_03/menus/dialog/standDetail.vue deleted file mode 100644 index f5656c12b..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/standDetail.vue +++ /dev/null @@ -1,211 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/stationCmdControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/stationCmdControl.vue deleted file mode 100644 index 4680847c6..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/stationCmdControl.vue +++ /dev/null @@ -1,389 +0,0 @@ - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/switchCmdControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/switchCmdControl.vue deleted file mode 100644 index ae66d1d28..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/switchCmdControl.vue +++ /dev/null @@ -1,459 +0,0 @@ - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue deleted file mode 100644 index 911e471b5..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue +++ /dev/null @@ -1,376 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue deleted file mode 100644 index e4e95d303..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue +++ /dev/null @@ -1,334 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue deleted file mode 100644 index 7f603d961..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue deleted file mode 100644 index ccf9241d2..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue deleted file mode 100644 index 109e1c918..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue deleted file mode 100644 index bf186229d..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue +++ /dev/null @@ -1,180 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue deleted file mode 100644 index 43efab3d2..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue +++ /dev/null @@ -1,375 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue deleted file mode 100644 index 57b2d5a64..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainMove.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainMove.vue deleted file mode 100644 index 83f886708..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainMove.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue deleted file mode 100644 index 913491341..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue +++ /dev/null @@ -1,197 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainSwitch.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainSwitch.vue deleted file mode 100644 index 9299e92d3..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/trainSwitch.vue +++ /dev/null @@ -1,195 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/index.vue b/src/jmap/theme/chengdu_03/menus/index.vue deleted file mode 100644 index 6c8937b5d..000000000 --- a/src/jmap/theme/chengdu_03/menus/index.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuBar.vue b/src/jmap/theme/chengdu_03/menus/menuBar.vue deleted file mode 100644 index 1b7125fe5..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuBar.vue +++ /dev/null @@ -1,1057 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuButton.vue b/src/jmap/theme/chengdu_03/menus/menuButton.vue deleted file mode 100644 index d361e118e..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuButton.vue +++ /dev/null @@ -1,319 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuCancel.vue b/src/jmap/theme/chengdu_03/menus/menuCancel.vue deleted file mode 100644 index 5b20d2fd3..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuCancel.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue deleted file mode 100644 index 747b7cbfc..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue deleted file mode 100644 index 2bea83e3e..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue deleted file mode 100644 index 9316bb37b..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue deleted file mode 100644 index 95e4e8fa8..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/helpAbout.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/helpAbout.vue deleted file mode 100644 index 698bd5429..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/helpAbout.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/limitSpeed.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/limitSpeed.vue deleted file mode 100644 index 0ac49d4d4..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/limitSpeed.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/manageUser.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/manageUser.vue deleted file mode 100644 index f7a2e1589..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/manageUser.vue +++ /dev/null @@ -1,290 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/passwordBox.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/passwordBox.vue deleted file mode 100644 index 9feaf8232..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/passwordBox.vue +++ /dev/null @@ -1,221 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue deleted file mode 100644 index 6f19587a8..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue deleted file mode 100644 index 4bd00cc1b..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue +++ /dev/null @@ -1,414 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/trainAdd.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/trainAdd.vue deleted file mode 100644 index 7ddcff22c..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/trainAdd.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/trainDelete.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/trainDelete.vue deleted file mode 100644 index 398ccb370..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/trainDelete.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue deleted file mode 100644 index c82352003..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/viewDevice.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewDevice.vue deleted file mode 100644 index dd4fc2e38..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/viewDevice.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue deleted file mode 100644 index 9061c3e87..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/viewName.vue +++ /dev/null @@ -1,256 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue deleted file mode 100644 index b21f46e0f..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue +++ /dev/null @@ -1,192 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuSection.vue b/src/jmap/theme/chengdu_03/menus/menuSection.vue deleted file mode 100644 index 9e14a2b4d..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuSection.vue +++ /dev/null @@ -1,286 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuSignal.vue b/src/jmap/theme/chengdu_03/menus/menuSignal.vue deleted file mode 100644 index 6be66a90a..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuSignal.vue +++ /dev/null @@ -1,491 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuStation.vue b/src/jmap/theme/chengdu_03/menus/menuStation.vue deleted file mode 100644 index f865e6cc3..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuStation.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuStationControl.vue b/src/jmap/theme/chengdu_03/menus/menuStationControl.vue deleted file mode 100644 index 6e394cecd..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuStationControl.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuStationStand.vue b/src/jmap/theme/chengdu_03/menus/menuStationStand.vue deleted file mode 100644 index 1ca52fccf..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuStationStand.vue +++ /dev/null @@ -1,345 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuSwitch.vue b/src/jmap/theme/chengdu_03/menus/menuSwitch.vue deleted file mode 100644 index e12a1e0ce..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuSwitch.vue +++ /dev/null @@ -1,453 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuTool.vue b/src/jmap/theme/chengdu_03/menus/menuTool.vue deleted file mode 100644 index 8c96fd532..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuTool.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menus/menuTrain.vue b/src/jmap/theme/chengdu_03/menus/menuTrain.vue deleted file mode 100644 index 0e9da652a..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuTrain.vue +++ /dev/null @@ -1,404 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_03/menus/passiveDialog/alarm.vue b/src/jmap/theme/chengdu_03/menus/passiveDialog/alarm.vue deleted file mode 100644 index 268e5011f..000000000 --- a/src/jmap/theme/chengdu_03/menus/passiveDialog/alarm.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/passiveDialog/control.vue b/src/jmap/theme/chengdu_03/menus/passiveDialog/control.vue deleted file mode 100644 index 1e0175452..000000000 --- a/src/jmap/theme/chengdu_03/menus/passiveDialog/control.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/passiveDialog/timeout.vue b/src/jmap/theme/chengdu_03/menus/passiveDialog/timeout.vue deleted file mode 100644 index 91cb2849d..000000000 --- a/src/jmap/theme/chengdu_03/menus/passiveDialog/timeout.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js b/src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js deleted file mode 100644 index 3b5e29d01..000000000 --- a/src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js +++ /dev/null @@ -1,601 +0,0 @@ -import store from '@/store/index_APP_TARGET'; -import deviceState from '@/jmap/constant/deviceState'; -import { OperateMode } from '@/scripts/ConstDic'; - -export function getCurrentStateObject() { - return store.getters['menuOperation/selected']; -} - -/** 系统类型 */ -export const SystemType = { - '01': 'local', // 现地工作站 - '02': 'central' // 中心调度工作站 -}; - -export const StationControlType = { - '01': 'center', // 中控 - '02': 'station', // 站控 - '03': 'station' -}; - -// 控制禁用 -export const MenuDisabledState = { - Section: { - // 故障解锁 - fault() { - }, - // 切除 - split() { - const device = getCurrentStateObject(); - if (device && device.cutOff != deviceState.Section.cutOff.Default) { - return true; - } - }, - // 激活 - active() { - const device = getCurrentStateObject(); - if (device && device.cutOff == deviceState.Section.cutOff.Default) { - return true; - } - }, - // 区段封锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State06) { - return true; - } - }, - // 区段解禁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Section.status.State06) { - return true; - } - }, - // 区段设置限速 - setSpeed() { - }, - // 区段取消限速 - cancelSpeed() { - const device = getCurrentStateObject(); - if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) { - return true; - } - }, - // 新建列车 - newTrain() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 设置计轴有效 - alxeEffective() { - }, - // 设置计轴失效 - alxeFailure() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State13) { - return true; - } - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Signal: { - // 进路选排 - arrangementRoute() { - - }, - // 进路取消 - cancelTrainRoute() { - }, - // 信号封闭 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State05) { - return true; - } - }, - // 信号解封 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Signal.status.State05) { - return true; - } - }, - // 信号重开 - reopenSignal() { - }, - // 进路引导 - guide() { - }, - // 设置联锁自动进路 - setAutoInterlock() { - }, - // 取消联锁自动进路 - cancelAutoInterlock() { - }, - // 设置联锁自动触发 - setAutoTrigger() { - }, - // 取消联锁自动触发 - cancelAutoTrigger() { - }, - // 关灯 - signalClose() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State01) { - return true; - } - }, - // 总人解 - humanTrainRoute() { - }, - // 人工控 - humanControl() { - }, - // ats自动控 - atsAutoControl() { - }, - // 查询进路状态 - detail() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Station: { - // 全站设置联锁自动触发 - setAutoTrigger() { - }, - // 全站取消联锁自动触发 - cancelAutoTrigger() { - }, - // 上电解锁 - powerUnLock() { - }, - // 执行关键操作测试 - execKeyOperationTest() { - }, - // 所有进路自排开 - atsAutoControlALL() { - }, - // 所有进路自排关 - humanControlALL() { - }, - // 设置ZC故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消ZC故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationControl: { - // 紧急站控 - emergencyStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State03) { - return true; - } - }, - // 请求站控 - requestStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 强行站控 - forcedStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 请求中控 - requestCentralControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State01) { - return true; - } - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationStand: { - // 设置扣车 - setDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 取消扣车 - cancelDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 强制取消扣车 - cancelDetainTrainForce() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 设置全站扣车 - cancelDetainTrainAll() { - }, - // 设置运行等级 - setRunLevel() { - }, - // 设置停站时间 - setStopTime() { - }, - // 设置跳停 - setJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 取消跳停 - cancelJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 提前发车 - earlyDeparture() { - }, - // 站台详细信息 - detail() { - }, - // 设置折返策略 - setBackStrategy() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Switch: { - // 单锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State10) { - return true; - } - }, - // 解锁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State10) { - return true; - } - }, - // 封锁 - block() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State14) { - return true; - } - }, - // 解封 - unblock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State14) { - return true; - } - }, - // 强扳 - switchTurnoutForce() { - }, - // 转动 - switchTurnout() { - }, - // 道岔故障解锁 - fault() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 道岔切除 - split() { - }, - // 道岔激活 - active() { - }, - // 道岔设置速度 - setSpeed() { - // const device = getCurrentStateObject(); - }, - // 设置计轴有效 - alxeEffective() { - }, - // 道岔取消速度 - cancelSpeed() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - }, - // 单操到定位 - locate() { - }, - // 单操到反位 - reverse() { - }, - // 属性 - property() { - } - }, - Train: { - // 添加列车识别号 - addTrainId() { - }, - // 删除列车识别号 - delTrainId() { - }, - // 修改列车识别号 - editTrainId() { - }, - // 修改车组号 - editTrainNo() { - }, - // 创建车组号 - createTrainNo() { - }, - // 移动车组号 - moveTrainNo() { - }, - // 删除车组号 - deleteTrainNo() { - }, - // 移动列车识别号 - moveTrainId() { - }, - // 交换列车识别号 - switchTrainId() { - }, - // 设计划车 - setPlanTrainId() { - }, - // 设目的地车 - destinationTrainId() { - }, - // 设人工车 - artificialTrainId() { - }, - // 详细列车信息 - detailTrainInfo() { - }, - // 设置限速 - limitSpeed() { - }, - // 设置通信故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消通信故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - } -}; - -/** - * 将menu的disabled属性使用disabledCallback计算并返回 - * @param {Array} menu - */ -export function menuConvert(menu) { - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - if (elem.disabledCallback.constructor === Function) { - // elem.disabled = elem.defaultDisabled; - if (!elem.defaultDisabled) { - elem.disabled = elem.disabledCallback(); - } - } - }); - } - return menu; -} - -/** - * 根据产品类型,返回对应的menuBar - * @param {*} menuObj - */ -export function menuBarConvert(menu, mode) { - if (menu) { - if (mode === OperateMode.NORMAL) { - menu.forEach(item => { - if (item.type === 'separator') { - item.show = true; - return; - } - - item.show = false; - if (!item.click) { - item.click = () => { }; - } - - if (!item.froce) { - item.show = true; - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - } - }); - } else if (mode === OperateMode.ADMIN) { - menu.forEach(item => { - item.show = true; - if (!item.click) { - item.click = () => { }; - } - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - }); - } - } - return menu || []; -} - -/** - * 将menu的show属性过滤返回 - * @param {Array} menu - */ -export function menuFiltration(menuObj) { - var selected = getCurrentStateObject(); - var control; - var menu = []; - - if (selected._type == 'StationStand') { - control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode); - } else if (selected._type == 'Station') { - control = store.getters['map/getStationControlByStationCode'](selected.code); - } else { - control = store.getters['map/getStationControlByStationCode'](selected.stationCode); - } - - if (control) { - if (store.state.training.prdType != '') { - const type = SystemType[store.state.training.prdType]; - const status = StationControlType[control.status]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - elem.defaultDisabled = !elem.auth[status]; - } - }); - } - } - } - return menu; -} - -/** - * 将train menu的show属性过滤返回 - */ -export function trainMenuFiltration(menuObj) { - var menu = []; - if (store.state.training.prdType != '') { - var type = SystemType[store.state.training.prdType]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - } - }); - } - } - return menu; -} - -/** - * 离开菜单以及执行完菜单取消选中状态 - */ -export function mouseCancelState(device) { - // Object.assign(device, { _selected: false }); - // var viewInstance = store.state.map.jlmap.getViewInstanceByDevice({ _type: device._type, _code: device.code }); - // if (viewInstance && viewInstance['mouseleave']) { - // viewInstance['selected'] = false; - // viewInstance['mouseleave'](store.state.map.jlmap._zr.curEvent); - // } -} - diff --git a/src/jmap/theme/chengdu_03/menusPlan/addTask.vue b/src/jmap/theme/chengdu_03/menusPlan/addTask.vue deleted file mode 100644 index 009c19f02..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/addTask.vue +++ /dev/null @@ -1,175 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue deleted file mode 100644 index fa220d049..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/components/dataTable.vue b/src/jmap/theme/chengdu_03/menusPlan/components/dataTable.vue deleted file mode 100644 index 7b8f1756b..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/components/dataTable.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue deleted file mode 100644 index 80860a01e..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue deleted file mode 100644 index 2eabc8044..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue b/src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue deleted file mode 100644 index cd79c305f..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue deleted file mode 100644 index 2e22a7c64..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue b/src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue deleted file mode 100644 index 7fcd45639..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue deleted file mode 100644 index 1d2b31102..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue b/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue deleted file mode 100644 index 4679c003e..000000000 --- a/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue +++ /dev/null @@ -1,326 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/model.js b/src/jmap/theme/chengdu_03/model.js deleted file mode 100644 index 3dd21ca8f..000000000 --- a/src/jmap/theme/chengdu_03/model.js +++ /dev/null @@ -1,68 +0,0 @@ -import deviceType from '../../constant/deviceType'; - -class Model { - constructor() { - // 公共字段部分默认初始值 - this['public'] = {}; - this['public'][deviceType.Signal] = { - lampPositionType: '02', - lampPostType: '02' - }; - - // 私有字段部分默认初始值 - this['private'] = {}; - this['private'][deviceType.StationControl] = { - indicatorShow: true // 标识灯名称显示 - }; - this['private'][deviceType.Switch] = { - nameShow: true - }; - this['private'][deviceType.Section] = { - nameShow: true, - borderBorderShow: true, // 区段边界显示 - destinationNameShow: true, // 目的地码名称显示 - standTrackNameShow: true, // 站台轨名称显示 - reentryTrackNameShow: true, // 折返轨名称显示 - transferTrackNameShow: true // 转换轨名称显示 - }; - this['private'][deviceType.Signal] = { - linkageAutoRouteShow: true, // 联锁自动进路表示灯显示 - atsAutoTriggerShow: true // ATS自动触发表示灯显示 - }; - this['private'][deviceType.Train] = { - nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式 - nameFontSize: 10 // 字体大小 - }; - this['private'][deviceType.TrainWindow] = { - trainWindowShow: true - }; - } - - initPublicProps(model) { - if (model) { - var modelInitial = this.public[model._type]; - if (modelInitial) { - for (var prop in modelInitial) { - model[prop] = modelInitial[prop]; - } - } - } - - return model; - } - - initPrivateProps(model) { - if (model) { - var modelInitial = this.private[model._type]; - if (modelInitial) { - for (var prop in modelInitial) { - model[prop] = modelInitial[prop]; - } - } - } - - return model; - } -} - -export default new Model(); diff --git a/src/jmap/theme/chengdu_03/planConvert.js b/src/jmap/theme/chengdu_03/planConvert.js deleted file mode 100644 index b2ad80657..000000000 --- a/src/jmap/theme/chengdu_03/planConvert.js +++ /dev/null @@ -1,292 +0,0 @@ -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: 8, - 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, false); - var needList = Object.keys(this.ExcelConfig.columns); - if (dataList && dataList.length) { - for (var rowIndex = this.ExcelConfig.beginRow; rowIndex < dataList.length; rowIndex += 1) { - for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList[this.ExcelConfig.beginCol].length; colIndex += this.ExcelConfig.fieldNum + 1) { - var tripNew, tripObj; - var stationObj = {}; - - tripNew = tripObj = { code: '', arrivalList: [] }; - for (var index = 0; index < this.ExcelConfig.fieldNum; index += 1) { - var title = dataList[0][colIndex + index]; - var value = dataList[rowIndex][colIndex + index]; - - if (title && value) { - var titleStr = `${title}`.trim(); - var valueStr = `${value}`.trim(); - - if (titleStr.includes(this.ExcelConfig.sepField)) { - tripObj.code = valueStr; - JsonData.forEach(elem => { - if (elem.code == valueStr) { - tripObj = elem; - return; - } - }); - } - - // 取需要的字段 - if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) { - stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr); - } - } - } - - tripObj.arrivalList.push(stationObj); - if (tripObj.code && tripObj == tripNew) { - 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) { - const aa = `${train.directionCode}${train.tripNumber}`; - opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]); - } - }); - - /** 计算折返点车次坐标点集合*/ - 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); - const aa = `${train.directionCode}${train.tripNumber}`; - opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]); - opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]); - } - - /** 如果是备用车,按车次添加线*/ - 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_03/planSchedule/index.vue b/src/jmap/theme/chengdu_03/planSchedule/index.vue deleted file mode 100644 index 696eed1e0..000000000 --- a/src/jmap/theme/chengdu_03/planSchedule/index.vue +++ /dev/null @@ -1,403 +0,0 @@ - - - - - diff --git a/src/jmap/theme/chengdu_03/planSchedule/menuBar.vue b/src/jmap/theme/chengdu_03/planSchedule/menuBar.vue deleted file mode 100644 index e64ae3063..000000000 --- a/src/jmap/theme/chengdu_03/planSchedule/menuBar.vue +++ /dev/null @@ -1,514 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/planSchedule/menuTool.vue b/src/jmap/theme/chengdu_03/planSchedule/menuTool.vue deleted file mode 100644 index a2ee9e8f0..000000000 --- a/src/jmap/theme/chengdu_03/planSchedule/menuTool.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/planSchedule/schedule.vue b/src/jmap/theme/chengdu_03/planSchedule/schedule.vue deleted file mode 100644 index 2acc66540..000000000 --- a/src/jmap/theme/chengdu_03/planSchedule/schedule.vue +++ /dev/null @@ -1,481 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_03/planSchedule/statusBar.vue b/src/jmap/theme/chengdu_03/planSchedule/statusBar.vue deleted file mode 100644 index 170553e15..000000000 --- a/src/jmap/theme/chengdu_03/planSchedule/statusBar.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/planSchedule/titleBar.vue b/src/jmap/theme/chengdu_03/planSchedule/titleBar.vue deleted file mode 100644 index 689c3486a..000000000 --- a/src/jmap/theme/chengdu_03/planSchedule/titleBar.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/alxeEffective.vue b/src/jmap/theme/chengdu_04/menus/dialog/alxeEffective.vue deleted file mode 100644 index 37b8fda24..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/alxeEffective.vue +++ /dev/null @@ -1,381 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 1f90d642c..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/cancelAllLimit.vue +++ /dev/null @@ -1,371 +0,0 @@ - - - - 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 deleted file mode 100644 index 574e2ed4c..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/childDialog/noticeInfo.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControl.vue deleted file mode 100644 index bbb3a2587..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControl.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 31d4587e0..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmControlSpeed.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmSignalUnlock.vue deleted file mode 100644 index c6f069ffe..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmSignalUnlock.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 6917c9a94..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTip.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - \ 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 deleted file mode 100644 index b0a7ffc5d..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTrain.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/password.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/password.vue deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/passwordInputBox.vue b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/passwordInputBox.vue deleted file mode 100644 index dda9defa7..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/passwordInputBox.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - \ 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 deleted file mode 100644 index f71cf4158..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/popupAlarm.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/dialog/routeControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/routeControl.vue deleted file mode 100644 index 4c7ab1437..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/routeControl.vue +++ /dev/null @@ -1,363 +0,0 @@ - - - \ 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 deleted file mode 100644 index c93dc7380..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/routeDetail.vue +++ /dev/null @@ -1,140 +0,0 @@ - - - \ 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 deleted file mode 100644 index 4d0534ee1..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/routeGuide.vue +++ /dev/null @@ -1,283 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue b/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue deleted file mode 100644 index 88df28887..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue +++ /dev/null @@ -1,270 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/dialog/sectionCmdControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/sectionCmdControl.vue deleted file mode 100644 index 96bd8f04b..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/sectionCmdControl.vue +++ /dev/null @@ -1,435 +0,0 @@ - - \ 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 deleted file mode 100644 index 13ac35839..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/sectionControl.vue +++ /dev/null @@ -1,215 +0,0 @@ - - - \ 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 deleted file mode 100644 index 21c0c7e13..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/sectionDetail.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - \ 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 deleted file mode 100644 index 5a3b9e7dc..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/speedCmdControl.vue +++ /dev/null @@ -1,896 +0,0 @@ - - diff --git a/src/jmap/theme/chengdu_04/menus/dialog/standControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/standControl.vue deleted file mode 100644 index 7e019bfd0..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/standControl.vue +++ /dev/null @@ -1,621 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 5aea6cf4c..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/dialog/stationCmdControl.vue b/src/jmap/theme/chengdu_04/menus/dialog/stationCmdControl.vue deleted file mode 100644 index 4680847c6..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/stationCmdControl.vue +++ /dev/null @@ -1,389 +0,0 @@ - - \ 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 deleted file mode 100644 index ae66d1d28..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/switchCmdControl.vue +++ /dev/null @@ -1,459 +0,0 @@ - - \ 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 deleted file mode 100644 index c45f04de0..000000000 --- a/src/jmap/theme/chengdu_04/menus/dialog/switchControl.vue +++ /dev/null @@ -1,416 +0,0 @@ - - - \ 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 deleted file mode 100644 index ec218b332..000000000 --- a/src/jmap/theme/chengdu_04/menus/index.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuBar.vue b/src/jmap/theme/chengdu_04/menus/menuBar.vue deleted file mode 100644 index 943662caa..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuBar.vue +++ /dev/null @@ -1,1220 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuCancel.vue b/src/jmap/theme/chengdu_04/menus/menuCancel.vue deleted file mode 100644 index 90d599739..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuCancel.vue +++ /dev/null @@ -1,150 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue deleted file mode 100644 index d15dda0a8..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userAdd.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userAdd.vue deleted file mode 100644 index 2bea83e3e..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userAdd.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 631bcf2ea..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userEdit.vue deleted file mode 100644 index 95e4e8fa8..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userEdit.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 698bd5429..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/helpAbout.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 0ac49d4d4..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/limitSpeed.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - \ 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 deleted file mode 100644 index f7a2e1589..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/manageUser.vue +++ /dev/null @@ -1,290 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 9feaf8232..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/passwordBox.vue +++ /dev/null @@ -1,221 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 6f19587a8..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/setLimitSpeed.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 4bd00cc1b..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/stationControlConvert.vue +++ /dev/null @@ -1,414 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/trainAdd.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/trainAdd.vue deleted file mode 100644 index 7ddcff22c..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/trainAdd.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 398ccb370..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/trainDelete.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - \ 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 deleted file mode 100644 index c82352003..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/trainTranstalet.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - \ 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 deleted file mode 100644 index dd4fc2e38..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/viewDevice.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/viewName.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/viewName.vue deleted file mode 100644 index 98c5df083..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/viewName.vue +++ /dev/null @@ -1,256 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/viewTrainId.vue deleted file mode 100644 index 888ba8d38..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuDialog/viewTrainId.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - \ 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 deleted file mode 100644 index d8600220a..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuLimit.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - \ 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 deleted file mode 100644 index 3cc709001..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuSection.vue +++ /dev/null @@ -1,403 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_04/menus/menuSignal.vue b/src/jmap/theme/chengdu_04/menus/menuSignal.vue deleted file mode 100644 index b01c897d3..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuSignal.vue +++ /dev/null @@ -1,583 +0,0 @@ - - - \ 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 deleted file mode 100644 index a4e2e0c7d..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuStation.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - \ 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 deleted file mode 100644 index b569ec165..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuStationControl.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - \ 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 deleted file mode 100644 index 5350140d1..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuStationStand.vue +++ /dev/null @@ -1,372 +0,0 @@ - - - \ 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 deleted file mode 100644 index d6c79e675..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuSwitch.vue +++ /dev/null @@ -1,462 +0,0 @@ - - - \ 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 deleted file mode 100644 index dc32a9673..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuTool.vue +++ /dev/null @@ -1,205 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 989ceb08e..000000000 --- a/src/jmap/theme/chengdu_04/menus/menuTrain.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - diff --git a/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue b/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue deleted file mode 100644 index 9ec516a1c..000000000 --- a/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue +++ /dev/null @@ -1,210 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menus/passiveDialog/control.vue b/src/jmap/theme/chengdu_04/menus/passiveDialog/control.vue deleted file mode 100644 index 1e0175452..000000000 --- a/src/jmap/theme/chengdu_04/menus/passiveDialog/control.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - - - \ 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 deleted file mode 100644 index 91cb2849d..000000000 --- a/src/jmap/theme/chengdu_04/menus/passiveDialog/timeout.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js b/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js deleted file mode 100644 index cf14bd2b0..000000000 --- a/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js +++ /dev/null @@ -1,587 +0,0 @@ -import store from '@/store/index_APP_TARGET'; -import deviceState from '@/jmap/constant/deviceState'; -import { OperateMode } from '@/scripts/ConstDic'; - -export function getCurrentStateObject() { - return store.getters['menuOperation/selected']; -} - -/** 系统类型 */ -export const SystemType = { - '01': 'local', // 现地工作站 - '02': 'central' // 中心调度工作站 -}; - -export const StationControlType = { - '01': 'center', // 中控 - '02': 'station', // 站控 - '03': 'station' -}; - -// 控制禁用 -export const MenuDisabledState = { - Section: { - // 故障解锁 - fault() { - }, - // 切除 - split() { - const device = getCurrentStateObject(); - if (device && device.cutOff != deviceState.Section.cutOff.Default) { - return true; - } - }, - // 激活 - active() { - const device = getCurrentStateObject(); - if (device && device.cutOff == deviceState.Section.cutOff.Default) { - return true; - } - }, - // 区段封锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State06) { - return true; - } - }, - // 区段解禁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Section.status.State06) { - return true; - } - }, - // 区段设置限速 - setSpeed() { - }, - // 区段取消限速 - cancelSpeed() { - const device = getCurrentStateObject(); - if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) { - return true; - } - }, - // 新建列车 - newTrain() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 设置计轴有效 - alxeEffective() { - }, - // 设置计轴失效 - alxeFailure() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State13) { - return true; - } - } - }, - Signal: { - // 进路选排 - arrangementRoute() { - - }, - // 进路取消 - cancelTrainRoute() { - }, - // 信号封闭 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State05) { - return true; - } - }, - // 信号解封 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Signal.status.State05) { - return true; - } - }, - // 信号重开 - reopenSignal() { - }, - // 进路引导 - guide() { - }, - // 设置联锁自动进路 - setAutoInterlock() { - }, - // 取消联锁自动进路 - cancelAutoInterlock() { - }, - // 设置联锁自动触发 - setAutoTrigger() { - }, - // 取消联锁自动触发 - cancelAutoTrigger() { - }, - // 关灯 - signalClose() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State01) { - return true; - } - }, - // 总人解 - humanTrainRoute() { - }, - // 人工控 - humanControl() { - }, - // ats自动控 - atsAutoControl() { - }, - // 查询进路状态 - detail() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Station: { - // 全站设置联锁自动触发 - setAutoTrigger() { - }, - // 全站取消联锁自动触发 - cancelAutoTrigger() { - }, - // 上电解锁 - powerUnLock() { - }, - // 执行关键操作测试 - execKeyOperationTest() { - }, - // 所有进路自排开 - atsAutoControlALL() { - }, - // 所有进路自排关 - humanControlALL() { - }, - // 设置ZC故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消ZC故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationControl: { - // 紧急站控 - emergencyStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State03) { - return true; - } - }, - // 请求站控 - requestStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 强行站控 - forcedStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 请求中控 - requestCentralControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State01) { - return true; - } - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationStand: { - // 设置扣车 - setDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 取消扣车 - cancelDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 强制取消扣车 - cancelDetainTrainForce() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 设置全站扣车 - cancelDetainTrainAll() { - }, - // 设置运行等级 - setRunLevel() { - }, - // 设置停站时间 - setStopTime() { - }, - // 设置跳停 - setJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 取消跳停 - cancelJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 提前发车 - earlyDeparture() { - }, - // 站台详细信息 - detail() { - }, - // 设置折返策略 - setBackStrategy() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Switch: { - // 单锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State10) { - return true; - } - }, - // 解锁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State10) { - return true; - } - }, - // 封锁 - block() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State14) { - return true; - } - }, - // 解封 - unblock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State14) { - return true; - } - }, - // 强扳 - switchTurnoutForce() { - }, - // 转动 - switchTurnout() { - }, - // 道岔故障解锁 - fault() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 道岔切除 - split() { - }, - // 道岔激活 - active() { - }, - // 道岔设置速度 - setSpeed() { - // const device = getCurrentStateObject(); - }, - // 设置计轴有效 - alxeEffective() { - }, - // 道岔取消速度 - cancelSpeed() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - }, - // 单操到定位 - locate() { - }, - // 单操到反位 - reverse() { - }, - // 属性 - property() { - } - }, - Train: { - // 添加列车识别号 - addTrainId() { - }, - // 删除列车识别号 - delTrainId() { - }, - // 修改列车识别号 - editTrainId() { - }, - // 修改车组号 - editTrainNo() { - }, - // 创建车组号 - createTrainNo() { - }, - // 移动车组号 - moveTrainNo() { - }, - // 删除车组号 - deleteTrainNo() { - }, - // 移动列车识别号 - moveTrainId() { - }, - // 交换列车识别号 - switchTrainId() { - }, - // 设计划车 - setPlanTrainId() { - }, - // 设目的地车 - destinationTrainId() { - }, - // 设人工车 - artificialTrainId() { - }, - // 详细列车信息 - detailTrainInfo() { - }, - // 设置限速 - limitSpeed() { - }, - // 设置通信故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消通信故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - } -}; - -/** - * 将menu的disabled属性使用disabledCallback计算并返回 - * @param {Array} menu - */ -export function menuConvert(menu) { - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - if (elem.disabledCallback.constructor === Function) { - // elem.disabled = elem.defaultDisabled; - if (!elem.defaultDisabled) { - elem.disabled = elem.disabledCallback(); - } - } - }); - } - return menu; -} - -/** - * 根据产品类型,返回对应的menuBar - * @param {*} menuObj - */ -export function menuBarConvert(menu, mode) { - if (menu) { - if (mode === OperateMode.NORMAL) { - menu.forEach(item => { - if (item.type === 'separator') { - item.show = true; - return; - } - - item.show = false; - if (!item.click) { - item.click = () => { }; - } - - if (!item.froce) { - item.show = true; - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - } - }); - } else if (mode === OperateMode.ADMIN) { - menu.forEach(item => { - item.show = true; - if (!item.click) { - item.click = () => { }; - } - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - }); - } - } - return menu || []; -} - -/** - * 将menu的show属性过滤返回 - * @param {Array} menu - */ -export function menuFiltration(menuObj) { - var selected = getCurrentStateObject(); - var control; - var menu = []; - - if (selected._type == 'StationStand') { - control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode); - } else if (selected._type == 'Station') { - control = store.getters['map/getStationControlByStationCode'](selected.code); - } else { - control = store.getters['map/getStationControlByStationCode'](selected.stationCode); - } - - if (control) { - if (store.state.training.prdType != '') { - const type = SystemType[store.state.training.prdType]; - const status = StationControlType[control.status]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - elem.defaultDisabled = !elem.auth[status]; - } - }); - } - } - } - return menu; -} - -/** - * 将train menu的show属性过滤返回 - */ -export function trainMenuFiltration(menuObj) { - var menu = []; - if (store.state.training.prdType != '') { - var type = SystemType[store.state.training.prdType]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - } - }); - } - } - return menu; -} - -/** - * 离开菜单以及执行完菜单取消选中状态 - */ -export function mouseCancelState(device) { - // Object.assign(device, { _selected: false }); - // var viewInstance = store.state.map.jlmap.getViewInstanceByDevice({ _type: device._type, _code: device.code }); - // if (viewInstance && viewInstance['mouseleave']) { - // viewInstance['selected'] = false; - // viewInstance['mouseleave'](store.state.map.jlmap._zr.curEvent); - // } -} - diff --git a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue deleted file mode 100644 index 009c19f02..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue +++ /dev/null @@ -1,175 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue deleted file mode 100644 index fa220d049..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/components/dataTable.vue b/src/jmap/theme/chengdu_04/menusPlan/components/dataTable.vue deleted file mode 100644 index ef76ee150..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/components/dataTable.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue deleted file mode 100644 index 061b7f8d0..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue deleted file mode 100644 index 2eabc8044..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue b/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue deleted file mode 100644 index cd79c305f..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue deleted file mode 100644 index 2e22a7c64..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue b/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue deleted file mode 100644 index 7fcd45639..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue deleted file mode 100644 index 1d2b31102..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue b/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue deleted file mode 100644 index 4679c003e..000000000 --- a/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue +++ /dev/null @@ -1,326 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/model.js b/src/jmap/theme/chengdu_04/model.js deleted file mode 100644 index 3dd21ca8f..000000000 --- a/src/jmap/theme/chengdu_04/model.js +++ /dev/null @@ -1,68 +0,0 @@ -import deviceType from '../../constant/deviceType'; - -class Model { - constructor() { - // 公共字段部分默认初始值 - this['public'] = {}; - this['public'][deviceType.Signal] = { - lampPositionType: '02', - lampPostType: '02' - }; - - // 私有字段部分默认初始值 - this['private'] = {}; - this['private'][deviceType.StationControl] = { - indicatorShow: true // 标识灯名称显示 - }; - this['private'][deviceType.Switch] = { - nameShow: true - }; - this['private'][deviceType.Section] = { - nameShow: true, - borderBorderShow: true, // 区段边界显示 - destinationNameShow: true, // 目的地码名称显示 - standTrackNameShow: true, // 站台轨名称显示 - reentryTrackNameShow: true, // 折返轨名称显示 - transferTrackNameShow: true // 转换轨名称显示 - }; - this['private'][deviceType.Signal] = { - linkageAutoRouteShow: true, // 联锁自动进路表示灯显示 - atsAutoTriggerShow: true // ATS自动触发表示灯显示 - }; - this['private'][deviceType.Train] = { - nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式 - nameFontSize: 10 // 字体大小 - }; - this['private'][deviceType.TrainWindow] = { - trainWindowShow: true - }; - } - - initPublicProps(model) { - if (model) { - var modelInitial = this.public[model._type]; - if (modelInitial) { - for (var prop in modelInitial) { - model[prop] = modelInitial[prop]; - } - } - } - - return model; - } - - initPrivateProps(model) { - if (model) { - var modelInitial = this.private[model._type]; - if (modelInitial) { - for (var prop in modelInitial) { - model[prop] = modelInitial[prop]; - } - } - } - - return model; - } -} - -export default new Model(); diff --git a/src/jmap/theme/chengdu_04/planConvert.js b/src/jmap/theme/chengdu_04/planConvert.js deleted file mode 100644 index dadb1996b..000000000 --- a/src/jmap/theme/chengdu_04/planConvert.js +++ /dev/null @@ -1,310 +0,0 @@ -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) { - const aa = `${train.directionCode}${train.tripNumber}`; - opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]); - } - }); - - /** 计算折返点车次坐标点集合*/ - 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 deleted file mode 100644 index 6fa39ed23..000000000 --- a/src/jmap/theme/chengdu_04/planSchedule/index.vue +++ /dev/null @@ -1,403 +0,0 @@ - - - - - diff --git a/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue b/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue deleted file mode 100644 index e64ae3063..000000000 --- a/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue +++ /dev/null @@ -1,514 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/planSchedule/menuTool.vue b/src/jmap/theme/chengdu_04/planSchedule/menuTool.vue deleted file mode 100644 index d3ecde016..000000000 --- a/src/jmap/theme/chengdu_04/planSchedule/menuTool.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 81d8f0787..000000000 --- a/src/jmap/theme/chengdu_04/planSchedule/schedule.vue +++ /dev/null @@ -1,482 +0,0 @@ - - - - diff --git a/src/jmap/theme/chengdu_04/planSchedule/statusBar.vue b/src/jmap/theme/chengdu_04/planSchedule/statusBar.vue deleted file mode 100644 index 170553e15..000000000 --- a/src/jmap/theme/chengdu_04/planSchedule/statusBar.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - - - \ 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 deleted file mode 100644 index 689c3486a..000000000 --- a/src/jmap/theme/chengdu_04/planSchedule/titleBar.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/factory.js b/src/jmap/theme/factory.js index d1d180c21..717cd04d8 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': 'chengdu_04', + // '01': 'chengdu_04', '02': 'fuzhou_01', - '03': 'beijing_01', - '04': 'chengdu_03', + // '03': 'beijing_01', + // '04': 'chengdu_03', '05': 'fuzhou_01' // 国际版运行图皮肤 指向05 福州线路 }; } diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index 1b993fcaa..ef8770859 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -84,7 +84,7 @@ class SkinCode extends defaultStyle { textShadowColor: '#22DFDF', nameShow: true, lineDash: [3, 3], - lineWidthMore: 0 + lineWidthMore: 2.5 }, line: { width: 5, // 区段宽度 diff --git a/src/jmapNew/constant/stateTransition.js b/src/jmapNew/constant/stateTransition.js index b62ffbb99..bae1325bc 100644 --- a/src/jmapNew/constant/stateTransition.js +++ b/src/jmapNew/constant/stateTransition.js @@ -57,7 +57,8 @@ class Status { greenOpen: device.greenOpen, redOpen: device.redOpen, yellowOpen: device.yellowOpen, - ciControl: device.ciControl || 0 + ciControl: device.ciControl || 0, + canSetCi: !!device.canSetCi }; } handlePsd(device) { diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 7fb82e824..3e92f331f 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -11,7 +11,7 @@ import { selectLineCode } from './config/deviceStyle'; import { deviceFactory, createBoundingRect, calculateDCenter } from './utils/parser'; import { deepAssign } from '@/utils/index'; import store from '@/store/index_APP_TARGET'; -import Vue from 'vue'; +import { loadPropConvert } from './theme/factory'; const renderer = 'canvas'; const devicePixelRatio = 1; @@ -179,7 +179,7 @@ class Jlmap { } } } - const screenSplit = opts.list.length ? opts.list : Vue.prototype.$theme.loadPropConvert(store.state.map.map.skinVO.code).screenSplit; + const screenSplit = opts.list.length ? opts.list : loadPropConvert(store.state.map.map.skinVO.code).screenSplit; const splitList = JSON.parse(JSON.stringify(screenSplit)); const num = screenSplit.length + 1; const offsetY = (opts.height - 100) / num; // 高度差 @@ -423,7 +423,7 @@ class Jlmap { } else { if (elem.deviceType === 'TRAIN') { this.isUpdateShowTrainList = true; - store.dispatch('map/updateTrainList', elem); + store.dispatch('map/updateActiveTrainList', elem); // store.dispatch('map/updateTrainState', elem); } else if (elem.deviceType === 'STAND') { store.dispatch('map/updateStationStand', elem); diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js index de4a2928d..eb18bcbd7 100644 --- a/src/jmapNew/mouseController.js +++ b/src/jmapNew/mouseController.js @@ -174,7 +174,7 @@ class MouseController extends Eventful { moveEvent(e) { const newEm = new EventModel(e); - const trainDetails = store.state.map.trainDetails; + const trainDetails = store.state.map.trainDetails; // 获取当前拿到train详情 对比 移除 if (trainDetails) { if (newEm.deviceType != deviceType.Train || trainDetails.code != newEm.deviceCode) { var instance = (this.$jmap.getDeviceByCode(trainDetails.code) || {} ).instance; @@ -285,7 +285,7 @@ class MouseController extends Eventful { } }); this.deviceList = includeDeviceList; - store.dispatch('map/setSeclectDeviceList', this.deviceList); + store.dispatch('map/setSeclectDeviceList', this.deviceList); // 给store设置框选的 model } // 生成包围盒对象坐标 createFakeBoundingRect(instance) { diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index d87469e5a..ce12503eb 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -214,7 +214,7 @@ export default class Train extends Group { setDirectionType(right, flag) { if (this.style.Train.trainStatusStyle.directionType.length > 0) { this.style.Train.trainStatusStyle.directionType.forEach((item) => { - if (right === item.type) { + if (right == item.type) { let lineLShow = item.lineLShow; let arrowLShow = item.arrowLShow; let lineRShow = item.lineRShow; @@ -238,7 +238,7 @@ export default class Train extends Group { setDirectionStopType(right) { if (this.style.Train.trainStatusStyle.directionStopType.length > 0) { this.style.Train.trainStatusStyle.directionStopType.forEach((item) => { - if (right === item.type) { + if (right == item.type) { if (this.style.Train.trainHead.directionStopType == 'special') { this.trainL && this.trainL.setArrowShow(item.lineLShow); this.trainR && this.trainR.setArrowShow(item.lineRShow); diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue index 0a7ba485f..28a76263d 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue @@ -112,7 +112,7 @@ - diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue index d27869f44..9eabd7d2c 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue @@ -11,7 +11,7 @@ :close-on-click-modal="false" > - 车站名称 + 集中站 始端信号机 @@ -25,7 +25,7 @@ 进路列表 - 展开进路预览 + import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; -import { mouseCancelState } from '../utils/menuItemStatus'; +import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { deepAssign } from '@/utils/index'; -import {menuOperate, commitOperate} from '../utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'RouteSelection', @@ -230,10 +230,10 @@ export default { if (valid) { this.doClose(); } - }).catch((error) => { + }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow({}, error.message); + this.$refs.noticeInfo.doShow(); }); } }, diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue index 510dfe27f..f0cae6718 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue @@ -50,9 +50,9 @@ \ No newline at end of file +}; + diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue index d4e11dda0..0ba915c0f 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue @@ -28,7 +28,7 @@ \ No newline at end of file + diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue index 4cdb0905c..59b34c6fe 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue @@ -45,7 +45,7 @@ \ No newline at end of file + diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue index f22a3485a..96bbb1dfa 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue @@ -45,7 +45,7 @@ - \ No newline at end of file + diff --git a/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue index e8ec3b556..29c910040 100644 --- a/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue +++ b/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue @@ -1,106 +1,113 @@ \ No newline at end of file + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + if (valid) { + this.doClose(); + } + }); + }, + commit() { + const operate = { + operation: OperationEvent.Command.close.notice.operation + }; + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + if (valid) { + this.doClose(); + } + }); + }, + isClose() { + return this.dialogShow; + } + } +}; + + diff --git a/src/jmapNew/theme/beijing_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/beijing_01/menus/utils/menuItemStatus.js deleted file mode 100644 index 9778d96b3..000000000 --- a/src/jmapNew/theme/beijing_01/menus/utils/menuItemStatus.js +++ /dev/null @@ -1,570 +0,0 @@ -import Vue from 'vue'; -import store from '@/store/index_APP_TARGET'; -import deviceState from '@/jmap/constant/deviceState'; -import { OperateMode } from '@/scripts/ConstDic'; - -export function getCurrentStateObject() { - return store.getters['menuOperation/selected']; -} - -/** 系统类型 */ -export const SystemType = { - '01': 'local', // 现地工作站 - '02': 'central' // 中心调度工作站 -}; - -export const StationControlType = { - '01': 'center', // 中控 - '02': 'station' // 站控 -}; - -// 控制禁用 -export const MenuDisabledState = { - Section: { - // 故障解锁 - fault() { - }, - // 切除 - split() { - const device = getCurrentStateObject(); - if (device && device.cutOff != deviceState.Section.cutOff.Default) { - return true; - } - }, - // 激活 - active() { - const device = getCurrentStateObject(); - if (device && device.cutOff == deviceState.Section.cutOff.Default) { - return true; - } - }, - // 区段封锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State06) { - return true; - } - }, - // 区段解禁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Section.status.State06) { - return true; - } - }, - // 区段设置限速 - setSpeed() { - }, - // 区段取消限速 - cancelSpeed() { - const device = getCurrentStateObject(); - if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) { - return true; - } - }, - // 新建列车 - newTrain() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 设置计轴有效 - alxeEffective() { - }, - // 设置计轴失效 - alxeFailure() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State13) { - return true; - } - } - }, - Signal: { - // 进路选排 - arrangementRoute() { - - }, - // 进路取消 - cancelTrainRoute() { - }, - // 信号封闭 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State05) { - return true; - } - }, - // 信号解封 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Signal.status.State05) { - return true; - } - }, - // 信号重开 - reopenSignal() { - }, - // 进路引导 - guide() { - }, - // 设置联锁自动进路 - setAutoInterlock() { - }, - // 取消联锁自动进路 - cancelAutoInterlock() { - }, - // 设置联锁自动触发 - setAutoTrigger() { - }, - // 取消联锁自动触发 - cancelAutoTrigger() { - }, - // 关灯 - signalClose() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State01) { - return true; - } - }, - // 人工控 - humanControl() { - }, - // ats自动控 - atsAutoControl() { - }, - // 查询进路状态 - detail() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Station: { - // 全站设置联锁自动触发 - setAutoTrigger() { - }, - // 全站取消联锁自动触发 - cancelAutoTrigger() { - }, - // 上电解锁 - powerUnLock() { - }, - // 执行关键操作测试 - execKeyOperationTest() { - }, - // 所有进路自排开 - atsAutoControlALL() { - }, - // 所有进路自排关 - humanControlALL() { - }, - // 设置ZC故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消ZC故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationControl: { - // 紧急站控 - emergencyStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State03) { - return true; - } - }, - // 请求站控 - requestStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 强行站控 - forcedStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 请求中控 - requestCentralControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State01) { - return true; - } - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationStand: { - // 设置扣车 - setDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 取消扣车 - cancelDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 强制取消扣车 - cancelDetainTrainForce() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 设置全站扣车 - cancelDetainTrainAll() { - }, - // 设置运行等级 - setRunLevel() { - }, - // 设置停站时间 - setStopTime() { - }, - // 设置跳停 - setJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 取消跳停 - cancelJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 提前发车 - earlyDeparture() { - }, - // 站台详细信息 - detail() { - }, - // 设置折返策略 - setBackStrategy() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Switch: { - // 单锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State10) { - return true; - } - }, - // 解锁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State10) { - return true; - } - }, - // 封锁 - block() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State14) { - return true; - } - }, - // 解封 - unblock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State14) { - return true; - } - }, - // 强扳 - switchTurnoutForce() { - }, - // 转动 - switchTurnout() { - }, - // 道岔故障解锁 - fault() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 道岔切除 - split() { - }, - // 道岔激活 - active() { - }, - // 道岔设置速度 - setSpeed() { - // const device = getCurrentStateObject(); - }, - // 设置计轴有效 - alxeEffective() { - }, - // 道岔取消速度 - cancelSpeed() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Train: { - // 添加列车识别号 - addTrainId() { - }, - // 删除列车识别号 - delTrainId() { - }, - // 修改列车识别号 - editTrainId() { - }, - // 修改车组号 - editTrainNo() { - }, - // 移动列车识别号 - moveTrainId() { - }, - // 交换列车识别号 - switchTrainId() { - }, - // 设置限速 - limitSpeed() { - }, - // 设置通信故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消通信故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - }, - // 添加计划车 - addPlanTrain() { - }, - // 设置计划车 - setPlanTrain() { - }, - // 设置头码车 - setHeadTrain() { - }, - // 设置人工车 - setWorkTrain() { - }, - // 标记重点车 - trainToFlag() { - }, - // 取消标记重点车 - trainUnFlag() { - } - } -}; - -/** - * 将menu的disabled属性使用disabledCallback计算并返回 - * @param {Array} menu - */ -export function menuConvert(menu) { - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - if (elem.disabledCallback.constructor === Function) { - if (!elem.defaultDisabled) { - elem.disabled = elem.disabledCallback(); - } - } - }); - } - return menu; -} - -/** - * 根据产品类型,返回对应的menuBar - * @param {*} menuObj - */ -export function menuBarConvert(menu, mode) { - if (menu) { - if (mode === OperateMode.NORMAL) { - menu.forEach(item => { - if (item.type === 'separator') { - item.show = true; - return; - } - - item.show = false; - if (!item.click) { - item.click = () => { }; - } - - if (!item.froce) { - item.show = true; - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - } - }); - } else if (mode === OperateMode.ADMIN) { - menu.forEach(item => { - item.show = true; - if (!item.click) { - item.click = () => { }; - } - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - }); - } - } - return menu || []; -} - -/** - * 将menu的show属性过滤返回 - * @param {Array} menu - */ -export function menuFiltration(menuObj) { - var selected = getCurrentStateObject(); - var control; - var menu = []; - - if (selected._type == 'StationStand') { - control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode); - } else if (selected._type == 'Station') { - control = store.getters['map/getStationControlByStationCode'](selected.code); - } else { - control = store.getters['map/getStationControlByStationCode'](selected.stationCode); - } - - if (control) { - if (store.state.training.prdType != '') { - const type = SystemType[store.state.training.prdType]; - const status = StationControlType[control.status]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - elem.defaultDisabled = !elem.auth[status]; - } - }); - } - } - } - return menu; -} - -/** - * 将train menu的show属性过滤返回 - */ -export function trainMenuFiltration(menuObj) { - var menu = []; - if (store.state.training.prdType != '') { - const type = SystemType[store.state.training.prdType]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - } - }); - } - } - return menu; -} - -/** - * 离开菜单以及执行完菜单取消选中状态 - */ -export function mouseCancelState(selected) { - const device = Vue.prototype.$jlmap.getDeviceByCode(selected.code); - const instance = (device || {}).instance; - if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) { - device['down'] = false; - instance.mouseEvent.mouseout(Vue.prototype.$jlmap.$zr.curEvent); - } -} diff --git a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js deleted file mode 100644 index 504137582..000000000 --- a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js +++ /dev/null @@ -1,241 +0,0 @@ -import store from '@/store/index_APP_TARGET'; -import CMD from '@/scripts/cmdPlugin/CommandEnum'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; - -// 操作 -export const menuOperate = { - Section:{ - active:{ - // 区段激活 - operation: OperationEvent.Section.active.menu.operation, - cmdType: CMD.Section.CMD_SECTION_ACTIVE - }, - alxeEffective:{ - // 确认计轴有效 - operation: OperationEvent.Section.alxeEffective.menu.operation, - cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE - }, - split:{ - // 区段切除 - operation: OperationEvent.Section.split.menu.operation, - cmdType: CMD.Section.CMD_SECTION_CUT_OFF - }, - setSpeed:{ - // 设置速度 - operation: OperationEvent.Section.setSpeed.menu.operation, - cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED - }, - axlePreReset:{ - // 区段计轴预复位 - operation: OperationEvent.Section.axlePreReset.menu.operation, - cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET - }, - fault:{ - // 区段故障解锁 - operation: OperationEvent.Section.fault.menu.operation, - cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK - } - }, - Signal:{ - arrangementRoute:{ - // 排列进路 - operation: OperationEvent.Signal.arrangementRoute.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE - }, - cancelTrainRoute:{ - // 取消进路 - operation: OperationEvent.Signal.cancelTrainRoute.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE - }, - humanTrainRoute:{ - // 总人解 - operation: OperationEvent.Signal.humanTrainRoute.menu.operation, - cmdType:CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE - }, - reopenSignal:{ - // 信号重开 - operation: OperationEvent.Signal.reopenSignal.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL - }, - signalClose:{ - // 信号关灯 - operation: OperationEvent.Signal.signalClose.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL - }, - humanControl:{ - // 进路交人工控 - operation: OperationEvent.Signal.humanControl.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING - }, - atsAutoControl:{ - // 进路交自动控 - operation: OperationEvent.Signal.atsAutoControl.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING - }, - setAutoInterlock:{ - // 设置通过模式 - operation: OperationEvent.Signal.setAutoInterlock.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO - }, - cancelAutoInterlock:{ - // 取消通过模式 - operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO - }, - detail:{ - // 查询进路状态 - operation: OperationEvent.Signal.detail.menu.operation - } - }, - Switch:{ - lock:{ - // 道岔单锁 - operation: OperationEvent.Switch.lock.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK - }, - unlock:{ - // 道岔解锁 - operation: OperationEvent.Switch.unlock.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK - }, - turnoutForce:{ - // 道岔强扳 - operation: OperationEvent.Switch.turnoutForce.menu.operation - }, - locate:{ - // 单操到定位 - operation: OperationEvent.Switch.locate.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION - }, - reverse:{ - // 单操到反位 - operation: OperationEvent.Switch.reverse.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION - }, - split:{ - // 区段切除 - operation: OperationEvent.Switch.split.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF - }, - active:{ - // 区段激活 - operation: OperationEvent.Switch.active.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_ACTIVE - }, - setSpeed:{ - // 设置临时限速 - operation: OperationEvent.Switch.setSpeed.menu.operation, - cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED - }, - alxeEffective:{ - // 确认计轴有效 - operation: OperationEvent.Switch.alxeEffective.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE - } - - }, - StationStand:{ - setDetainTrain:{ - // 设置扣车 - operation: OperationEvent.StationStand.setDetainTrain.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN - }, - cancelDetainTrain:{ - // 取消扣车 - operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation, - cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN - }, - setJumpStop:{ - // 设置跳停 - operation: OperationEvent.StationStand.setJumpStop.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP - }, - cancelJumpStop:{ - // 取消跳停 - operation: OperationEvent.StationStand.cancelJumpStop.menu.operation, - cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP - }, - setStopTime:{ - // 停站时间控制 - operation: OperationEvent.StationStand.setStopTime.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME - }, - setRunLevel:{ - // 运行时间控制 - operation: OperationEvent.StationStand.setRunLevel.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME - }, - earlyDeparture:{ - // 设置提前发车 - operation: OperationEvent.StationStand.earlyDeparture.menu.operation, - cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART - }, - setBackStrategy:{ - // 设置折返策略 - operation: OperationEvent.StationStand.setBackStrategy.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY - }, - detail:{ - // 查询站台状态 - operation: OperationEvent.StationStand.detail.menu.operation - } - }, - StationControl:{ - requestCentralControl:{ - // 请求中控(遥控) - operation: OperationEvent.StationControl.requestCentralControl.menu.operation, - cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL - }, - requestStationControl:{ - // 请求站控 - operation: OperationEvent.StationControl.requestStationControl.menu.operation, - cmdType:CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL - }, - emergencyStationControl:{ - // 紧急站控 - operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, - cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL - } - }, - Common: { - setFault: { - operation: OperationEvent.MixinCommand.stoppage.menu.operation, - cmdType: CMD.Fault.CMD_SET_FAULT - }, - cancelFault: { - operation: OperationEvent.MixinCommand.cancelStoppage.menu.operation, - cmdType: CMD.Fault.CMD_CANCEL_FAULT - } - } -}; - -export function commitOperate(operate, paramList, over) { - const step = { - start: true, - operation: operate.operation, - param:{} - }; - step.param = paramList; - // over 0为首次操作,1为中间操作,2为最后操作,3为直接一次性操作 - if (over == 0 || over == 3) { - const codeList = Object.values(paramList); - step.code = codeList[0]; - } - if (over != 0 && over != 3) { - delete step.start; - } - if (over == 2 || over == 3) { - step.over = true; - step.cmdType = operate.cmdType; - } - return new Promise(function(resolve, reject) { - store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } - resolve({ valid: valid, operate: step }); - }).catch(error=>{ - reject(error); - }); - }); -} diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue index ca8bf7133..83237babb 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue @@ -19,7 +19,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'SectionMenu', diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index 9e402e3c6..4e777a1a8 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -15,7 +15,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'SignalMenu', diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue index 6d602bfa7..369c0acad 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue @@ -12,7 +12,6 @@ import CancelMouseState from '@/mixin/CancelMouseState'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; -import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus'; export default { name: 'StationMenu', @@ -43,13 +42,11 @@ export default { menuForce: [ { label: '设置ZC故障', - handler: this.setStoppage, - disabledCallback: MenuDisabledState.Station.setStoppage + handler: this.setStoppage }, { label: '取消ZC故障', - handler: this.cancelStoppage, - disabledCallback: MenuDisabledState.Station.cancelStoppage + handler: this.cancelStoppage } ] }; @@ -80,20 +77,12 @@ export default { }; }, initMenu() { - this.menu = []; - if (this.selected.concentrateStationCode == this.selected.code) { - // 编辑模式菜单列表 - this.menu = menuFiltration(this.menuNormal); - } - if (this.selected.centralized) { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = [...this.menuForce]; } } - - this.menu = menuConvert(this.menu); }, doShow(point) { this.clickEvent(); @@ -110,8 +99,6 @@ export default { // 设置故障 setStoppage() { const operate = { - start: true, - send: true, code: this.selected.code, operation: OperationEvent.Station.stoppage.menu.operation }; @@ -130,10 +117,7 @@ export default { // 取消故障 cancelStoppage() { const operate = { - start: true, - send: true, code: this.selected.code, - operation: OperationEvent.Station.cancelStoppage.menu.operation }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue index 5240a2975..249fe365e 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue @@ -164,7 +164,7 @@ export default { if (valid) { this.doClose(); } - }).catch(error => { this.doClose(); }); + }).catch(() => { this.doClose(); }); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue index 202cd7fb8..e1dfe8a11 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue @@ -15,7 +15,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'StationStandMenu', diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue index b6fc0bfbe..e8ffb5547 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue @@ -18,7 +18,7 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'SwitchMenu', diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index d91fe8e69..e64628600 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -8,7 +8,6 @@ - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/chengdu_01/menusPlan/chooseTemplatePlan.vue deleted file mode 100644 index fa220d049..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/chooseTemplatePlan.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/components/dataTable.vue b/src/jmapNew/theme/chengdu_01/menusPlan/components/dataTable.vue deleted file mode 100644 index 7b8f1756b..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/components/dataTable.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/chengdu_01/menusPlan/createTodayPlan.vue deleted file mode 100644 index 271312a31..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/createTodayPlan.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/chengdu_01/menusPlan/createWeekPlan.vue deleted file mode 100644 index 6cc0fda76..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/createWeekPlan.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/deleteTask.vue b/src/jmapNew/theme/chengdu_01/menusPlan/deleteTask.vue deleted file mode 100644 index cd79c305f..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/deleteTask.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/chengdu_01/menusPlan/deleteTodayPlan.vue deleted file mode 100644 index 2e22a7c64..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/deleteTodayPlan.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/managePlanList.vue b/src/jmapNew/theme/chengdu_01/menusPlan/managePlanList.vue deleted file mode 100644 index 8db7568d5..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/managePlanList.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/chengdu_01/menusPlan/modifyingPlan.vue deleted file mode 100644 index 5902bdf8a..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/modifyingPlan.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/chengdu_01/menusPlan/modifyingTask.vue b/src/jmapNew/theme/chengdu_01/menusPlan/modifyingTask.vue deleted file mode 100644 index 364ba2715..000000000 --- a/src/jmapNew/theme/chengdu_01/menusPlan/modifyingTask.vue +++ /dev/null @@ -1,326 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue index 4a4055cad..cafe16ddd 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue @@ -19,7 +19,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'SectionMenu', diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue index c7cfee5e8..9d733cdbd 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue @@ -25,7 +25,7 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordInputBox'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'SignalMenu', diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue index 4af3db27a..2fab8edee 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue @@ -12,7 +12,6 @@ import CancelMouseState from '@/mixin/CancelMouseState'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; -import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus'; export default { name: 'StationMenu', @@ -43,13 +42,11 @@ export default { menuForce: [ { label: '设置ZC故障', - handler: this.setStoppage, - disabledCallback: MenuDisabledState.Station.setStoppage + handler: this.setStoppage }, { label: '取消ZC故障', - handler: this.cancelStoppage, - disabledCallback: MenuDisabledState.Station.cancelStoppage + handler: this.cancelStoppage } ] }; @@ -80,20 +77,13 @@ export default { }; }, initMenu() { - this.menu = []; - if (this.selected.concentrateStationCode == this.selected.code) { - // 编辑模式菜单列表 - this.menu = menuFiltration(this.menuNormal); - } - + // 编辑模式菜单列表 if (this.selected.centralized) { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = [...this.menuForce]; } } - - this.menu = menuConvert(this.menu); }, doShow(point) { this.clickEvent(); diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue index 5d9790243..43d45d136 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue @@ -17,7 +17,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'StationStandMenu', diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue index b73632781..9d680b854 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue @@ -18,7 +18,7 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'SwitchMenu', diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue index b09e3872a..50d370fbe 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue @@ -16,7 +16,6 @@ import PopMenu from '@/components/PopMenu'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; -import { MenuDisabledState } from './utils/menuItemStatus'; import TrainControl from './dialog/trainControl'; import TrainEditNumber from './dialog/trainEditNumber'; import TrainMoveNumber from './dialog/trainMoveNumber'; @@ -65,83 +64,60 @@ export default { Center: [ { label: '新建车组号', - handler: this.createTrainNo, - disabledCallback: MenuDisabledState.Train.createTrainNo, - auth: { station: true, center: true } + handler: this.createTrainNo }, { label: '移动车组号', - handler: this.moveTrainNo, - disabledCallback: MenuDisabledState.Train.moveTrainNo, - auth: { station: true, center: true } + handler: this.moveTrainNo }, { label: '删除车组号', - handler: this.deleteTrainNo, - disabledCallback: MenuDisabledState.Train.deleteTrainNo, - auth: { station: true, center: true } + handler: this.deleteTrainNo }, { label: '修改车组号', - handler: this.editTrainNo, - disabledCallback: MenuDisabledState.Train.editTrainNo, - auth: { station: true, center: true } + handler: this.editTrainNo }, { label: '设计划车', - handler: this.setPlanTrainId, - disabledCallback: MenuDisabledState.Train.setPlanTrainId, - auth: { station: true, center: true } + handler: this.setPlanTrainId }, { label: '设目的地', - handler: this.destinationTrainId, - disabledCallback: MenuDisabledState.Train.destinationTrainId, - auth: { station: true, center: true } + handler: this.destinationTrainId }, { label: '设人工车', - handler: this.artificialTrainId, - disabledCallback: MenuDisabledState.Train.artificialTrainId, - auth: { station: true, center: true } + handler: this.artificialTrainId }, { label: '设特殊人工车', - handler: this.undeveloped, - disabledCallback: MenuDisabledState.Train.moveTrainId, - auth: { station: true, center: true} + handler: this.undeveloped }, { label: '详细列车信息', - handler: this.detailTrainInfo, - disabledCallback: MenuDisabledState.Train.detailTrainInfo, - auth: { station: true, center: true} + handler: this.detailTrainInfo }, { label: '属性', - handler: this.undeveloped, - disabledCallback: MenuDisabledState.Train.moveTrainId, - auth: { station: true, center: true} + handler: this.undeveloped } ] }, menuForce: [ { label: '设置通信故障', - handler: this.setStoppage, - disabledCallback: MenuDisabledState.Train.setStoppage + handler: this.setStoppage }, { label: '取消通信故障', - handler: this.cancelStoppage, - disabledCallback: MenuDisabledState.Train.cancelStoppage + handler: this.cancelStoppage } ], menuSpeed: [ { label: '确认运行至前方站', - handler: this.limitSpeed, - disabledCallback: MenuDisabledState.Train.limitSpeed + handler: this.limitSpeed } ] }; diff --git a/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js b/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js deleted file mode 100644 index d4170dc30..000000000 --- a/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js +++ /dev/null @@ -1,601 +0,0 @@ -import store from '@/store/index_APP_TARGET'; -import deviceState from '@/jmap/constant/deviceState'; -import { OperateMode } from '@/scripts/ConstDic'; - -export function getCurrentStateObject() { - return store.getters['menuOperation/selected']; -} - -/** 系统类型 */ -export const State2SimulationMap = { - '01': 'local', // 现地工作站 - '02': 'central' // 中心调度工作站 -}; - -export const State2ControlMap = { - '01': 'center', // 中控 - '02': 'station', // 站控 - '03': 'station' -}; - -// 控制禁用 -export const MenuDisabledState = { - Section: { - // 故障解锁 - fault() { - }, - // 切除 - split() { - const device = getCurrentStateObject(); - if (device && device.cutOff != deviceState.Section.cutOff.Default) { - return true; - } - }, - // 激活 - active() { - const device = getCurrentStateObject(); - if (device && device.cutOff == deviceState.Section.cutOff.Default) { - return true; - } - }, - // 区段封锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State06) { - return true; - } - }, - // 区段解禁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Section.status.State06) { - return true; - } - }, - // 区段设置限速 - setSpeed() { - }, - // 区段取消限速 - cancelSpeed() { - const device = getCurrentStateObject(); - if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) { - return true; - } - }, - // 新建列车 - newTrain() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 设置计轴有效 - alxeEffective() { - }, - // 设置计轴失效 - alxeFailure() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Section.status.State13) { - return true; - } - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Signal: { - // 进路选排 - arrangementRoute() { - - }, - // 进路取消 - cancelTrainRoute() { - }, - // 信号封闭 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State05) { - return true; - } - }, - // 信号解封 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Signal.status.State05) { - return true; - } - }, - // 信号重开 - reopenSignal() { - }, - // 进路引导 - guide() { - }, - // 设置联锁自动进路 - setAutoInterlock() { - }, - // 取消联锁自动进路 - cancelAutoInterlock() { - }, - // 设置联锁自动触发 - setAutoTrigger() { - }, - // 取消联锁自动触发 - cancelAutoTrigger() { - }, - // 关灯 - signalClose() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Signal.status.State01) { - return true; - } - }, - // 总人解 - humanTrainRoute() { - }, - // 人工控 - humanControl() { - }, - // ats自动控 - atsAutoControl() { - }, - // 查询进路状态 - detail() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Station: { - // 全站设置联锁自动触发 - setAutoTrigger() { - }, - // 全站取消联锁自动触发 - cancelAutoTrigger() { - }, - // 上电解锁 - powerUnLock() { - }, - // 执行关键操作测试 - execKeyOperationTest() { - }, - // 所有进路自排开 - atsAutoControlALL() { - }, - // 所有进路自排关 - humanControlALL() { - }, - // 设置ZC故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消ZC故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationControl: { - // 紧急站控 - emergencyStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State03) { - return true; - } - }, - // 请求站控 - requestStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 强行站控 - forcedStationControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State02) { - return true; - } - }, - // 请求中控 - requestCentralControl() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.StationControl.status.State01) { - return true; - } - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - StationStand: { - // 设置扣车 - setDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 取消扣车 - cancelDetainTrain() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 强制取消扣车 - cancelDetainTrainForce() { - const device = getCurrentStateObject(); - if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) { - return true; - } - }, - // 设置全站扣车 - cancelDetainTrainAll() { - }, - // 设置运行等级 - setRunLevel() { - }, - // 设置停站时间 - setStopTime() { - }, - // 设置跳停 - setJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 取消跳停 - cancelJumpStop() { - const device = getCurrentStateObject(); - if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) { - return true; - } - }, - // 提前发车 - earlyDeparture() { - }, - // 站台详细信息 - detail() { - }, - // 设置折返策略 - setBackStrategy() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - }, - Switch: { - // 单锁 - lock() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State10) { - return true; - } - }, - // 解锁 - unlock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State10) { - return true; - } - }, - // 封锁 - block() { - const device = getCurrentStateObject(); - if (device && device.status == deviceState.Switch.status.State14) { - return true; - } - }, - // 解封 - unblock() { - const device = getCurrentStateObject(); - if (device && device.status != deviceState.Switch.status.State14) { - return true; - } - }, - // 强扳 - switchTurnoutForce() { - }, - // 转动 - switchTurnout() { - }, - // 道岔故障解锁 - fault() { - }, - // 计轴预复位 - axlePreReset() { - }, - // 道岔切除 - split() { - }, - // 道岔激活 - active() { - }, - // 道岔设置速度 - setSpeed() { - // const device = getCurrentStateObject(); - }, - // 设置计轴有效 - alxeEffective() { - }, - // 道岔取消速度 - cancelSpeed() { - }, - // 设置故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - }, - // 单操到定位 - locate() { - }, - // 单操到反位 - reverse() { - }, - // 属性 - property() { - } - }, - Train: { - // 添加列车识别号 - addTrainId() { - }, - // 删除列车识别号 - delTrainId() { - }, - // 修改列车识别号 - editTrainId() { - }, - // 修改车组号 - editTrainNo() { - }, - // 创建车组号 - createTrainNo() { - }, - // 移动车组号 - moveTrainNo() { - }, - // 删除车组号 - deleteTrainNo() { - }, - // 移动列车识别号 - moveTrainId() { - }, - // 交换列车识别号 - switchTrainId() { - }, - // 设计划车 - setPlanTrainId() { - }, - // 设目的地车 - destinationTrainId() { - }, - // 设人工车 - artificialTrainId() { - }, - // 详细列车信息 - detailTrainInfo() { - }, - // 设置限速 - limitSpeed() { - }, - // 设置通信故障 - setStoppage() { - const device = getCurrentStateObject(); - if (device && device.fault) { - return true; - } - }, - // 取消通信故障 - cancelStoppage() { - const device = getCurrentStateObject(); - if (device && !device.fault) { - return true; - } - } - } -}; - -/** - * 将menu的disabled属性使用disabledCallback计算并返回 - * @param {Array} menu - */ -export function menuConvert(menu) { - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - if (elem.disabledCallback.constructor === Function) { - // elem.disabled = elem.defaultDisabled; - if (!elem.defaultDisabled) { - elem.disabled = elem.disabledCallback(); - } - } - }); - } - return menu; -} - -/** - * 根据产品类型,返回对应的menuBar - * @param {*} menuObj - */ -export function menuBarConvert(menu, mode) { - if (menu) { - if (mode === OperateMode.NORMAL) { - menu.forEach(item => { - if (item.type === 'separator') { - item.show = true; - return; - } - - item.show = false; - if (!item.click) { - item.click = () => { }; - } - - if (!item.froce) { - item.show = true; - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - } - }); - } else if (mode === OperateMode.ADMIN) { - menu.forEach(item => { - item.show = true; - if (!item.click) { - item.click = () => { }; - } - if (item.children && item.children.length > 0) { - menuBarConvert(item.children, mode); - } - }); - } - } - return menu || []; -} - -/** - * 将menu的show属性过滤返回 - * @param {Array} menu - */ -export function menuFiltration(menuObj) { - var selected = getCurrentStateObject(); - var control; - var menu = []; - - if (selected._type == 'StationStand') { - control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode); - } else if (selected._type == 'Station') { - control = store.getters['map/getStationControlByStationCode'](selected.code); - } else { - control = store.getters['map/getStationControlByStationCode'](selected.stationCode); - } - - if (control) { - if (store.state.training.prdType != '') { - const type = State2SimulationMap[store.state.training.prdType]; - const status = State2ControlMap[control.status]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - elem.defaultDisabled = !elem.auth[status]; - } - }); - } - } - } - return menu; -} - -/** - * 将train menu的show属性过滤返回 - */ -export function trainMenuFiltration(menuObj) { - var menu = []; - if (store.state.training.prdType != '') { - var type = State2SimulationMap[store.state.training.prdType]; - menu = [...menuObj[type]]; - if (menu.constructor === Array) { - menu.forEach(elem => { - if (elem.type === 'separator') { - elem.show = true; - return; - } - - if (elem.auth.constructor === Object) { - elem.show = true; - if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - elem.show = false; - } - } - }); - } - } - return menu; -} - -/** - * 离开菜单以及执行完菜单取消选中状态 - */ -export function mouseCancelState(device) { - // Object.assign(device, { _selected: false }); - // var viewInstance = store.state.map.jlmap.getViewInstanceByDevice({ _type: device._type, _code: device.code }); - // if (viewInstance && viewInstance['mouseleave']) { - // viewInstance['selected'] = false; - // viewInstance['mouseleave'](store.state.map.jlmap._zr.curEvent); - // } -} - diff --git a/src/jmapNew/theme/chengdu_03/menus/utils/menuOperate.js b/src/jmapNew/theme/chengdu_03/menus/utils/menuOperate.js deleted file mode 100644 index 4e9b5627d..000000000 --- a/src/jmapNew/theme/chengdu_03/menus/utils/menuOperate.js +++ /dev/null @@ -1,257 +0,0 @@ -import store from '@/store/index_APP_TARGET'; -import CMD from '@/scripts/cmdPlugin/CommandEnum'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; - -// 操作 -export const menuOperate = { - Section:{ - alxeFailure:{ - // 设置计轴失效 - operation: OperationEvent.Section.alxeFailure.menu.operation, - // cmdType 值有问题 - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT - }, - active:{ - // 区段激活 - operation: OperationEvent.Section.active.menu.operation, - cmdType: CMD.Section.CMD_SECTION_ACTIVE - }, - split:{ - // 区段切除 - operation: OperationEvent.Section.split.menu.operation, - cmdType: CMD.Section.CMD_SECTION_CUT_OFF - }, - setSpeed:{ - // 设置速度 - operation: OperationEvent.Section.setSpeed.menu.operation, - cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED - }, - fault:{ - // 区段故障解锁 - operation: OperationEvent.Section.fault.menu.operation, - cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK - } - }, - Signal:{ - arrangementRoute:{ - // 排列进路 - operation: OperationEvent.Signal.arrangementRoute.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE - }, - cancelTrainRoute:{ - // 取消进路 - operation: OperationEvent.Signal.cancelTrainRoute.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE - }, - lock:{ - // 信号封锁 - operation:OperationEvent.Signal.lock.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_BLOCK - }, - unlock:{ - // 信号解封 - operation: OperationEvent.Signal.unlock.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK - }, - guide:{ - // 进路引导 - operation: OperationEvent.Signal.guide.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE - }, - reopenSignal:{ - // 信号重开 - operation: OperationEvent.Signal.reopenSignal.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL - }, - signalClose:{ - // 信号关灯 - operation: OperationEvent.Signal.signalClose.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL - }, - humanControl:{ - // 进路交人工控 - operation: OperationEvent.Signal.humanControl.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING - }, - atsAutoControl:{ - // 进路交自动控 - operation: OperationEvent.Signal.atsAutoControl.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING - }, - setAutoInterlock:{ - // 设置通过模式 - operation: OperationEvent.Signal.setAutoInterlock.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO - }, - cancelAutoInterlock:{ - // 取消通过模式 - operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO - }, - detail:{ - // 查询进路状态 - operation: OperationEvent.Signal.detail.menu.operation - }, - cancelGuide:{ - // 人工解锁进路(信号机取消引导) - operation: OperationEvent.Signal.cancelGuide.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE - }, - setAutoTurnBack:{ - // 设置自动折返 - operation: OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK - }, - cancelAutoTurnBack:{ - // 取消自动折返 - operation: OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK - } - }, - Switch:{ - lock:{ - // 道岔单锁 - operation: OperationEvent.Switch.lock.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK - }, - unlock:{ - // 道岔解锁 - operation: OperationEvent.Switch.unlock.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK - }, - block:{ - // 道岔封锁 - operation: OperationEvent.Switch.block.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_BLOCK - }, - unblock:{ - // 道岔解封 - operation: OperationEvent.Switch.unblock.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK - }, - locate:{ - // 单操到定位 - operation: OperationEvent.Switch.locate.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION - }, - reverse:{ - // 单操到反位 - operation: OperationEvent.Switch.reverse.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION - }, - setSpeed:{ - // 设置临时限速 - operation: OperationEvent.Switch.setSpeed.menu.operation, - cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED - }, - turnoutForce: { - // 道岔强制扳动 - operation: OperationEvent.Switch.turnoutForce.menu.operation, - cmdType:CMD.Switch.CMD_SWITCH_FORCE_TURN - } - }, - StationStand:{ - setDetainTrain:{ - // 设置扣车 - operation: OperationEvent.StationStand.setDetainTrain.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN - }, - cancelDetainTrain:{ - // 取消扣车 - operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation, - cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN - }, - cancelDetainTrainAll:{ - // 全线取消扣车 - operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation, - cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN - }, - setJumpStop:{ - // 设置跳停 - operation: OperationEvent.StationStand.setJumpStop.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP - }, - cancelJumpStop:{ - // 取消跳停 - operation: OperationEvent.StationStand.cancelJumpStop.menu.operation, - cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP - }, - setStopTime:{ - // 停站时间控制 - operation: OperationEvent.StationStand.setStopTime.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME - }, - setRunLevel:{ - // 运行时间控制 - operation: OperationEvent.StationStand.setRunLevel.menu.operation, - cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME - }, - earlyDeparture:{ - // 设置提前发车 - operation: OperationEvent.StationStand.earlyDeparture.menu.operation, - cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART - }, - detail:{ - // 查询站台状态 - operation: OperationEvent.StationStand.detail.menu.operation - } - }, - StationControl:{ - // requestCentralControl:{ - // // 请求中控(遥控) - // operation: OperationEvent.StationControl.requestCentralControl.menu.operation, - // cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL - // }, - // requestStationControl:{ - // // 请求站控 - // operation: OperationEvent.StationControl.requestStationControl.menu.operation, - // cmdType:CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL - // }, - // emergencyStationControl:{ - // // 紧急站控 - // operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, - // cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL - // } - }, - Common: { - setFault: { - operation: OperationEvent.MixinCommand.stoppage.menu.operation, - cmdType: CMD.Fault.CMD_SET_FAULT - }, - cancelFault: { - operation: OperationEvent.MixinCommand.cancelStoppage.menu.operation, - cmdType: CMD.Fault.CMD_CANCEL_FAULT - } - } -}; - -export function commitOperate(operate, paramList, over) { - const step = { - start: true, - operation: operate.operation, - param:{} - }; - step.param = paramList; - // over 0为首次操作,1为中间操作,2为最后操作,3为直接一次性操作 - if (over == 0 || over == 3) { - const codeList = Object.values(paramList); - step.code = codeList[0]; - } - if (over != 0 && over != 3) { - delete step.start; - } - if (over == 2 || over == 3) { - step.over = true; - step.cmdType = operate.cmdType; - } - return new Promise(function(resolve, reject) { - store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } - resolve({ valid: valid, operate: step }); - }).catch(error=>{ - reject(error); - }); - }); -} diff --git a/src/jmapNew/theme/components/menus/childDialog/confirmTip.vue b/src/jmapNew/theme/components/menus/childDialog/confirmTip.vue new file mode 100644 index 000000000..ad4955cee --- /dev/null +++ b/src/jmapNew/theme/components/menus/childDialog/confirmTip.vue @@ -0,0 +1,83 @@ + + + + diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue similarity index 81% rename from src/jmapNew/theme/ningbo_01/menus/dialog/cancelAllLimit.vue rename to src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue index 7cd1a50ad..99ab78df4 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/cancelAllLimit.vue +++ b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue @@ -1,7 +1,7 @@ - diff --git a/src/jmapNew/theme/components/menus/dialog/routeControl.vue b/src/jmapNew/theme/components/menus/dialog/routeControl.vue index e10ab37e2..eb750548f 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeControl.vue @@ -12,7 +12,7 @@ :close-on-click-modal="false" > - {{ $t('menu.stationName') }} + 集中站 {{ $t('menu.signal') }} @@ -300,10 +300,10 @@ export default { if (valid) { this.doClose(); } - }).catch(() => { + }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(); + this.$refs.noticeInfo.doShow(error.message); }); }, sendCommandNext(operate) { @@ -317,10 +317,10 @@ export default { that.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); resolve({...operate}); } - }).catch(() => { + }).catch((error) => { that.loading = false; that.doClose(); - that.$refs.noticeInfo.doShow(); + that.$refs.noticeInfo.doShow(error.message); }); }); }, diff --git a/src/jmapNew/theme/components/menus/dialog/switchControl.vue b/src/jmapNew/theme/components/menus/dialog/switchControl.vue index 7bce75efc..baa4bc3f0 100644 --- a/src/jmapNew/theme/components/menus/dialog/switchControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/switchControl.vue @@ -69,7 +69,7 @@ - diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue index 0acf3d257..4a8051f6c 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue @@ -38,6 +38,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import { deepAssign } from '@/utils/index'; +import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus'; import { mapGetters } from 'vuex'; export default { @@ -132,7 +133,7 @@ export default { this.restoreBeforeDevices(); this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); + mouseCancelState(this.selected); }, restoreBeforeDevices() { // 恢复之前选中设备 diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue index 124d23cca..671e435e6 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue @@ -64,6 +64,7 @@ import { mapGetters } from 'vuex'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus'; export default { name: 'StandDetainTrain', @@ -146,7 +147,7 @@ export default { this.disabledConfirm1 = false; this.disabledConfirm2 = true; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); + mouseCancelState(this.selected); }, SelectChange() { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue index 2abf61684..96aebeafd 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue @@ -32,6 +32,7 @@ import { mapGetters } from 'vuex'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; +import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus'; export default { name: 'RouteLock', @@ -88,7 +89,7 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); + mouseCancelState(this.selected); }, commit() { if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue index df5d39a63..215878598 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue @@ -64,6 +64,7 @@ import { mapGetters } from 'vuex'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus'; export default { name: 'StandDetainTrain', @@ -187,7 +188,7 @@ export default { this.sectionCode = ''; this.messageText2 = ''; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); + mouseCancelState(this.selected); }, SelectChange() { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue index 2d8914afc..93b1e6f44 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue @@ -35,7 +35,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import OperationHandler from '@/scripts/cmdPlugin/OperationHandler'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; -import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; +import { commitOperate } from '@/jmapNew/theme/components/utils/menuOperate'; import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config'; export default { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue index d1e3d2dd8..54d202939 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue @@ -39,6 +39,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import OperationHandler from '@/scripts/cmdPlugin/OperationHandler'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus'; import { mapGetters } from 'vuex'; export default { @@ -159,7 +160,7 @@ export default { this.dialogShow = false; this.operation = ''; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); + mouseCancelState(this.selected); }, handleSelectionChangeUp(val) { this.upSelectList = val; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue index 7dd519532..d368080fe 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue @@ -45,6 +45,7 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; +import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus'; export default { name: 'StandDetail', @@ -207,7 +208,7 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); + mouseCancelState(this.selected); }, commit() { const operate = { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue index 42f8e9a05..ed5cd298c 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue @@ -1,388 +1,401 @@ \ No newline at end of file +}; + diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue index 0727f5a85..7b628d6f9 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue @@ -46,6 +46,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus'; import { mapGetters } from 'vuex'; export default { @@ -182,7 +183,7 @@ export default { this.restoreBeforeDevices(); this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); + mouseCancelState(this.selected); }, restoreBeforeDevices() { // 恢复之前选中设备 diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationHumanControlAll.vue index 10d637e3b..97820f35b 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationHumanControlAll.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationHumanControlAll.vue @@ -27,8 +27,10 @@ - diff --git a/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue index 12a77e070..db07cb3b6 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue @@ -163,7 +163,6 @@ export default { doClose() { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, handleMessage(message) { if (message == 'open') { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/popupAlarm.vue deleted file mode 100644 index c62af4396..000000000 --- a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/popupAlarm.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - diff --git a/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue b/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue index 2aadf6e42..111bf330c 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue @@ -127,7 +127,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/routeHandControl.vue index e0d307686..5862a174d 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/routeHandControl.vue @@ -190,7 +190,6 @@ export default { this.dialogShow = false; this.$refs.tempTable.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, changeCheck(check, code) { if (check) { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/routeLock.vue b/src/jmapNew/theme/xian_02/menus/dialog/routeLock.vue index ac919ec4c..88a3c8daa 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/routeLock.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/routeLock.vue @@ -132,7 +132,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/routeSelection.vue b/src/jmapNew/theme/xian_02/menus/dialog/routeSelection.vue index bb3a8ac19..dfaec32e3 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/routeSelection.vue @@ -122,7 +122,6 @@ export default { this.restoreBeforeDevices(); this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, restoreBeforeDevices() { // 恢复之前选中设备 diff --git a/src/jmapNew/theme/xian_02/menus/dialog/routeUnLock.vue b/src/jmapNew/theme/xian_02/menus/dialog/routeUnLock.vue index d23bcf4c8..332ef6bca 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/routeUnLock.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/routeUnLock.vue @@ -146,7 +146,6 @@ export default { this.disabledConfirm1 = false; this.disabledConfirm2 = true; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, SelectChange() { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/routerCommand.vue b/src/jmapNew/theme/xian_02/menus/dialog/routerCommand.vue index 7970f6210..c5cf6c675 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/routerCommand.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/routerCommand.vue @@ -88,7 +88,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue index 2e00422b0..2bcfa20d1 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue @@ -96,7 +96,6 @@ export default { doClose() { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { this.$store.dispatch('menuOperation/pushRequestList', { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/xian_02/menus/dialog/standBackStrategy.vue index 24368901b..ce72a84a7 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/standBackStrategy.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/standBackStrategy.vue @@ -183,7 +183,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { if (this.isConfirm) { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/xian_02/menus/dialog/standBulkBuckleTrain.vue index 7f74123ee..7fa943c05 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/standBulkBuckleTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/standBulkBuckleTrain.vue @@ -159,7 +159,6 @@ export default { this.dialogShow = false; this.operation = ''; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, handleSelectionChangeUp(val) { this.upSelectList = val; diff --git a/src/jmapNew/theme/xian_02/menus/dialog/standControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/standControl.vue index 087624218..cc40435b1 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/standControl.vue @@ -257,7 +257,6 @@ export default { this.dialogShow = false; this.operation = ''; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, changeRadio(val) { // 提前发车选择上下行 const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/standDetail.vue b/src/jmapNew/theme/xian_02/menus/dialog/standDetail.vue index ac531fe55..36204f77f 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/standDetail.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/standDetail.vue @@ -207,7 +207,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/standJumpStopControl.vue index 978c2d759..c180f164b 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/standJumpStopControl.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/standJumpStopControl.vue @@ -224,7 +224,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/xian_02/menus/dialog/standRunLevel.vue index c4441c038..66ed5ab09 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/standRunLevel.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/standRunLevel.vue @@ -283,7 +283,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { if (this.isConfirm) { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/standStopTime.vue b/src/jmapNew/theme/xian_02/menus/dialog/standStopTime.vue index af86a13f0..5436cb0fd 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/standStopTime.vue @@ -155,7 +155,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, chooseControl(control) { /** 自动时的默认时间*/ diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue index 1777f2bd1..7562d79bd 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue @@ -144,7 +144,8 @@ export default { } }, domIdStop() { - if (this.dialogShow) {w + if (this.dialogShow) { + w; if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) { /** 上电解锁*/ return OperationEvent.Station.powerUnLock.stop.domId; @@ -234,7 +235,6 @@ export default { doClose() { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, command() { if (this.operation == OperationEvent.Station.powerUnLock.menu.operation || diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue index 27c56143e..6a90500ed 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue @@ -182,7 +182,6 @@ export default { this.restoreBeforeDevices(); this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, restoreBeforeDevices() { // 恢复之前选中设备 diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationHumanControlAll.vue index f408affeb..a571a47da 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/stationHumanControlAll.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/stationHumanControlAll.vue @@ -79,7 +79,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationSetRouteControlAll.vue index dc587c940..14b9367a3 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/stationSetRouteControlAll.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/stationSetRouteControlAll.vue @@ -97,7 +97,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/switchUnLock.vue b/src/jmapNew/theme/xian_02/menus/dialog/switchUnLock.vue index 47a5df3bc..83333ff34 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/switchUnLock.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/switchUnLock.vue @@ -171,7 +171,6 @@ export default { this.disabledConfirm1 = false; this.disabledConfirm2 = true; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, SelectChange() { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDefine.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDefine.vue index e357d0176..162645da5 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainDefine.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDefine.vue @@ -114,7 +114,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDelete.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDelete.vue index 292c2795a..5f5e6eaae 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainDelete.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDelete.vue @@ -110,7 +110,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue index f97f208cd..c5239d392 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue @@ -124,7 +124,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainEdit.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainEdit.vue index 200aaf209..642483dce 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainEdit.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainEdit.vue @@ -114,7 +114,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainFlag.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainFlag.vue index 88f826ac3..a066039f4 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainFlag.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainFlag.vue @@ -106,7 +106,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, commit() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainMove.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainMove.vue index 00d68a89c..c01c67cb6 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainMove.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainMove.vue @@ -114,7 +114,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainSetHead.vue index 0a993fe12..6b627fc2f 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainSetHead.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainSetHead.vue @@ -114,7 +114,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainSetPlan.vue index 5c2df48e1..352cc5f35 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainSetPlan.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainSetPlan.vue @@ -107,7 +107,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainSetWork.vue index 9597562e0..8aba94cd9 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainSetWork.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainSetWork.vue @@ -98,7 +98,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainSetWorkATP.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainSetWorkATP.vue index b7935ad7b..d3b0b8b9a 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainSetWorkATP.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainSetWorkATP.vue @@ -109,7 +109,6 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); - this.mouseCancelState(this.selected); }, inputGroupNumber() { const operate = { diff --git a/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue index 583b9ca07..4229d04fc 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue @@ -126,7 +126,6 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - this.mouseCancelState(this.selected); }, commit() { if (this.operation == OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation) { diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue index 7b3a63bd8..9a6cd12a3 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ import PopMenu from '@/components/PopMenu/index'; import SectionControl from '@/jmapNew/theme/components/menus/dialog/sectionControl'; import SectionUnLock from './dialog/sectionUnLock'; import SpeedLimitControl from './dialog/speedLimitControl'; -import AlxeEffective from './dialog/alxeEffective'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; @@ -30,7 +28,6 @@ export default { SectionControl, SectionUnLock, SpeedLimitControl, - AlxeEffective, NoticeInfo }, props: { @@ -236,14 +233,6 @@ export default { } }); }, - // 确认计轴有效 - alxeEffective() { - commitOperate(menuOperate.Section.alxeEffective, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{ - if (valid) { - this.$refs.alxeEffective.doShow(operate, this.selected); - } - }); - }, // 区段激活 active() { commitOperate(menuOperate.Section.active, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{ diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue index f2993e51b..f6b25bdcd 100644 --- a/src/jmapNew/theme/xian_02/menus/menuStation.vue +++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue @@ -211,7 +211,6 @@ export default { operation: OperationEvent.Station.stoppage.menu.operation }; - this.mouseCancelState(this.selected); this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); @@ -230,8 +229,6 @@ export default { code: this.selected.code, operation: OperationEvent.Station.cancelStoppage.menu.operation }; - - this.mouseCancelState(this.selected); this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue index 5be14c7c5..b98f3617e 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ import PopMenu from '@/components/PopMenu/index'; import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl'; import SwitchUnLock from './dialog/switchUnLock'; import SpeedLimitControl from './dialog/speedLimitControl'; -import AlxeEffective from './dialog/alxeEffective'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; @@ -30,7 +28,6 @@ export default { SwitchControl, SwitchUnLock, SpeedLimitControl, - AlxeEffective, NoticeInfo }, props: { @@ -324,14 +321,6 @@ export default { } }); }, - // 确认计轴有效 - alxeEffective() { - commitOperate(menuOperate.Switch.alxeEffective, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ - if (valid) { - this.$refs.alxeEffective.doShow(operate, this.selected); - } - }); - }, enabledConfirm() { this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index 0a86f8296..9e80b6926 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -287,7 +287,6 @@ export default { operation: OperationEvent.Train.stoppage.menu.operation }; - this.mouseCancelState(this.selected); this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); @@ -307,7 +306,6 @@ export default { operation: OperationEvent.Train.cancelStoppage.menu.operation }; - this.mouseCancelState(this.selected); this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); diff --git a/src/layout/components/userInfo.vue b/src/layout/components/userInfo.vue index a62d5cff9..379d82b0a 100644 --- a/src/layout/components/userInfo.vue +++ b/src/layout/components/userInfo.vue @@ -4,6 +4,7 @@ :title="$t('global.personalDetails')" :visible.sync="visible" width="470px" + :close-on-click-modal="false" :before-close="doClose" class="userInfo_box" > @@ -253,6 +254,24 @@
绑定微信成功
+
+
绑定微信:
+
+ 生成微信二维码 + +
绑定微信成功
+
+
{{ $t('global.close') }} @@ -271,7 +290,8 @@ import { getUserinfoEmailCode, getUserinfoEmail, getUserinfoPassword, - getWxQrCode + getWxQrCode, + getBindWxQrCodeUrl } from '@/api/management/user'; import QrcodeVue from 'qrcode.vue'; import { LoginParams } from '@/utils/login'; @@ -341,7 +361,8 @@ export default { loginClient: 'LianKeTang', project:'', wxUnionId: '', - wxOpenId: '' + wxOpenId: '', + wmOpenId: '' }; }, computed: { @@ -377,6 +398,7 @@ export default { }; this.wxUnionId = user.wxUnionId; this.wxOpenId = user.wxOpenId; + this.wmOpenId = user.wmOpenId || ''; this.oldPassWord = user.password; this.nationCode = user.nationCode ? user.nationCode : '86'; this.nationCodeInit = user.nationCode @@ -558,6 +580,13 @@ export default { this.checkLoginStatus(); }); }, + generateBindQrCode() { // 获取微信小程序绑定二维码 + getBindWxQrCodeUrl().then(response => { + this.loadingCode = false; + this.loginUrl = response.data.url; + this.binding = true; + }); + }, checkLoginStatus() { const self = this; // 销毁则不再定时 diff --git a/src/permission.js b/src/permission.js index 1a025ad91..552e0ff60 100644 --- a/src/permission.js +++ b/src/permission.js @@ -42,7 +42,8 @@ function getRouteInfo(to) { } if (isDesignPage(toRoutePath)) { - loginPath = loginDesignPage; + const whitePage = PermissionParam[current_session] ? PermissionParam[current_session].whitePage : ''; + loginPath = whitePage || loginDesignPage; if (current_session && !current_session.startsWith('design')) { removeToken(); } diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 174a68a1c..328f614ae 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -43,7 +43,6 @@ const News = () => import('@/views/system/news/index'); const CommandDictionary = () => import('@/views/system/commandDictionary/index'); const CommandDictionaryDetail = () => import('@/views/system/commandDictionary/edit'); const configLine = () => import('@/views/system/configLine/index'); -// const Mapedit = () => import('@/views/mapdraft/index'); const IscsSystem = () => import('@/views/iscs/iscsSystem/index'); const IscsDraw = () => import('@/views/iscs/iscsDraw/index'); @@ -786,14 +785,14 @@ export const asyncRouter = [ meta: { i18n: 'router.configLine' } - }, - { - path: 'deviceManage', - component: DeviceManage, - meta: { - i18n: 'router.deviceManage' - } } + // { + // path: 'deviceManage', + // component: DeviceManage, + // meta: { + // i18n: 'router.deviceManage' + // } + // } ] }, { // 发布申请 @@ -988,7 +987,7 @@ export const asyncRouter = [ ] } ]; - +/* merge 是否再路由处理中与asyncRouter进行合并 mergeIndex合并进入asyncRouter【mergeIndex】 慎重调整asyncRouter顺序 */ export const projectRoute = { designgzb: [ { @@ -1010,6 +1009,46 @@ export const projectRoute = { } } ] + }, + { // 系统管理 + path: '/system', + component: Layout, + merge: true, + mergeIndex: 4, + meta: { + i18n: 'router.systemManage', + roles: [admin] + }, + children: [ + { + path: 'deviceManage', + component: DeviceManage, + meta: { + i18n: 'router.deviceManage' + } + } + ] + } + ], + designxty: [ + { // 系统管理 + path: '/system', + component: Layout, + merge: true, + mergeIndex: 4, + meta: { + i18n: 'router.systemManage', + roles: [admin] + }, + children: [ + { + path: 'deviceManage', + component: DeviceManage, + meta: { + i18n: 'router.deviceManage' + } + } + ] } ] }; diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 9acc93bc8..165da3044 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -71,7 +71,7 @@ export default { CMD_DRIVER_GEAR_CHANGE:{value:'Driver_Gear_Change', label:'改变列车档位'}, CMD_DRIVER_ATO_OPEN:{value:'Driver_ATO_Open', label:'开启ATO'}, CMD_DRIVER_ATP_CHANGE:{value:'Driver_ATP_Change', label:'改变ATP状态'}, - CMD_DRIVER_Drive_MODE_CHANGE:{value:'Driver_Drive_Mode_Change', label:'改变列车运行模式'}, + CMD_DRIVER_DRIVE_MODE_CHANGE:{value:'Driver_Drive_Mode_Change', label:'改变列车运行模式'}, CMD_DRIVER_CHANGE_HEAD:{value:'Driver_Change_Head', label:'换端'}, CMD_DRIVER_DOOR_ON_OFF:{value:'Driver_Door_On_Off', label:'列车车门开关'} }, diff --git a/src/store/modules/map.js b/src/store/modules/map.js index a3cbc6e43..cd8c99d51 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -206,6 +206,7 @@ const map = { mousemove: 0, // 实训战场图移动标识 version: '', // 地图版本, activeTrainListUpdate:0, // 当前按计划行车的列车列表更新标识 + activeTrainList:[], // 当前按计划行车的列车列表 runPlanStatus:false, // 是否正处于按计划行车 showCentralizedStationCode: '', // 现地分集中站显示(集中站code) showCentralizedStationNum: 0, // 现地分集中站显示判断 @@ -731,6 +732,7 @@ const map = { }, resetActiveTrainList:(state) => { state.activeTrainListUpdate = 0; + state.activeTrainList = []; }, setDeleteCount: (state) => { state.deleteCount++; @@ -830,13 +832,14 @@ const map = { } }); }, - updateTrainList: (state, data)=>{ - const trainList = state.map.trainList; - trainList.forEach(elem => { - if (elem.code == data.code) { - elem = deepAssign(elem || {}, data); + updateActiveTrainList: (state, data)=>{ + let isExist = false; + state.activeTrainList.forEach(elem => { + if (elem == data.code) { + isExist = true; } }); + if (!isExist) { state.activeTrainList.push(data.code); } } }, @@ -911,9 +914,9 @@ const map = { } }, - // 更新列车信息 - updateTrainList:({ commit }, train) => { - commit('updateTrainList', train); + // 更新激活的列车信息 + updateActiveTrainList:({ commit }, train) => { + commit('updateActiveTrainList', train); }, setMapDataIdList: ({ state }, data) => { diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 888634f42..1564245c2 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -40,9 +40,27 @@ function resetAsyncRouter({ systemType }) { } else if (systemType == projectXian) { list = [...list, ...asyncRouter]; } else if (systemType == projectXty) { + if (projectRoute.designxty && projectRoute.designxty.length) { + projectRoute.designxty.forEach(item => { + if (item.merge) { + asyncRouter[item.mergeIndex].children = [...asyncRouter[item.mergeIndex].children, ...item.children]; + } else { + list.push(item); + } + }); + } list = [...list, ...asyncRouter]; } else if (systemType == projectGzzb) { - list = [...list, ...asyncRouter, ...projectRoute.designgzb]; + if (projectRoute.designgzb && projectRoute.designgzb.length) { + projectRoute.designgzb.forEach(item => { + if (item.merge) { + asyncRouter[item.mergeIndex].children = [...asyncRouter[item.mergeIndex].children, ...item.children]; + } else { + list.push(item); + } + }); + } + list = [...list, ...asyncRouter]; } else if (systemType == projectJsxt) { list = [...list, ...JSXT]; } else if (systemType == projectJyd) { diff --git a/src/store/modules/scriptRecord.js b/src/store/modules/scriptRecord.js index eb4f46783..b67204a37 100644 --- a/src/store/modules/scriptRecord.js +++ b/src/store/modules/scriptRecord.js @@ -9,7 +9,9 @@ const scriptRecord = { scriptId: '', bgSet: false, isScriptCommand:false, // 当前是否为添加剧本动作指令状态 - scriptCommand:{} // 剧本动作添加的指令 + scriptCommand:{}, // 剧本动作添加的指令 + updateRoleStatus:0, // 剧本更新角色标志 + userRole:null // 剧本更新的角色 }, getters: { mapLocation: (state)=>{ @@ -29,6 +31,9 @@ const scriptRecord = { }, scriptCommand:(state)=>{ return state.scriptCommand; + }, + updateRoleStatus:(state)=>{ + return state.updateRoleStatus; } }, mutations: { @@ -49,6 +54,10 @@ const scriptRecord = { }, setScriptCommand:(state, scriptCommand) => { state.scriptCommand = scriptCommand; + }, + updateRole:(state, userRole) => { + state.updateRoleStatus += 1; + state.userRole = userRole; } }, actions: { @@ -72,6 +81,9 @@ const scriptRecord = { }, updateScriptCommand:({ commit }, scriptCommand) => { commit('setScriptCommand', scriptCommand); + }, + updateRole:({ commit }, userRole) => { + commit('updateRole', userRole); } } }; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 55d352581..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,10 +2,10 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 - BASE_API = 'http://192.168.3.41:9000'; // 张赛 + // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 diff --git a/src/utils/index.js b/src/utils/index.js index 74f5b079d..f5642c875 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -160,3 +160,27 @@ export function deepAssign(obj, item) { return Object.assign(obj, target); } +// 对象深拷贝并赋值 +export function deepAssigns(obj, item) { + const target = item.constructor === Array ? [] : {}; // 判断复制的目标是数组还是对象 + for (const keys in obj) { + if (item.hasOwnProperty(keys) && keys != 'instance') { // instance 对面不拷贝 + if (item[keys] && typeof item[keys] == 'object') { // 如果值是对象,就递归一下 + const targetObj = item[keys].constructor == Array ? [] : {}; + target[keys] = deepAssign(targetObj, item[keys]); + } else { + target[keys] = item[keys]; + } + } else { + if (typeof obj[keys] == 'boolean') { + target[keys] = false; + } else if (typeof obj[keys] == 'number') { + target[keys] = 0; + } else if (typeof obj[keys] == 'string') { + target[keys] = ''; + } + } + } + return Object.assign(obj, target); +} + diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue index 131e5039f..4ed067adb 100644 --- a/src/views/lesson/home.vue +++ b/src/views/lesson/home.vue @@ -140,7 +140,7 @@ export default { }, hasRelease() { return this.$store.state.user.roles.includes('04') || - this.$store.state.user.roles.includes('05'); + this.$store.state.user.roles.includes('05') || this.$store.state.user.roles.includes('03'); } }, watch: { diff --git a/src/views/lesson/lessoncategory/edit/lesson/publish.vue b/src/views/lesson/lessoncategory/edit/lesson/publish.vue index 5518b2275..0fc49a88f 100644 --- a/src/views/lesson/lessoncategory/edit/lesson/publish.vue +++ b/src/views/lesson/lessoncategory/edit/lesson/publish.vue @@ -76,7 +76,7 @@ export default { }, hasRelease() { return this.$store.state.user.roles.includes('04') || - this.$store.state.user.roles.includes('05'); + this.$store.state.user.roles.includes('05') || this.$store.state.user.roles.includes('03'); }, isProject() { return getSessionStorage('project').endsWith('gzb'); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index b7035e491..56d232123 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -151,7 +151,6 @@ export default { loadingCode: false, checkLogin: null, checkTimeout: null, - scanSuccess: false, pwdDisplay: true, cookiesName: 'UserName', cookiesToken: 'UserToken', @@ -251,11 +250,11 @@ export default { this.sessionId = response.data.sessionId; this.loginUrl = response.data.url; this.loadingCode = false; - this.clearTimer(this.checkTimeout); - this.checkTimeout = setTimeout(() => { - this.loadingCode = true; - this.loginUrl = ''; - }, 3 * 60 * 1000); + // this.clearTimer(this.checkTimeout); + // this.checkTimeout = setTimeout(() => { + // this.loadingCode = true; + // this.loginUrl = ''; + // }, 3 * 60 * 1000); this.checkLoginStatus(); }).catch(() => { this.loadingCode = false; @@ -281,10 +280,12 @@ export default { this.handleLoginSucessRoute(); }); }).catch(error => { - if (error.data && error.data.status === 'WAIT') { - self.scanSuccess = true; + if (error.data && error.data.status === 'EXPIRE') { + this.loadingCode = true; + this.loginUrl = ''; + } else { + self.checkLoginStatus(); } - self.checkLoginStatus(); }); }, 3000); }, diff --git a/src/views/mapdraft/configMap.vue b/src/views/mapdraft/configMap.vue deleted file mode 100644 index 739ed64ff..000000000 --- a/src/views/mapdraft/configMap.vue +++ /dev/null @@ -1,233 +0,0 @@ - - - - - diff --git a/src/views/mapdraft/dataRelation/automaticoperate/detail.vue b/src/views/mapdraft/dataRelation/automaticoperate/detail.vue deleted file mode 100644 index 69c86bd14..000000000 --- a/src/views/mapdraft/dataRelation/automaticoperate/detail.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/automaticoperate/index.vue b/src/views/mapdraft/dataRelation/automaticoperate/index.vue deleted file mode 100644 index f34b6496f..000000000 --- a/src/views/mapdraft/dataRelation/automaticoperate/index.vue +++ /dev/null @@ -1,84 +0,0 @@ - - diff --git a/src/views/mapdraft/dataRelation/automaticoperate/route.vue b/src/views/mapdraft/dataRelation/automaticoperate/route.vue deleted file mode 100644 index ed6fcfee0..000000000 --- a/src/views/mapdraft/dataRelation/automaticoperate/route.vue +++ /dev/null @@ -1,237 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/espOperate/index.vue b/src/views/mapdraft/dataRelation/espOperate/index.vue deleted file mode 100644 index fd4b5353f..000000000 --- a/src/views/mapdraft/dataRelation/espOperate/index.vue +++ /dev/null @@ -1,154 +0,0 @@ - - diff --git a/src/views/mapdraft/dataRelation/index.vue b/src/views/mapdraft/dataRelation/index.vue deleted file mode 100644 index bae9e2fb3..000000000 --- a/src/views/mapdraft/dataRelation/index.vue +++ /dev/null @@ -1,252 +0,0 @@ - - - - diff --git a/src/views/mapdraft/dataRelation/pathoperate/detail.vue b/src/views/mapdraft/dataRelation/pathoperate/detail.vue deleted file mode 100644 index 3861174e8..000000000 --- a/src/views/mapdraft/dataRelation/pathoperate/detail.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/pathoperate/index.vue b/src/views/mapdraft/dataRelation/pathoperate/index.vue deleted file mode 100644 index 191c9df12..000000000 --- a/src/views/mapdraft/dataRelation/pathoperate/index.vue +++ /dev/null @@ -1,84 +0,0 @@ - - diff --git a/src/views/mapdraft/dataRelation/pathoperate/pathRoute.vue b/src/views/mapdraft/dataRelation/pathoperate/pathRoute.vue deleted file mode 100644 index 25ae9d74a..000000000 --- a/src/views/mapdraft/dataRelation/pathoperate/pathRoute.vue +++ /dev/null @@ -1,200 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/pathoperate/route.vue b/src/views/mapdraft/dataRelation/pathoperate/route.vue deleted file mode 100644 index feaecfac7..000000000 --- a/src/views/mapdraft/dataRelation/pathoperate/route.vue +++ /dev/null @@ -1,293 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/psdOperate/index.vue b/src/views/mapdraft/dataRelation/psdOperate/index.vue deleted file mode 100644 index b71ca8f56..000000000 --- a/src/views/mapdraft/dataRelation/psdOperate/index.vue +++ /dev/null @@ -1,154 +0,0 @@ - - diff --git a/src/views/mapdraft/dataRelation/routeoperate/detail.vue b/src/views/mapdraft/dataRelation/routeoperate/detail.vue deleted file mode 100644 index 68ecf6fd0..000000000 --- a/src/views/mapdraft/dataRelation/routeoperate/detail.vue +++ /dev/null @@ -1,446 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/routeoperate/index.vue b/src/views/mapdraft/dataRelation/routeoperate/index.vue deleted file mode 100644 index 33ace43fb..000000000 --- a/src/views/mapdraft/dataRelation/routeoperate/index.vue +++ /dev/null @@ -1,85 +0,0 @@ - - diff --git a/src/views/mapdraft/dataRelation/routeoperate/preview.vue b/src/views/mapdraft/dataRelation/routeoperate/preview.vue deleted file mode 100644 index 09b2554ee..000000000 --- a/src/views/mapdraft/dataRelation/routeoperate/preview.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/routeoperate/related.vue b/src/views/mapdraft/dataRelation/routeoperate/related.vue deleted file mode 100644 index efd8c828d..000000000 --- a/src/views/mapdraft/dataRelation/routeoperate/related.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/routeoperate/route.vue b/src/views/mapdraft/dataRelation/routeoperate/route.vue deleted file mode 100644 index 1ef7cc5bc..000000000 --- a/src/views/mapdraft/dataRelation/routeoperate/route.vue +++ /dev/null @@ -1,541 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/routingoperate/detail.vue b/src/views/mapdraft/dataRelation/routingoperate/detail.vue deleted file mode 100644 index 93f36fbfa..000000000 --- a/src/views/mapdraft/dataRelation/routingoperate/detail.vue +++ /dev/null @@ -1,251 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/routingoperate/index.vue b/src/views/mapdraft/dataRelation/routingoperate/index.vue deleted file mode 100644 index 888de5cee..000000000 --- a/src/views/mapdraft/dataRelation/routingoperate/index.vue +++ /dev/null @@ -1,84 +0,0 @@ - - diff --git a/src/views/mapdraft/dataRelation/routingoperate/preview.vue b/src/views/mapdraft/dataRelation/routingoperate/preview.vue deleted file mode 100644 index 2392047b5..000000000 --- a/src/views/mapdraft/dataRelation/routingoperate/preview.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/routingoperate/route.vue b/src/views/mapdraft/dataRelation/routingoperate/route.vue deleted file mode 100644 index a7bdcd243..000000000 --- a/src/views/mapdraft/dataRelation/routingoperate/route.vue +++ /dev/null @@ -1,377 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/signaloperate/detail.vue b/src/views/mapdraft/dataRelation/signaloperate/detail.vue deleted file mode 100644 index e61a029c1..000000000 --- a/src/views/mapdraft/dataRelation/signaloperate/detail.vue +++ /dev/null @@ -1,173 +0,0 @@ - - - diff --git a/src/views/mapdraft/dataRelation/signaloperate/index.vue b/src/views/mapdraft/dataRelation/signaloperate/index.vue deleted file mode 100644 index eb4fb632b..000000000 --- a/src/views/mapdraft/dataRelation/signaloperate/index.vue +++ /dev/null @@ -1,84 +0,0 @@ - - diff --git a/src/views/mapdraft/dataRelation/signaloperate/route.vue b/src/views/mapdraft/dataRelation/signaloperate/route.vue deleted file mode 100644 index ffbc56bf6..000000000 --- a/src/views/mapdraft/dataRelation/signaloperate/route.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - diff --git a/src/views/mapdraft/index.vue b/src/views/mapdraft/index.vue deleted file mode 100644 index d1e642c5c..000000000 --- a/src/views/mapdraft/index.vue +++ /dev/null @@ -1,427 +0,0 @@ - - - diff --git a/src/views/mapdraft/mapoperate/ImageControl.vue b/src/views/mapdraft/mapoperate/ImageControl.vue deleted file mode 100644 index 2552c1afc..000000000 --- a/src/views/mapdraft/mapoperate/ImageControl.vue +++ /dev/null @@ -1,276 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/buttonDraft.vue b/src/views/mapdraft/mapoperate/buttonDraft.vue deleted file mode 100644 index 8a4c6b97d..000000000 --- a/src/views/mapdraft/mapoperate/buttonDraft.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/checkboxDraft.vue b/src/views/mapdraft/mapoperate/checkboxDraft.vue deleted file mode 100644 index 828ad259c..000000000 --- a/src/views/mapdraft/mapoperate/checkboxDraft.vue +++ /dev/null @@ -1,197 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/config/data.vue b/src/views/mapdraft/mapoperate/config/data.vue deleted file mode 100644 index 36e6e02ce..000000000 --- a/src/views/mapdraft/mapoperate/config/data.vue +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - diff --git a/src/views/mapdraft/mapoperate/config/list.vue b/src/views/mapdraft/mapoperate/config/list.vue deleted file mode 100644 index 4f5c3faa3..000000000 --- a/src/views/mapdraft/mapoperate/config/list.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - diff --git a/src/views/mapdraft/mapoperate/counter.vue b/src/views/mapdraft/mapoperate/counter.vue deleted file mode 100644 index fe9f4760c..000000000 --- a/src/views/mapdraft/mapoperate/counter.vue +++ /dev/null @@ -1,255 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/delayunlock.vue b/src/views/mapdraft/mapoperate/delayunlock.vue deleted file mode 100644 index 3f50a5633..000000000 --- a/src/views/mapdraft/mapoperate/delayunlock.vue +++ /dev/null @@ -1,237 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/index.vue b/src/views/mapdraft/mapoperate/index.vue deleted file mode 100644 index 171e6b2cb..000000000 --- a/src/views/mapdraft/mapoperate/index.vue +++ /dev/null @@ -1,453 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/lcControl.vue b/src/views/mapdraft/mapoperate/lcControl.vue deleted file mode 100644 index 85ab25e8c..000000000 --- a/src/views/mapdraft/mapoperate/lcControl.vue +++ /dev/null @@ -1,255 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/limitControl.vue b/src/views/mapdraft/mapoperate/limitControl.vue deleted file mode 100644 index ca371e788..000000000 --- a/src/views/mapdraft/mapoperate/limitControl.vue +++ /dev/null @@ -1,246 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/line.vue b/src/views/mapdraft/mapoperate/line.vue deleted file mode 100644 index ea5127960..000000000 --- a/src/views/mapdraft/mapoperate/line.vue +++ /dev/null @@ -1,310 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/link.vue b/src/views/mapdraft/mapoperate/link.vue deleted file mode 100644 index 4eda10514..000000000 --- a/src/views/mapdraft/mapoperate/link.vue +++ /dev/null @@ -1,551 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/section.vue b/src/views/mapdraft/mapoperate/section.vue deleted file mode 100644 index b1f2ad1bb..000000000 --- a/src/views/mapdraft/mapoperate/section.vue +++ /dev/null @@ -1,1238 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/signal.vue b/src/views/mapdraft/mapoperate/signal.vue deleted file mode 100644 index 02565de38..000000000 --- a/src/views/mapdraft/mapoperate/signal.vue +++ /dev/null @@ -1,445 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/station.vue b/src/views/mapdraft/mapoperate/station.vue deleted file mode 100644 index 94e462aec..000000000 --- a/src/views/mapdraft/mapoperate/station.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/stationcontrol.vue b/src/views/mapdraft/mapoperate/stationcontrol.vue deleted file mode 100644 index a074e67ec..000000000 --- a/src/views/mapdraft/mapoperate/stationcontrol.vue +++ /dev/null @@ -1,254 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/stationstand.vue b/src/views/mapdraft/mapoperate/stationstand.vue deleted file mode 100644 index 93d71d1bc..000000000 --- a/src/views/mapdraft/mapoperate/stationstand.vue +++ /dev/null @@ -1,308 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/switch.vue b/src/views/mapdraft/mapoperate/switch.vue deleted file mode 100644 index 4e764d272..000000000 --- a/src/views/mapdraft/mapoperate/switch.vue +++ /dev/null @@ -1,513 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/text.vue b/src/views/mapdraft/mapoperate/text.vue deleted file mode 100644 index 136a37d7c..000000000 --- a/src/views/mapdraft/mapoperate/text.vue +++ /dev/null @@ -1,272 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/train/create.vue b/src/views/mapdraft/mapoperate/train/create.vue deleted file mode 100644 index 249208f8b..000000000 --- a/src/views/mapdraft/mapoperate/train/create.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/train/index.vue b/src/views/mapdraft/mapoperate/train/index.vue deleted file mode 100644 index 4e9f34139..000000000 --- a/src/views/mapdraft/mapoperate/train/index.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/train/trainmodel.vue b/src/views/mapdraft/mapoperate/train/trainmodel.vue deleted file mode 100644 index 802171bd8..000000000 --- a/src/views/mapdraft/mapoperate/train/trainmodel.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/trainwindow.vue b/src/views/mapdraft/mapoperate/trainwindow.vue deleted file mode 100644 index 76072f9a7..000000000 --- a/src/views/mapdraft/mapoperate/trainwindow.vue +++ /dev/null @@ -1,309 +0,0 @@ - - - - diff --git a/src/views/mapdraft/mapoperate/zcControl.vue b/src/views/mapdraft/mapoperate/zcControl.vue deleted file mode 100644 index ba87a30cb..000000000 --- a/src/views/mapdraft/mapoperate/zcControl.vue +++ /dev/null @@ -1,253 +0,0 @@ - - - - diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue index 866a914d6..5955f57bc 100644 --- a/src/views/newMap/displayNew/chatView/chatBox.vue +++ b/src/views/newMap/displayNew/chatView/chatBox.vue @@ -11,7 +11,7 @@
-
+
@@ -19,7 +19,7 @@
- +
@@ -31,7 +31,7 @@ @@ -83,7 +83,6 @@ export default { minimize:true, bottom:15, recordSending:false, - currentCoversition:{}, memberListCoversition:{}, seconds:0, inter:null, @@ -132,6 +131,9 @@ export default { const objectBottom = parseInt(object.style.bottom) || 0; this.bottom = this.bottom + object.offsetHeight + objectBottom; } + }, + 'userRole':function(val) { + this.isHasCoversition = false; } }, @@ -159,7 +161,7 @@ export default { }, setCurrentCoversition(coversition) { if (coversition && coversition.id) { - this.currentCoversition = coversition; + // this.currentCoversition = coversition; this.headerTitle = coversition.name; } else { this.headerTitle = ''; @@ -175,9 +177,9 @@ export default { }, quitCoversition() { this.quitLoading = true; - quitCoversition(this.group, this.currentCoversition.id).then(res=>{ + quitCoversition(this.group, this.memberListCoversition.id).then(res=>{ this.quitLoading = false; - this.currentCoversition = {all:undefined, id:null}; + this.memberListCoversition = {all:undefined, id:null}; this.$refs.chatCoversitionList.initPage(true); this.isHasCoversition = false; }).catch(error=>{ @@ -191,7 +193,7 @@ export default { addCoversition({data, headerTitle}) { this.$refs.chatCoversitionList.addCoversition(data, headerTitle); this.isHasCoversition = true; - this.currentCoversition = {id:data.id, all:data.all}; + // this.currentCoversition = {id:data.id, all:data.all}; this.memberListCoversition = {id:data.id, all:data.all}; this.headerTitle = headerTitle; }, @@ -290,7 +292,7 @@ export default { const blob = that.recorders.getBlob(); const fd = new FormData(); fd.append('file', blob); - uploadAudioFileNew(that.group, that.form.language, that.form.sex, that.currentCoversition.id, fd) + uploadAudioFileNew(that.group, that.form.language, that.form.sex, that.memberListCoversition.id, fd) .then((data) => { }) .catch(error => { diff --git a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue index 04f3dfc30..91b3f9b6b 100644 --- a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue +++ b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue @@ -31,6 +31,9 @@ export default { 'userRole':function(val) { this.initPage(true); } + // '$store.state.scriptRecord.updateRoleStatus':function(val) { + // this.initPage(true); + // } }, mounted() { }, diff --git a/src/views/newMap/displayNew/chatView/chatMemberList.vue b/src/views/newMap/displayNew/chatView/chatMemberList.vue index a58adb699..b191b744e 100644 --- a/src/views/newMap/displayNew/chatView/chatMemberList.vue +++ b/src/views/newMap/displayNew/chatView/chatMemberList.vue @@ -49,6 +49,9 @@ export default { if (val) { this.getSimulationMembers(); } + }, + '$store.state.scriptRecord.updateRoleStatus':function(val) { + this.getSimulationMembers(); } }, mounted() { diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 718d7a064..d39fc155f 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -52,7 +52,7 @@ @showScheduling="showScheduling" /> - + 现地 @@ -326,6 +327,9 @@ export default { '$store.state.map.map': function (val) { this.showSelectStation = val.skinVO.code === '06' && this.$store.state.training.prdType === '01'; this.showSelectStation && this.setStationList(val); + }, + 'group':function(group) { + this.grouper = group; } }, async created() { @@ -335,15 +339,15 @@ export default { EventBus.$on('clearCheckLogin', () => { this.clearCheckLogin(); }); - + this.grouper = this.group; await this.setWindowSize(); await this.initLoadData(); }, - async beforeDestroy() { - await this.clearAllTimer(); - await this.quit(); - await this.$store.dispatch('training/reset'); - await this.$store.dispatch('map/mapClear'); + beforeDestroy() { + this.quit(this.grouper); + this.clearAllTimer(); + this.$store.dispatch('training/reset'); + this.$store.dispatch('map/mapClear'); EventBus.$off('clearCheckLogin'); }, methods: { @@ -577,9 +581,9 @@ export default { }, // 销毁仿真 - async quit() { - await clearSimulation(this.group); - await this.$store.dispatch('training/over'); + quit(group) { + clearSimulation(group); + this.$store.dispatch('training/over'); }, // 仿真错误时,被动退出时调用 async back() { @@ -624,10 +628,10 @@ export default { window.open(routeData.href, '_blank', 'noopener noreferrer'); } }, - script3ddriveshow(){ - this.panelShow = false; - this.drivingShow = true; - this.$refs.Jl3dDrive.show(this.mapId, this.group); + script3ddriveshow() { + this.panelShow = false; + this.drivingShow = true; + this.$refs.Jl3dDrive.show(this.mapId, this.group); }, passflow() { const routeData = this.$router.resolve({ diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue index bc9c97560..ca523e4b9 100644 --- a/src/views/newMap/displayNew/menuDemon.vue +++ b/src/views/newMap/displayNew/menuDemon.vue @@ -221,6 +221,7 @@ export default { this.$store.dispatch('training/over').then(() => { this.$store.dispatch('training/setMapDefaultState').then(() => { this.$store.dispatch('map/setRunPlanStatus', false); + this.$store.dispatch('map/resetActiveTrainList'); this.$store.dispatch('map/clearJlmapTrainView'); this.$store.dispatch('map/setTrainWindowShow', false); }); diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue index eed2bfb73..65a3ea535 100644 --- a/src/views/newMap/displayNew/menuScript.vue +++ b/src/views/newMap/displayNew/menuScript.vue @@ -7,7 +7,7 @@ 重置剧本 --> - {{ $t('joinTraining.driverPerspective') }} + {{ $t('joinTraining.driverPerspective') }} {{ $t('scriptRecord.drivingByPlan') }} 初始化 {{ $t('scriptRecord.scriptBack') }} @@ -88,7 +88,7 @@ export default { } else if (this.$store.state.training.prdType == null) { return ''; } else { - return 'AUDIENCE'; + return this.$store.state.scriptRecord.userRole ? this.$store.state.scriptRecord.userRole : 'AUDIENCE'; } } }, @@ -200,7 +200,7 @@ export default { }); }, jumpjlmap3d() { - this.$emit('script3ddriveshow'); + this.$emit('script3ddriveshow'); }, async loadSystemTime() { diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue index 3e2b95207..3d519871d 100644 --- a/src/views/newMap/displayNew/menuTrainList.vue +++ b/src/views/newMap/displayNew/menuTrainList.vue @@ -71,19 +71,26 @@ export default { watch:{ '$store.state.map.activeTrainListUpdate': function (val) { if (val) { - const trainList = this.$store.state.map.map.trainList; + const activeTrainList = this.$store.state.map.activeTrainList; if (this.lineCode == '10' || this.lineCode == '11') { - this.topTrainList = trainList.filter((train)=>{ + this.topTrainList = []; + this.bottomTrainList = []; + activeTrainList.forEach((trainCode)=>{ // train.serviceNumber != '' && train.serviceNumber != undefined && - return !train.right && train.sectionCode; - }); - this.bottomTrainList = trainList.filter((train)=>{ - // train.serviceNumber != '' && train.serviceNumber != undefined && - return train.right && train.sectionCode; + const train = this.$store.getters['map/getDeviceByCode'](trainCode); + if (train && !train.right && train.sectionCode) { + this.topTrainList.push(train); + } else if (train && train.right && train.sectionCode) { + this.bottomTrainList.push(train); + } }); } else { - this.trainList = trainList.filter((train)=>{ - return train.serviceNumber != '' && train.serviceNumber != undefined && train.sectionCode; + this.trainList = []; + activeTrainList.forEach((trainCode)=>{ + const train = this.$store.getters['map/getDeviceByCode'](trainCode); + if (train && train.sectionCode) { + this.trainList.push(train); + } }); } } else { @@ -91,11 +98,6 @@ export default { this.bottomTrainList = []; this.trainList = []; } - }, - '$store.state.map.runPlanStatus': function (val) { - if (!val) { - this.$store.dispatch('map/resetActiveTrainList'); - } } }, mounted() { @@ -116,11 +118,14 @@ export default { this.$emit('setCenter', code); }, covert(data) { - let min = (Math.abs(data) - Math.abs(data) % 60) / 60; - let seconds = Math.abs(data) % 60; + const absData = Math.abs(data); + const hours = Math.floor(absData / 3600); + let min = Math.floor((absData % 3600) / 60); + let seconds = (absData % 3600) % 60; min = min > 9 ? min : '0' + min; seconds = seconds > 9 ? seconds : '0' + seconds; - return data == 0 ? '00:00' : (data > 0 ? min + ':' + seconds + 'E' : min + ':' + seconds + 'L'); + const time = hours + ':' + min + ':' + seconds; + return data == 0 ? '00:00:00' : (data > 0 ? time + 'E' : time + 'L'); } } }; diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 6749c3324..b8f0cf4ea 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -100,7 +100,7 @@ export default { return this.userRole == 'STATION_SUPERVISOR'; }, isDriver() { - console.log(this.userRole); + console.log(this.userRole); return this.userRole == 'DRIVER'; }, isAdmin() { @@ -296,6 +296,7 @@ export default { }).catch(() => { this.$store.dispatch('training/over').then(() => { this.isDisable = true; + this.$store.dispatch('map/resetActiveTrainList'); this.$messageBox(this.$t('error.endSimulationFailed')); }); }); diff --git a/src/views/newMap/jointTrainingNew/menuTrainList.vue b/src/views/newMap/jointTrainingNew/menuTrainList.vue index e0ec40550..3d519871d 100644 --- a/src/views/newMap/jointTrainingNew/menuTrainList.vue +++ b/src/views/newMap/jointTrainingNew/menuTrainList.vue @@ -71,17 +71,26 @@ export default { watch:{ '$store.state.map.activeTrainListUpdate': function (val) { if (val) { - const trainList = this.$store.state.map.map.trainList; + const activeTrainList = this.$store.state.map.activeTrainList; if (this.lineCode == '10' || this.lineCode == '11') { - this.topTrainList = trainList.filter((train)=>{ - return train.serviceNumber != '' && train.serviceNumber != undefined && !train.right && train.sectionCode; - }); - this.bottomTrainList = trainList.filter((train)=>{ - return train.serviceNumber != '' && train.serviceNumber != undefined && train.right && train.sectionCode; + this.topTrainList = []; + this.bottomTrainList = []; + activeTrainList.forEach((trainCode)=>{ + // train.serviceNumber != '' && train.serviceNumber != undefined && + const train = this.$store.getters['map/getDeviceByCode'](trainCode); + if (train && !train.right && train.sectionCode) { + this.topTrainList.push(train); + } else if (train && train.right && train.sectionCode) { + this.bottomTrainList.push(train); + } }); } else { - this.trainList = trainList.filter((train)=>{ - return train.serviceNumber != '' && train.serviceNumber != undefined && train.sectionCode; + this.trainList = []; + activeTrainList.forEach((trainCode)=>{ + const train = this.$store.getters['map/getDeviceByCode'](trainCode); + if (train && train.sectionCode) { + this.trainList.push(train); + } }); } } else { @@ -89,11 +98,6 @@ export default { this.bottomTrainList = []; this.trainList = []; } - }, - '$store.state.map.runPlanStatus': function (val) { - if (!val) { - this.$store.dispatch('map/resetActiveTrainList'); - } } }, mounted() { @@ -114,9 +118,10 @@ export default { this.$emit('setCenter', code); }, covert(data) { - const hours = Math.floor(data / 3600); - let min = Math.floor((data % 3600) / 60); - let seconds = (data % 3600) % 60; + const absData = Math.abs(data); + const hours = Math.floor(absData / 3600); + let min = Math.floor((absData % 3600) / 60); + let seconds = (absData % 3600) % 60; min = min > 9 ? min : '0' + min; seconds = seconds > 9 ? seconds : '0' + seconds; const time = hours + ':' + min + ':' + seconds; diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue index a9bd5d151..10f5e7854 100644 --- a/src/views/newMap/newMapdraft/index.vue +++ b/src/views/newMap/newMapdraft/index.vue @@ -498,9 +498,8 @@ export default { }, saveMapEvent() { // 保存地图 const map = this.$store.state.map.map; - // map.signalList.forEach(item => { - // item.namePosition = { x: 0, y: 0 }; - // item.lampPositionType = '02'; + // map.sectionList.forEach(item => { + // item.belongStation = ''; // }); if (this.$refs.jlmapVisual && map && parseInt(this.$route.params.mapId)) { if (this.verifySectionPoint(map)) { diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue index 36130d4a6..034167b6f 100644 --- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue +++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue @@ -1,8 +1,8 @@