diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/childDialog/noticeInfo.vue index 277f503a8..e8650c27c 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/childDialog/noticeInfo.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/childDialog/noticeInfo.vue @@ -1,72 +1,82 @@ - - - - {{message}} - - - - - 确定 - - - - + + + + {{ message }} + + + + + 确定 + + + + diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmControlSpeed.vue deleted file mode 100644 index f7d3c615d..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmControlSpeed.vue +++ /dev/null @@ -1,163 +0,0 @@ - - - - {{ message }} - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmTip.vue deleted file mode 100644 index 9ff15f636..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmTip.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - {{ message }} - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmTrain.vue deleted file mode 100644 index bd52f38bd..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/confirmTrain.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - - {{message}} - - - - - 确定 - - - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/passwordInputBox.vue deleted file mode 100644 index fc3053829..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/passwordInputBox.vue +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - *密码输入错误请重新输入* - - - - - 7 - - - 8 - - - 9 - - - - - 4 - - - 5 - - - 6 - - - - - 1 - - - 2 - - - 3 - - - - - 0 - - - C - - - < - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/popupAlarm.vue deleted file mode 100644 index 5694754dd..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/childDialog/popupAlarm.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - - - {{ message }} - - - - - 确定 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue index f34189cae..bdabaf35f 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue @@ -1,7 +1,7 @@ - - + @@ -34,6 +34,7 @@ + @@ -51,7 +52,7 @@ - + Inhibits @@ -253,12 +254,12 @@ export default { }; diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue index f1729ee68..248b9ad60 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue @@ -1,7 +1,7 @@ { if (valid) { - this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: '设置站台停站时间'}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation:{ code: OperationEvent.StationStand.setStopTime.menu.operation, name: '设置站台停站时间'}}); } // if (valid) { // const operate = { diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/routeControl.vue deleted file mode 100644 index dff94e5ba..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/routeControl.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - - 车站 - - - - 始端信号机 - - - - - - - 确定 - 取 消 - - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/routeDetail.vue deleted file mode 100644 index c9323a246..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/routeDetail.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - - - 车站 - - - - 始端信号机 - - - - - - - - - - {{ scope.row.name }} - - - - - {{ scope.row.name }} - - - - - {{ scope.row.name }} - - - - - 自动 - 人工 - - - - - - - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/routeGuide.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/routeGuide.vue deleted file mode 100644 index 009b1d5db..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/routeGuide.vue +++ /dev/null @@ -1,272 +0,0 @@ - - - - 车站 - - - - 始端信号机 - - - - - - 进路列表 - - - - {{ controlTypeNameMap[scope.row.controlType] }} - - - 无 - - - - - - 执行 - 取 消 - - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/routeHandControl.vue deleted file mode 100644 index d0ba6168a..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/routeHandControl.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - - - 车站 - 始端信号机 - - - - - - - - - - - - - - {{ scope.row.name }} - - - - - 111 - - - - - 1111 - - - - - {{ scope.row.controlType == '01' ? '自动' : '人工' }} - - - - - - - 确定 - - - 取 消 - - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/routeSelection.vue deleted file mode 100644 index 136265e24..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/routeSelection.vue +++ /dev/null @@ -1,276 +0,0 @@ - - - - 车站 - - - - 始端信号机 - - - - - - 进路列表 - - - - - {{ controlTypeNameMap[scope.row.controlType] }} - - - - 无 - - - - - - 执行 - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/sectionControl.vue deleted file mode 100644 index 3cb5fde7a..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/sectionControl.vue +++ /dev/null @@ -1,167 +0,0 @@ - - - - 车站 - - - - 区段 - - - - - - - 确定 - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/sectionDetail.vue deleted file mode 100644 index 32afee0f2..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/sectionDetail.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 确定 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue index f3e925117..400b3df25 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue @@ -1,7 +1,7 @@ { if (valid) { - this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, Operation: '速度控制'}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, Operation: {code:OperationEvent.Section.setSpeed.menu.operation, name:'速度控制'}}); } }); // this.$refs['form'].validate((valid) => { @@ -253,12 +253,4 @@ export default { }; diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/standControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/standControl.vue deleted file mode 100644 index 456b76358..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/standControl.vue +++ /dev/null @@ -1,735 +0,0 @@ - - - - - 车站 - - - - 站台 - - - - - - 范围 - - - - 本站台 - - 上行全线 - - 下行全线 - - - - - - 功能 - - - - 扣车 - - - - 取消扣车 - - - - - - - 范围 - - - - - 站台跳停 - - - 指定列车跳停 - - 车组号 - - - - - - - - - - - 功能 - - - - 跳停 - - - - 取消跳停 - - - - - - - 范围 - - - - - 自动 - - - 人工 - - 站停时间 - 运行等级 - - - - - - - - - - - 功能 - - - - - 一次有效 - - - - 一直有效 - - - - - - - - 确定 - - - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/standDetail.vue deleted file mode 100644 index d0ac2ed7e..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/standDetail.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - - - 车站 - - - - 站台 - - - - - - - - - - - - - - 停站时间 - - - - - - - - 运行等级 - - - - - - - - 扣车 - - - - - - - - 跳停 - - - - - - - - 1 - - - 退出 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/switchControl.vue deleted file mode 100644 index 1c909ea93..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/switchControl.vue +++ /dev/null @@ -1,249 +0,0 @@ - - - - 车站名称 - 道岔 - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainControl.vue deleted file mode 100644 index c93791038..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainControl.vue +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - - - 车站 - - - - - - 轨道 - - - - 车次窗 - - - - - - - - - - - - - - - - - 服务号 - - - - 目的地 - - - - - - 序列号 - - - - 服务号 - - - - - - - - 运行模式 - - - 普通 - 专列 - 不停站直达 - - - - - - - - - 确定 - - - 取 消 - - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainCreate.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainCreate.vue deleted file mode 100644 index a0f637cea..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainCreate.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - 确定 - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainCreateNumber.vue deleted file mode 100644 index 7ea4b6347..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainCreateNumber.vue +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - 车站 - - - - - - 车次窗 - - - - - - - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainDelete.vue deleted file mode 100644 index 29d0c395f..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainDelete.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - 确定 - - - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainDeleteNumber.vue deleted file mode 100644 index 17c1060de..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainDeleteNumber.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - 车站 - - - - - - 车次窗 - - - - - - - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainDetailInfo.vue deleted file mode 100644 index 83172f4f8..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainDetailInfo.vue +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - 车组号 - - - - - - 服务类型 - - - - - - - - 服务号 - - - - - - 序列号 - - - - - - - - 司机号 - - - - - - 目的地号 - - - - - - - - 车站 - - - - - - 轨道 - - - - - - - - 下一站 - - - - - - 目的地 - - - - - - - - 跟踪模式 - - - - - - 运行状态 - - - - - - - - 出发时刻 - - - - - - 到达时刻 - - - - - - - - 计划偏离 - - - - - - - - - - - - 编组号 - - - - - - - - 车头号1 - - - - - - 车头号2 - - - - - - - - - - - - - - - - - - 车载ID - - - - - - 运行方向 - - - - - - - - 驾驶模式 - - - - - - 速度 - - - - - - - - 停准状态 - - - - - - 车门状态 - - - - - - - - 运行等级 - - - - - - 停跳状态 - - - - - - - - 车头位置 - - - - - - 载重率 - - - - - - - - - - - - 退出 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainEditNumber.vue deleted file mode 100644 index 58014f945..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainEditNumber.vue +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - 车站 - - - - - - 车次窗 - - - - - - - - - - - - - - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainMove.vue deleted file mode 100644 index a5b016431..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainMove.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - 源车次窗 - - - 车 站: - - - - - - - - - - - - 目的车次窗 - - - 车 站: - - - - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainMoveNumber.vue deleted file mode 100644 index 950ae8292..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainMoveNumber.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - 车站 - - - - - - 车次窗 - - - - - - - - - - - - - - - - - 车站 - - - - - - 目的车次窗 - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/trainSwitch.vue deleted file mode 100644 index 061b741a2..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/trainSwitch.vue +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - 源车次窗 - - - - - - 车 站: - - - - - - - - - - - - 目的车次窗 - - - - - - 车 站: - - - - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/index.vue b/src/jmapNew/theme/chengdu_01/menus/index.vue index 8adf582e5..c397bf59a 100644 --- a/src/jmapNew/theme/chengdu_01/menus/index.vue +++ b/src/jmapNew/theme/chengdu_01/menus/index.vue @@ -1,13 +1,11 @@ - + - - @@ -27,8 +25,6 @@ import { mapGetters } from 'vuex'; import MenuRequest from './menuRequest'; import MenuCancel from './menuCancel'; import MenuSignal from './menuSignal'; -import MenuButton from './menuButton'; -import MenuStationControl from './menuStationControl'; import MenuStationStand from './menuStationStand'; import MenuSwitch from './menuSwitch'; import MenuSection from './menuSection'; @@ -45,12 +41,10 @@ export default { components: { MenuBar, MenuRequest, - MenuButton, MenuCancel, MenuSignal, MenuSwitch, MenuSection, - MenuStationControl, MenuStationStand, MenuStation, MenuTrain, @@ -99,23 +93,25 @@ export default { diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/helpAbout.vue deleted file mode 100644 index 1f19b5243..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/helpAbout.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - ControlMonitor 1.3.5.0 - 确定 - - - 版权所有(C)2010-2011 北京玖琏科技有限公司 - - - - - - - - - - - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/limitSpeed.vue deleted file mode 100644 index 6b24b8ff6..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/limitSpeed.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/manageUser.vue deleted file mode 100644 index 4be9889b0..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/manageUser.vue +++ /dev/null @@ -1,290 +0,0 @@ - - - - 用户列表 - - - - - - {{scope.row.jobNumber}} - - - - - {{scope.row.userName}} - - - - - - - - 刷新 - - 增加 - - 修改 - - 删除 - - - - - - - 确定 - - - 取 消 - - - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/passwordBox.vue deleted file mode 100644 index cfbf79e2d..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/passwordBox.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - 用户名: - - - - 密 码: - - - - - - 1 - 2 - 3 - 4 - 5 - - - 回退 - - - 6 - 7 - 8 - 9 - 0 - - - 清空 - - - - - - 确定 - - - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue index a7770a187..8b246066e 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue @@ -1,7 +1,7 @@ - - - - - 请求 - - 线路选择 - - - - - - - 限制速度 - - - - - - - - - 起始公里标 - - - - 结束公里标 - - - - - - 限速区段长度 - - - - - 查看 - - - 请求 - - - - - 执行 - - 线路选择 - - - - - - - 限制速度 - - - - - - - - - 起始公里标 - - - - 结束公里标 - - - - - - 限速区段长度 - - - - - 查看 - - - 请求 - - - - - 操作提示 - 11111113 - - - - - 设备列表 - - - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/stationControlConvert.vue deleted file mode 100644 index b722fc115..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/stationControlConvert.vue +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - - - - - - {{ scope.row.operate }} - - - - - {{ scope.row.control }} - - - - - {{ scope.row.status }} - - - - - {{ scope.row.result }} - - - - - - 强制站控 - 请求站控 - - 请求中控 - - - - 关闭 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue index 4d0a9cc53..39424a85b 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue @@ -1,7 +1,7 @@ - 用户名 + 用户名 - 密码 + 密码 @@ -32,12 +32,12 @@ - 用户角色 + 用户角色 - - + + {{ item.label }} diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue index a70542487..ca81bbb07 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue @@ -1,7 +1,7 @@ - - - - 添加位置 - - - 终 端: - - - - - - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/trainDelete.vue deleted file mode 100644 index 333c279e3..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/trainDelete.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - - 终 端: - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/trainTranstalet.vue deleted file mode 100644 index f1b2dd1b0..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/trainTranstalet.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - 目的 - - - 终 端: - - - - - - - - - - - - - - 确定 - - - 取 消 - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewDevice.vue deleted file mode 100644 index c78c6ca30..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewDevice.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - - 车次窗 - - - 区段边界 - - - 联锁自动进路表示灯 - - - ATS自动触发表示灯 - - - - - 确定 - - - - 取 消 - - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewName.vue deleted file mode 100644 index a5b0d2079..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewName.vue +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - 信号机名称 - - - 站台轨名称 - - - - - 按钮名称 - - - 折返轨名称 - - - - - 股道名称 - - - 转换轨名称 - - - - - 道岔名称 - - - 标识灯名称 - - - - - 道岔区段名称 - - - 目的地名称 - - - - - 计轴区段名称 - - - 公里标 - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewTrainId.vue deleted file mode 100644 index 60515b91e..000000000 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/viewTrainId.vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - 计划车显示模式 - - - - 表号+车次号 - - - 表号+车组号 - - - - - 目的地号+车次号 - - - 目的地号+车组号 - - - - - 目的地号+表号+车次号 - - - 目的地号+表号+车组号 - - - - - - 头码车显示模式 - - - - 目的地号+车次号 - - - 目的地号+车组号 - - - - - - 字体大小 - - - - - - (范围:16-99) - - - - - - 确定 - - - 取 消 - - - - - - - diff --git a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue index 14ec3b4f0..5ab3d74fe 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue @@ -1,5 +1,5 @@ - + 操作请求堆栈 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue index a27a3b897..772d41f35 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue @@ -1,9 +1,6 @@ - - - @@ -11,9 +8,6 @@ diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue index fac411ace..4b72a0a52 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue @@ -1,7 +1,7 @@ diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index 8c463d32f..ddeb93eeb 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -2,12 +2,6 @@ - - - - - - @@ -18,25 +12,13 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus'; -import TrainControl from './dialog/trainControl'; -import TrainEditNumber from './dialog/trainEditNumber'; -import TrainMoveNumber from './dialog/trainMoveNumber'; -import TrainCreateNumber from './dialog/trainCreateNumber'; -import TrainDeleteNumber from './dialog/trainDeleteNumber'; -import TrainDetailInfo from './dialog/trainDetailInfo'; import CancelMouseState from '@/mixin/CancelMouseState'; export default { name: 'MenuTrain', components: { PopMenu, - NoticeInfo, - TrainControl, - TrainEditNumber, - TrainMoveNumber, - TrainCreateNumber, - TrainDeleteNumber, - TrainDetailInfo + NoticeInfo }, mixins: [ CancelMouseState @@ -136,66 +118,6 @@ export default { handler: '', cmdType: '' } - // { - // label: '新建车组号', - // handler: this.createTrainNo, - // disabledCallback: MenuDisabledState.Train.createTrainNo, - // auth: { station: true, center: true } - // }, - // { - // label: '移动车组号', - // handler: this.moveTrainNo, - // disabledCallback: MenuDisabledState.Train.moveTrainNo, - // auth: { station: true, center: true } - // }, - // { - // label: '删除车组号', - // handler: this.deleteTrainNo, - // disabledCallback: MenuDisabledState.Train.deleteTrainNo, - // auth: { station: true, center: true } - // }, - // { - // label: '修改车组号', - // handler: this.editTrainNo, - // disabledCallback: MenuDisabledState.Train.editTrainNo, - // auth: { station: true, center: true } - // }, - // { - // label: '设计划车', - // handler: this.setPlanTrainId, - // disabledCallback: MenuDisabledState.Train.setPlanTrainId, - // auth: { station: true, center: true } - // }, - // { - // label: '设目的地', - // handler: this.destinationTrainId, - // disabledCallback: MenuDisabledState.Train.destinationTrainId, - // auth: { station: true, center: true } - // }, - // { - // label: '设人工车', - // handler: this.artificialTrainId, - // disabledCallback: MenuDisabledState.Train.artificialTrainId, - // auth: { station: true, center: true } - // }, - // { - // label: '设特殊人工车', - // handler: this.undeveloped, - // disabledCallback: MenuDisabledState.Train.moveTrainId, - // auth: { station: true, center: true} - // }, - // { - // label: '详细列车信息', - // handler: this.detailTrainInfo, - // disabledCallback: MenuDisabledState.Train.detailTrainInfo, - // auth: { station: true, center: true} - // }, - // { - // label: '属性', - // handler: this.undeveloped, - // disabledCallback: MenuDisabledState.Train.moveTrainId, - // auth: { station: true, center: true} - // } ] }, diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue index 50f94e430..8ebf5bcd6 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue @@ -520,7 +520,7 @@ export default { operation: OperationEvent.StationStand.setRunLevel.chooseTrain.operation, val: `${upDown}`, param: { - Stand_RunLevel: `${upDown}` + standRunLevel: `${upDown}` } }; @@ -574,7 +574,7 @@ export default { cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, val: `${this.radio}`, param: { - Stand_AllLine: `${this.radio}` + standAllLine: `${this.radio}` } }; if (this.radio == '02') { @@ -610,8 +610,8 @@ export default { cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP, val: val, param: { - Stand_JumpStop_Range: `${this.radio}`, - Train_GroupNo: `${this.tripNumber}` + standJumpStopRange: `${this.radio}`, + trainGroupNo: `${this.tripNumber}` } }; @@ -635,8 +635,8 @@ export default { cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, val: this.radio + '::' + this.tripNumber, param: { - Stand_JumpStop_Range: `${this.radio}`, - Train_GroupNo: `${this.tripNumber}` + standJumpStopRange: `${this.radio}`, + trainGroupNo: `${this.tripNumber}` } }; @@ -661,9 +661,9 @@ export default { cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME, val: [`${this.radio}`, this.trainStopTime, forver].join('::'), param: { - Stand_StopControl: `${this.radio}`, - Stand_StopTime: this.trainStopTime, - Stand_AlwaysValid: forver + standStopControl: `${this.radio}`, + standStopTime: this.trainStopTime, + standAlwaysValid: forver } }; @@ -693,9 +693,9 @@ export default { cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME, val: val, param: { - Stand_StopControl: `${this.radio}`, - Stand_RunLevel: this.radio === '02' ? `${this.trainRunlevel}` : '01', - Stand_AlwaysValid: `${forver}` + standStopControl: `${this.radio}`, + standRunLevel: this.radio === '02' ? `${this.trainRunlevel}` : '01', + standAlwaysValid: `${forver}` } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue index 6e2a69cca..288e79425 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue @@ -158,7 +158,7 @@ export default { operation: OperationEvent.StationStand.stoppage.menu.operation, cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -179,7 +179,7 @@ export default { operation: OperationEvent.StationStand.cancelStoppage.menu.operation, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; @@ -200,7 +200,7 @@ export default { code: `${this.selected.code}`, operation: OperationEvent.StationStand.setDetainTrain.menu.operation, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; @@ -218,7 +218,7 @@ export default { code: `${this.selected.code}`, operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -235,7 +235,7 @@ export default { code: `${this.selected.code}`, operation: OperationEvent.StationStand.setJumpStop.menu.operation, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -252,7 +252,7 @@ export default { code: `${this.selected.code}`, operation: OperationEvent.StationStand.cancelJumpStop.menu.operation, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -269,13 +269,13 @@ export default { code: `${this.selected.code}`, operation: OperationEvent.StationStand.setStopTime.menu.operation, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => { + Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {standCode: `${this.selected.code}`}).then(resp => { const tempData = resp.data; this.$refs.standControl.doShow(step, this.selected, tempData); }); @@ -291,13 +291,13 @@ export default { code: `${this.selected.code}`, operation: OperationEvent.StationStand.setRunLevel.menu.operation, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => { + Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {standCode: `${this.selected.code}`}).then(resp => { const tempData = resp.data; this.$refs.standControl.doShow(step, this.selected, tempData); }); @@ -313,13 +313,13 @@ export default { code: `${this.selected.code}`, operation: OperationEvent.StationStand.detail.menu.operation, param: { - StationStand_Code: `${this.selected.code}` + standCode: `${this.selected.code}` } }; this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => { + Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {standCode: `${this.selected.code}`}).then(resp => { const tempData = resp.data; this.$refs.standDetail.doShow(step, this.selected, tempData); });