-
- {{message}}
- -
- - -
+
+ {{ message }}
+ +
+ + +
-
+
+
\ No newline at end of file
+ this.menu = menuConvert(this.menu);
+ },
+ doShow(point) {
+ this.clickEvent();
+ this.initMenu();
+ if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+ this.$refs.popMenu.resetShowPosition(point);
+ }
+ },
+ doClose() {
+ if (this.$refs && this.$refs.popMenu) {
+ this.$refs.popMenu.close();
+ }
+ },
+ // 设置故障
+ setStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.stoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 取消故障
+ cancelStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.cancelStoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 故障解锁
+ fault() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.fault.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 切除
+ split() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.split.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 激活
+ active() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.active.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 区段计轴预复位
+ axlePreReset() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.axlePreReset.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 区段解锁
+ lock() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.lock.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 区段封锁
+ unlock() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.unlock.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 设置速度
+ setSpeed() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.setSpeed.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ // this.$refs.speedCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 取消速度
+ cancelSpeed() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.cancelSpeed.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ // const tempData = response.data;
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ // this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
+ }
+ });
+ },
+ // 新建列车
+ newTrain() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.newtrain.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainCreate.doShow(operate, this.selected);
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/beijing_01/menus/dialog/routeCmdControl.vue b/src/jmap/theme/beijing_01/menus/dialog/routeCmdControl.vue
index ca24232c4..d53952a42 100644
--- a/src/jmap/theme/beijing_01/menus/dialog/routeCmdControl.vue
+++ b/src/jmap/theme/beijing_01/menus/dialog/routeCmdControl.vue
@@ -1,432 +1,439 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{message}}
-
-
- 下达({{timeCountCommand}})
-
-
- 确认1
-
-
-
- 确认2({{timeCountConfirm}})
-
-
- 中止
-
-
- 关闭
-
-
-
-
+
- 命令信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ message }}
+
+
+ 下达({{ timeCountCommand }})
+
+
+ 确认1
+
+
+
+ 确认2({{ timeCountConfirm }})
+
+
+ 中止
+
+
+ 关闭
+
+
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.doClose();
+ }
+ }).catch(error => {
+ this.doClose();
+ });
+ },
+ getOperate(operate) {
+ /** 弹框返回值处理*/
+ if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+ /** 信号解封*/
+ this.backOperate = operate;
+ this.setButtonEnable(operate);
+ if (operate.success) {
+ this.timeCountCommand = 30;
+ this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '确认成功' });
+ } else {
+ this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '取消成功' });
+ }
+ }
+ },
+ setButtonEnable(param) {
+ this.cmdDisabled = [true, true, true];
+ if (param && param.step >= 0) {
+ this.cmdDisabled[param.step] = false;
+ }
+ },
+ setMessage(message) {
+ this.message = message;
+ },
+ writeRecord(param) {
+ this.tempData.push(param);
+ },
+ editRecord(param) {
+ this.tempData.forEach(elem => {
+ if (elem.order == param.order) {
+ for (var prop in param) {
+ elem[prop] = param[prop];
+ }
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/beijing_01/menus/dialog/standControl.vue b/src/jmap/theme/beijing_01/menus/dialog/standControl.vue
index b45426396..833dffaaf 100644
--- a/src/jmap/theme/beijing_01/menus/dialog/standControl.vue
+++ b/src/jmap/theme/beijing_01/menus/dialog/standControl.vue
@@ -1,287 +1,323 @@
-
+ 命令信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 类型
+
+
+
+ 本站台上行
+
+
+
+ 本站台上行
+
-
-
-
-
-
+
+
+ 功能
+
+
+
+ 扣车
+
+
+
+ 取消扣车
+
-
-
- 确定
-
-
- 取 消
-
+
+
-
-
- 类型
-
-
-
- 本站台上行
-
-
-
- 本站台上行
-
-
-
-
- 功能
-
-
-
- 扣车
-
-
-
- 取消扣车
-
-
-
-
-
-
- 类型
-
-
-
- 本站台上行
-
-
-
- 本站台下行
-
-
-
-
+
+
+ 类型
+
+
+
+ 本站台上行
+
+
+
+ 本站台下行
+
-
+
+ 本站台上行跳停
+
+
+ 本站台下行跳停
+
+
+ 指定列车上行跳停
+
+
+ 指定列车下行跳停
+
+
- 本站台上行跳停
-
-
- 本站台下行跳停
-
-
- 指定列车上行跳停
-
-
- 指定列车下行跳停
-
-
- 功能
-
-
-
- 设置
-
-
-
- 取消
-
-
-
-
+ 功能
+
+
+
+ 设置
+
+
+
+ 取消
+
+
+
+
计划车显示模式
@@ -51,7 +56,7 @@ title="列车识别号显示设置" :visible.sync="show" width="420px"
字体大小
-
（范围：16-99）
@@ -66,7 +71,7 @@ title="列车识别号显示设置" :visible.sync="show" width="420px"
取 消
-
-
- 操作倒计时
-
-
-
-
- 状态
-
-
-
-
-
-
-
-
-
- 关闭
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
index dda9defa7..68a8db975 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
@@ -1,196 +1,209 @@
-
-
-
-
-
-
-
- *密码输入错误请重新输入*
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
-
-
- 0
-
-
- C
-
-
- <-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
+
+
+
+
+
+
+
+ *密码输入错误请重新输入*
+
+
+
+
+ 7
+
+
+ 8
+
+
+ 9
+
+
+
+
+ 4
+
+
+ 5
+
+
+ 6
+
+
+
+
+ 1
+
+
+ 2
+
+
+ 3
+
+
+
+
+ 0
+
+
+ C
+
+
+ <
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
\ 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
index 4c7ab1437..d959ba7e3 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
@@ -1,363 +1,356 @@
-
-
- 车站
-
-
- 始端信号机
-
-
-
-
-
- 确定
- 取 消
-
-
-
+
+
+ 车站
+
+
+ 始端信号机
+
+
+
+
+
+ 确定
+ 取 消
+
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.doClose();
+ }
+ }).catch(() => {
+ this.doClose();
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue
index c93dc7380..1450d834a 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeDetail.vue
@@ -1,140 +1,155 @@
-
-
- 车站
-
-
- 始端信号机
-
-
-
-
-
- 执行
- 取 消
-
-
-
+
+
+ 车站
+
+
+ 始端信号机
+
+
+
+
+
+ 执行
+ 取 消
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue
index 56cfab690..549952d84 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeSelection.vue
@@ -1,235 +1,251 @@
-
-
- 车站
-
-
- 始端信号机
-
-
-
-
-
- 执行
- 取 消
-
-
-
+
+
+ 车站
+
+
+ 始端信号机
+
+
+
+
+
+ 执行
+ 取 消
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/sectionCmdControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionCmdControl.vue
deleted file mode 100644
index 96bd8f04b..000000000
--- a/src/jmap/theme/chengdu_03/menus/dialog/sectionCmdControl.vue
+++ /dev/null
@@ -1,435 +0,0 @@
-
-
-
- 车站
-
-
- 区段
-
-
-
-
-
- 确定
- 取 消
-
-
-
+
+
+ 车站
+
+
+ 区段
+
+
+
+
+
+ 确定
+ 取 消
+
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.doClose();
+ }
+ }).catch(() => {
+ this.doClose();
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/speedCmdControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/speedCmdControl.vue
deleted file mode 100644
index a454c1bab..000000000
--- a/src/jmap/theme/chengdu_03/menus/dialog/speedCmdControl.vue
+++ /dev/null
@@ -1,783 +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
index c45f04de0..4de269dad 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue
@@ -1,416 +1,360 @@
-
-
- 车站名称
- 道岔
-
-
-
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
+
+
+ 车站名称
+ 道岔
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.doClose();
+ }
+ }).catch(() => {
+ this.doClose();
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/index.vue b/src/jmap/theme/chengdu_03/menus/index.vue
index 849fe2334..5e9468ffe 100644
--- a/src/jmap/theme/chengdu_03/menus/index.vue
+++ b/src/jmap/theme/chengdu_03/menus/index.vue
@@ -5,6 +5,7 @@
+
-
+
- 准备
-
-
-
- 车站
- 轨道/计轴
-
-
-
-
-
-
-
- 确认
-
-
-
-
-
- 确认
-
-
-
- 车站
- 轨道/计轴
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确认
-
-
-
-
-
-
- 车站
-
-
- 始端信号机
-
-
-
-
-
- 取 消
-
-
-
-
+
-
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- 自动
- 人工
-
-
-
-
-
+
+
+ 车站
+
+
+ 始端信号机
+
+
+
+
+
+ 取 消
+
+
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.doClose();
+ }
+ }).catch(() => {
+ this.doClose();
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
index ee9fee4d6..3ab16dd4b 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
@@ -1,247 +1,257 @@
-
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ 自动
+ 人工
+
+
+
+
+
- 进路列表
-
-
-
-
-
- {{ controlTypeNameMap[scope.row.controlType] }}
-
-
-
-
- 无
-
-
-
-
-
+ 进路列表
+
+
+ {{ controlTypeNameMap[scope.row.controlType] }}
+
+
+ 无
+
+
+
+
- 进路列表
-
-
-
-
-
- {{ controlTypeNameMap[scope.row.controlType] }}
-
-
-
-
- 无
-
-
-
-
-
+ 进路列表
+
+
+
+ {{ controlTypeNameMap[scope.row.controlType] }}
+
+
+
+ 无
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{message}}
-
-
- 下达({{timeCountCommand}})
-
-
- 确认1
-
-
-
- 确认2({{timeCountConfirm}})
-
-
- 中止
-
-
- 关闭
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
index 13ac35839..3b262fa86 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
@@ -1,215 +1,230 @@
-
- 命令信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 关闭
-
-
-
-
-
\ 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
index 7e019bfd0..2c4e47ce4 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/standControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/standControl.vue
@@ -1,621 +1,726 @@
-
- 会话管理
-
-
-
- 查询会话状态
-
-
-
-
-
- 打开会话
-
-
-
- 关闭会话
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 限速数值
-
- 起点
-
-
-
-
-
- 区间选择
- 公里标数值(m)
-
- 终点
-
-
-
-
-
- 区间选择
- 公里标数值(m)
-
- 查看设备
-
- 首次确认
-
-
-
- 设备列表：
-
-
-
-
- {{item.name}}: {{item.text}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 限速数值
-
- 起点
-
-
-
-
-
- 区间选择
- 公里标数值(m)
-
- 终点
-
-
-
-
-
- 区间选择
- 公里标数值(m)
-
- 查看设备
-
- 确认发送
-
-
-
- 设备列表：
-
-
-
-
- {{item.name}}: {{item.text}}
-
- 操作倒计时
-
- {{timeCountConfirm == -1 ? '' : timeCountConfirm}}
- 状态
-
- {{messageStatus}}
-
+
+
+ 范围
+
+
+
+ 本站台
+
+ 上行全线
+
+ 下行全线
+
+
+
+
+
+ 功能
+
+
+
+ 扣车
+
+
+
+ 取消扣车
+
+
+
+
+
+
+ 范围
+
+
+
+
+ 站台跳停
+
+
+ 指定列车跳停
+
+
+
+
+
+ 车组号
+
+
+
+
+ 功能
+
+
+
+ 跳停
+
+
+
+ 取消跳停
+
+
+
+
+
+
+ 范围
+
+
+
+
+ 自动
+
+
+ 人工
+
+
+
+
+
+ 站停时间
+ 运行等级
+
+
+
+
+ 功能
+
+
- 车站
-
-
+
+ 一次有效
-
- 站台
-
+
+ 一直有效
+
-
-
- 确定
-
-
- 取 消
-
-
-
+
-
-
- 范围
-
-
-
- 本站台
-
- 上行全线
-
- 下行全线
-
-
-
-
-
- 功能
-
-
-
- 扣车
-
-
-
- 取消扣车
-
-
-
-
-
-
- 范围
-
-
-
-
- 站台跳停
-
-
- 指定列车跳停
-
-
-
-
-
- 车组号
-
-
-
-
-
-
-
-
- 功能
-
-
-
- 跳停
-
-
-
- 取消跳停
-
-
-
-
-
-
- 范围
-
-
-
-
- 自动
-
-
- 人工
-
-
-
-
-
- 站停时间
- 运行等级
-
-
-
-
-
-
-
-
- 功能
-
-
-
-
- 一次有效
-
-
-
- 一直有效
-
-
-
-
-
@@ -42,13 +30,7 @@
-
+
@@ -65,13 +47,7 @@
-
+
@@ -812,7 +788,7 @@ export default {
this.clickEvent();
const operate = {
type: 'bar',
- operation: item.operate.operation
+ operation: item.operate
};
this.tempClassA = index;
this.tempClassB = -1;
@@ -834,7 +810,7 @@ export default {
this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
const operate = {
type: 'bar',
- operation: item.operate.operation
+ operation: item.operate
};
this.tempClassB = index;
this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -850,151 +826,11 @@ export default {
this.closeMenu(true);
}
},
- // 转为站控
- turnToStationControl(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.stationControlConvert.doShow(operate);
- }
- });
- },
- // 强制转为站控
- mandatoryStationControl(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.passwordBox.doShow(operate);
- }
- });
- },
- // 请求中控
- conterStationControl(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.stationControlConvert.doShow(operate);
- }
- });
- },
- // 设置列车识别号显示
- setTrainIdDisplay(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.viewTrainId.doShow(operate);
- }
- });
- },
- // 设置设备显示
- setNameDisplay(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.viewName.doShow(operate);
- }
- });
- },
- // 设置名称显示
- setDeviceDisplay(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.viewDevice.doShow(operate);
- }
- });
- },
- // 添加计划车
- addPlanTrain(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.trainAdd.doShow(operate);
- }
- });
- },
- // 平移计划车
- translatPlanTrain(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.trainTranstalet.doShow(operate);
- }
- });
- },
- // 删除计划车
- delPlanTrain(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.trainDelete.doShow(operate);
- }
- });
- },
- // 用户管理
- userManage(order) {
- const operate = {
- type: 'bar',
- operation: order.operation
- };
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- if (valid) {
- this.closeMenu(true);
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.manageUser.doShow(operate);
- }
- });
- },
// 关于
about(order) {
const operate = {
type: 'bar',
- operation: order.operation
+ operation: order.operate
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@@ -1021,7 +857,7 @@ export default {
setLimitSpeed(order) {
const operate = {
type: 'bar',
- operation: order.operation
+ operation: order.operate
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@@ -1034,7 +870,7 @@ export default {
cancleLimitSpeed(order) {
const operate = {
type: 'bar',
- operation: order.operation
+ operation: order.operate
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
diff --git a/src/jmap/theme/chengdu_03/menus/menuButton.vue b/src/jmap/theme/chengdu_03/menus/menuButton.vue
new file mode 100644
index 000000000..cc6b7c233
--- /dev/null
+++ b/src/jmap/theme/chengdu_03/menus/menuButton.vue
@@ -0,0 +1,280 @@
+
+
+
+
+
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuCancel.vue b/src/jmap/theme/chengdu_03/menus/menuCancel.vue
index 90e1b4052..94ccedc04 100644
--- a/src/jmap/theme/chengdu_03/menus/menuCancel.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuCancel.vue
@@ -20,7 +20,6 @@ export default {
data() {
return {
menu: [],
- menuNormal: [],
menuScreen: [
{
label: '放大地图',
@@ -53,12 +52,6 @@ export default {
}
},
watch: {
- '$store.state.menuOperation.buttonOperation': function (val, old) {
- if (!this.isScreen && this.menu && this.menu.length > 1) {
- // this.menu[0].disabled = (this.menu[0] && val) ? true : true;
- // this.menu[1].disabled = !((this.menu[1] && val));
- }
- },
'$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
this.doShow(this.$store.state.menuOperation.menuPosition);
@@ -75,41 +68,9 @@ export default {
};
},
initMenu() {
- this.menuNormal = [];
- // this.stationList.forEach(station => {
- // if (station.code === station.concentrateStationCode) {
- // let node = {
- // label: station.name,
- // children: []
- // }
- //
- // this.stationList.forEach(elem => {
- // if (elem.visible) {
- // let next = elem;
- // while (next.code != next.concentrateStationCode || !next.concentrateStationCode) {
- // next = this.$store.getters['map/getDeviceByCode'](next.concentrateStationCode);
- // }
- //
- // if (station.code == next.code) {
- // node.children.push({
- // code: elem.code,
- // label: elem.name,
- // handler: this.mapLocation,
- // });
- // }
- // }
- // })
- //
- // this.menuNormal.push(node);
- // }
- // });
-
if (this.isScreen) {
this.menu = [...this.menuScreen];
}
- // else {
- // this.menu = [...this.menuNormal];
- // }
},
doShow(point) {
this.clickEvent();
@@ -123,13 +84,6 @@ export default {
this.$refs.popMenu.close();
}
},
- // 设置地图定位
- mapLocation(item) {
- if (item) {
- this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: item.code });
- this.doClose();
- }
- },
// 放大地图
magnifyMap() {
this.$store.dispatch('menuOperation/handleMagnifyCount');
diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
index d3cde99aa..b21f46e0f 100644
--- a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
@@ -1,10 +1,15 @@
+ v-dialogDrag
+ class="chengdou-03__systerm view-train-id"
+ title="列车识别号显示设置"
+ :visible.sync="show"
+ width="420px"
+ :before-close="doClose"
+ :z-index="2000"
+ :modal="false"
+ :close-on-click-modal="false"
+ >
计划车显示模式
@@ -51,7 +56,7 @@ title="列车识别号显示设置" :visible.sync="show" width="420px"
字体大小
-
（范围：16-99）
@@ -66,7 +71,7 @@ title="列车识别号显示设置" :visible.sync="show" width="420px"
取 消
-
-
+
+
\ No newline at end of file
+export default {
+ name: 'MenuLimit',
+ components: {
+ PopMenu,
+ CancelAllLimit
+ },
+ props: {
+ selected: {
+ type: Object,
+ default() {
+ return null;
+ }
+ }
+ },
+ data() {
+ return {
+ menu: [{
+ label: '取消全线临时限速',
+ handler: this.cancelSpeed,
+ disabledCallback: '',
+ auth: { station: true, center: false }
+ }],
+ menuNormal: {
+ local: [
+ {
+ label: '取消全线临时限速',
+ handler: this.cancelSpeed,
+ disabledCallback: MenuDisabledState.Section.cancelSpeed,
+ auth: { station: true, center: false }
+ }
+ ],
+ central: [
+ {
+ label: '取消全线临时限速',
+ handler: this.cancelSpeed,
+ disabledCallback: MenuDisabledState.Section.cancelSpeed,
+ auth: { station: false, center: true }
+ }
+ ]
+ }
+ };
+ },
+ computed: {
+ ...mapGetters('training', [
+ 'mode',
+ 'operatemode'
+ ]),
+ ...mapGetters('menuOperation', [
+ 'buttonOperation'
+ ])
+ },
+ watch: {
+ '$store.state.menuOperation.menuCount': function (val) {
+ if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.LimitControl) && !this.buttonOperation) {
+ this.doShow(this.$store.state.menuOperation.menuPosition);
+ } else {
+ this.doClose();
+ }
+ }
+ },
+ methods: {
+ clickEvent() {
+ const self = this;
+ window.onclick = function (e) {
+ self.doClose();
+ };
+ },
+ initMenu() {
+ // 编辑模式菜单列表
+ if (this.operatemode === OperateMode.ADMIN) {
+ this.menu = [...this.menu];
+ }
+ },
+ doShow(point) {
+ this.clickEvent();
+ this.initMenu();
+ if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+ this.$refs.popMenu.resetShowPosition(point);
+ }
+ },
+ doClose() {
+ if (this.$refs && this.$refs.popMenu) {
+ this.$refs.popMenu.close();
+ }
+ },
+ // 取消速度
+ cancelSpeed() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.LimitControl.type,
+ label: MapDeviceType.LimitControl.label,
+ operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.cancelAllLimit.doShow(operate, this.selected);
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuSection.vue b/src/jmap/theme/chengdu_03/menus/menuSection.vue
index d95def5aa..9e14a2b4d 100644
--- a/src/jmap/theme/chengdu_03/menus/menuSection.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuSection.vue
@@ -1,403 +1,286 @@
-
-
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ detail() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.detail.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionDetail.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 设置故障
+ setStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.stoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 取消故障
+ cancelStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.cancelStoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 设置速度
+ setSpeed() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.setSpeed.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ // this.$refs.speedLimitControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ undeveloped() {
+ this.doClose();
+ this.$alert('实现中......', '提示', {
+ confirmButtonText: '确定',
+ callback: action => {
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuSignal.vue b/src/jmap/theme/chengdu_03/menus/menuSignal.vue
index b01c897d3..68c496dc9 100644
--- a/src/jmap/theme/chengdu_03/menus/menuSignal.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuSignal.vue
@@ -1,583 +1,488 @@
-
-
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.routeControl.doShow(operate, this.selected);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 信号解封
+ unlock() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Signal.type,
+ label: MapDeviceType.Signal.label,
+ operation: OperationEvent.Signal.unlock.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.routeControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 进路交人工控
+ humanControl() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Signal.type,
+ label: MapDeviceType.Signal.label,
+ operation: OperationEvent.Signal.humanControl.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ let tempData = null;
+ if (response) {
+ tempData = response.data;
+ }
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.routeControl.doShow(operate, this.selected, tempData);
+ }
+ });
+ },
+ // 进路交自动控
+ atsAutoControl() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Signal.type,
+ label: MapDeviceType.Signal.label,
+ operation: OperationEvent.Signal.atsAutoControl.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ let tempData = null;
+ if (response) {
+ tempData = response.data;
+ }
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.routeControl.doShow(operate, this.selected, tempData);
+ }
+ });
+ },
+ // 查询进路状态
+ detail() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Signal.type,
+ label: MapDeviceType.Signal.label,
+ operation: OperationEvent.Signal.detail.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.routeDetail.doShow(operate, this.selected, response.data);
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuStation.vue b/src/jmap/theme/chengdu_03/menus/menuStation.vue
index a4e2e0c7d..f865e6cc3 100644
--- a/src/jmap/theme/chengdu_03/menus/menuStation.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuStation.vue
@@ -1,153 +1,156 @@
-
-
+
+
\ No newline at end of file
+ mouseCancelState(this.selected);
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuStationControl.vue b/src/jmap/theme/chengdu_03/menus/menuStationControl.vue
index b569ec165..6e394cecd 100644
--- a/src/jmap/theme/chengdu_03/menus/menuStationControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuStationControl.vue
@@ -1,69 +1,69 @@
-
-
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.standControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 取消扣车
+ cancelDetainTrain() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.StationStand.type,
+ label: MapDeviceType.StationStand.label,
+ operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.standControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 设置跳停
+ setJumpStop() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.StationStand.type,
+ label: MapDeviceType.StationStand.label,
+ operation: OperationEvent.StationStand.setJumpStop.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.standControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 取消跳停
+ cancelJumpStop() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.StationStand.type,
+ label: MapDeviceType.StationStand.label,
+ operation: OperationEvent.StationStand.cancelJumpStop.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.standControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 停站时间控制
+ setStopTime() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.StationStand.type,
+ label: MapDeviceType.StationStand.label,
+ operation: OperationEvent.StationStand.setStopTime.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ let tempDate = null;
+ if (response) {
+ tempDate = response.data;
+ }
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.standControl.doShow(operate, this.selected, tempDate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 设置运行等级
+ setRunLevel() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.StationStand.type,
+ label: MapDeviceType.StationStand.label,
+ operation: OperationEvent.StationStand.setRunLevel.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ let tempDate = null;
+ if (response) {
+ tempDate = response.data;
+ }
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.standControl.doShow(operate, this.selected, tempDate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 查询站台状态
+ detail() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.StationStand.type,
+ label: MapDeviceType.StationStand.label,
+ operation: OperationEvent.StationStand.detail.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ let tempDate = null;
+ if (response) {
+ tempDate = response.data;
+ }
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.standDetail.doShow(operate, this.selected, tempDate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuSwitch.vue b/src/jmap/theme/chengdu_03/menus/menuSwitch.vue
index d6c79e675..e12a1e0ce 100644
--- a/src/jmap/theme/chengdu_03/menus/menuSwitch.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuSwitch.vue
@@ -1,462 +1,453 @@
-
-
+
+
\ No newline at end of file
+ // 区段切除
+ split() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Switch.type,
+ label: MapDeviceType.Switch.label,
+ operation: OperationEvent.Switch.split.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.switchControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 区段激活
+ active() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Switch.type,
+ label: MapDeviceType.Switch.label,
+ operation: OperationEvent.Switch.active.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.switchControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 单操到定位
+ locate() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Switch.type,
+ label: MapDeviceType.Switch.label,
+ operation: OperationEvent.Switch.locate.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.switchControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 单操到反位
+ reverse() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Switch.type,
+ label: MapDeviceType.Switch.label,
+ operation: OperationEvent.Switch.reverse.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.switchControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ undeveloped() {
+ this.doClose();
+ this.$alert('实现中......', '提示', {
+ confirmButtonText: '确定',
+ callback: action => {
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuTool.vue b/src/jmap/theme/chengdu_03/menus/menuTool.vue
index dc32a9673..8c96fd532 100644
--- a/src/jmap/theme/chengdu_03/menus/menuTool.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuTool.vue
@@ -1,149 +1,159 @@
-
-
-
-
- 确定
-
-
-
-
+
+
+
+ {{ message }}
+
+
+
+
+ 确定
+
+
+
\ 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
index ccfcf9036..b0a7ffc5d 100644
--- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/confirmTrain.vue
@@ -1,163 +1,173 @@
-
-
-
- 确定
-
-
- 取 消
-
-
-
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
\ 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
index e3375f76f..f71cf4158 100644
--- a/src/jmap/theme/chengdu_04/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmap/theme/chengdu_04/menus/dialog/childDialog/popupAlarm.vue
@@ -1,85 +1,94 @@
-
-
-
- {{message}}
-
-
-
-
- 确定
-
-
-
-
+
+
+
+ {{ message }}
+
+
+
+
+ 确定
+
+
+
\ 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
index ee9fee4d6..4d0534ee1 100644
--- a/src/jmap/theme/chengdu_04/menus/dialog/routeGuide.vue
+++ b/src/jmap/theme/chengdu_04/menus/dialog/routeGuide.vue
@@ -1,247 +1,261 @@
-
-
- 车站
-
-
- 始端信号机
-
-
-
-
-
- 执行
- 取 消
-
-
-
+
+
+ 车站
+
+
+ 始端信号机
+
+
+
+
+
+ 执行
+ 取 消
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue b/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue
index 56cfab690..88df28887 100644
--- a/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue
+++ b/src/jmap/theme/chengdu_04/menus/dialog/routeSelection.vue
@@ -1,235 +1,249 @@
-
-
- 车站
-
-
- 始端信号机
-
-
-
-
-
- 执行
- 取 消
-
-
-
+
+
+ 车站
+
+
+ 始端信号机
+
+
+
+
+
+ 执行
+ 取 消
+
+
+
\ 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
index a454c1bab..46caafc6b 100644
--- a/src/jmap/theme/chengdu_04/menus/dialog/speedCmdControl.vue
+++ b/src/jmap/theme/chengdu_04/menus/dialog/speedCmdControl.vue
@@ -1,783 +1,902 @@
-
- ![]()
-
+
- ![]()
-
-
+
-
\ No newline at end of file
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuTrain.vue b/src/jmap/theme/chengdu_03/menus/menuTrain.vue
index 29d2509ce..0e9da652a 100644
--- a/src/jmap/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuTrain.vue
@@ -3,9 +3,6 @@
+ ![]()
+
+
+ ![]()
+
+
-
- {{message}}
- -
- - -
-
- {{message}}
-
-
-
+
+ {{ message }}
+
+
+ -
- 进路列表
-
-
-
-
-
- {{ controlTypeNameMap[scope.row.controlType] }}
-
-
-
-
- 无
-
-
-
-
-
+ 进路列表
+
+
+
+ {{ controlTypeNameMap[scope.row.controlType] }}
+
+
+
+ 无
+
+
+
+
- 进路列表
-
-
-
-
-
- {{ controlTypeNameMap[scope.row.controlType] }}
-
-
-
-
- 无
-
-
-
-
-
+ 进路列表
+
+
+
+ {{ controlTypeNameMap[scope.row.controlType] }}
+
+
+
+ 无
+
+
+
+
-
-
- 会话管理
-
-
-
- 查询会话状态
-
-
-
-
-
- 打开会话
-
-
-
- 关闭会话
-
-
-
-
+
+
+
-
-
- 车站
-
-
-
- 站台
-
-
-
-
-
-
-
-
-
-
-
-
- 停站时间
-
-
-
-
-
-
- 运行等级
-
-
-
-
-
-
- 扣车
-
-
-
-
-
-
- 跳停
-
-
-
-
-
-
- 1
-
-
- 退出
-
-
-
+
+
+
+ 车站
+
+
+ 站台
+
+
+
+
+
+
+
+
+
+
+ 停站时间
+
+
+
+
+
+
+ 运行等级
+
+
+
+
+
+
+ 扣车
+
+
+
+
+
+
+ 跳停
+
+
+
+
+
+
+ 1
+
+
+ 退出
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue
index 747b7cbfc..d15dda0a8 100644
--- a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -1,127 +1,137 @@
-
-
-
- 确认
-
-
- 关闭
-
-
-
+
+
+
+ 确认
+
+
+ 关闭
+
+
+
\ No newline at end of file
+ this.loading = true;
+ this.doClose();
+ this.$emit('setOperate', { selection: this.operate.selection, commit: true });
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ this.loading = false;
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ }
+ }, 1000).catch(() => {
+ this.loading = true;
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ }
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue
index 9316bb37b..631bcf2ea 100644
--- a/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmap/theme/chengdu_04/menus/menuDialog/childDialog/userDelete.vue
@@ -1,126 +1,136 @@
-
-
-
- 确定
-
-
- 取 消
-
-
-
+
+
+
+
+ {{ message }}
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue b/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue
index 268e5011f..9ec516a1c 100644
--- a/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue
+++ b/src/jmap/theme/chengdu_04/menus/passiveDialog/alarm.vue
@@ -1,208 +1,204 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 等 级
-
-
-
-
-
-
-
-
-
-
- 类 型
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确 定
-
-
- 未确认{{level}}级报警数目：1
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 等 级
+
+
+
+
+
+
+
+
+
+
+ 类 型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+
+
+ 未确认{{ level }}级报警数目：1
+
+
+
+
\ 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
index d9fccb9a3..44d3cbb9a 100644
--- a/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js
+++ b/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js
@@ -377,9 +377,6 @@ export const MenuDisabledState = {
// 单操到反位
reverse() {
},
- // 区故解
- solution() {
- },
// 属性
property() {
}
diff --git a/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue b/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue
index 2ee8bf9a4..e5ff4115a 100644
--- a/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue
+++ b/src/jmap/theme/chengdu_04/planSchedule/menuBar.vue
@@ -122,7 +122,6 @@
import XLSX from 'xlsx';
import { mapGetters } from 'vuex';
import { importRunPlan } from '@/api/runplan';
-import { importData } from '../planConvert';
import { launchFullscreen } from '@/utils/screen';
import { EventBus } from '@/scripts/event-bus';
diff --git a/src/jmap/theme/factory.js b/src/jmap/theme/factory.js
index 96b539ded..fc46c56f4 100644
--- a/src/jmap/theme/factory.js
+++ b/src/jmap/theme/factory.js
@@ -6,7 +6,7 @@ class Theme {
'02': 'fuzhou_01',
'03': 'beijing_01',
'04': 'chengdu_03',
- '05': 'batong_01'
+ '05': 'fuzhou_01' // 国际版运行图皮肤 指向05 福州线路
};
}
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
index d4d9d5c30..ece241e2b 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
@@ -1,72 +1,81 @@
-
-
-
- {{$t('global.confirm')}}
-
-
-
-
+
+
+
+ {{ $t('global.confirm') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
index 6a016b833..da9839f67 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
@@ -1,125 +1,135 @@
-
-
-
- {{$t('menu.menuChildDialog.determine')}}
-
-
- {{$t('menu.menuChildDialog.cancel')}}
-
-
-
+
+
+
+ {{ $t('menu.menuChildDialog.determine') }}
+
+
+ {{ $t('menu.menuChildDialog.cancel') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
index f51273537..d2d28910f 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
@@ -1,170 +1,181 @@
-
-
+
+ {{ $t('menu.menuChildDialog.determine') }}
+
+
+ {{ $t('menu.menuChildDialog.cancel') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
index a38a1cf00..3563ef085 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
@@ -1,122 +1,132 @@
-
-
+ 会话管理
+
+
+
+ 查询会话状态
+
+
+
+
+
+ 打开会话
+
+
+
+ 关闭会话
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.ConfirmTip.doClose();
+ this.isOpenMessage = true;
+ this.spdDisabled = true;
+ this.firstDisabled = true;
+ this.secondDisabled = true;
+ this.timeCountCommand = -1;
+ this.startSectionList = [];
+ this.endSectionList = [];
+ this.doClose();
+ }).catch(error => {
+ console.log(error);
+ });
+ },
+ // 处理右键菜单 确认临时限速
+ handleMenuConfirmLimit(operate) {
+ return {
+ type: operate.type,
+ code: operate.code,
+ over: true,
+ operation: OperationEvent.Section.confirmLimit.event,
+ val: operate.val
+ };
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue b/src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue
index f5656c12b..5aea6cf4c 100644
--- a/src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue
+++ b/src/jmap/theme/chengdu_04/menus/dialog/standDetail.vue
@@ -1,211 +1,219 @@
-
+
-
+
+
+
+ 限速数值
+
+ 起点
+
+
+
+ 区间选择
+ 公里标数值(m)
+
+ 终点
+
+
+
+ 区间选择
+ 公里标数值(m)
+
+ 查看设备
+
+ 首次确认
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- 限速数值
-
- 起点
-
-
-
-
-
- 区间选择
- 公里标数值(m)
-
- 终点
-
-
-
-
-
- 区间选择
- 公里标数值(m)
-
- 查看设备
-
- 首次确认
-
-
-
- 设备列表：
-
-
-
-
- {{item.name}}: {{item.text}}
-
-
+ 设备列表：
+
-
+
+ {{ item.name }}: {{ item.text }}
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
- 限速数值
-
- 起点
-
-
-
-
-
- 区间选择
- 公里标数值(m)
-
- 终点
-
-
-
-
-
- 区间选择
- 公里标数值(m)
-
- 查看设备
-
- 确认发送
-
-
-
- 设备列表：
-
-
-
-
- {{item.name}}: {{item.text}}
-
-
+
+
+
-
-
-
-
-
-
- 关闭
-
-
-
+
+
-
+
+
+
+ 限速数值
+
+ 起点
+
+
+
+
+
+ 区间选择
+ 公里标数值(m)
+
+ 终点
+
+
+
+
+
+ 区间选择
+ 公里标数值(m)
+
+ 查看设备
+
+ 确认发送
+
+
操作倒计时
-
- {{timeCountConfirm == -1 ? '' : timeCountConfirm}}
- 状态
-
- {{messageStatus}}
-
+ 设备列表：
+
+
+
+
+ {{ item.name }}: {{ item.text }}
+
+ 操作倒计时
+
+ {{ timeCountConfirm == -1 ? '' : timeCountConfirm }}
+ 状态
+
+ {{ messageStatus }}
+
-
- {{message}}
- -
- - -
+
+ {{ message }}
+
+
+
-
-
- {{message}}
-
-
-
- 报警详细描述
-
-
-
- -
+ 报警详细描述
+
+ +
-
- {{message}}
- -
- - -
+
+
+ {{ message }}
+
+
-
-
- {{message}}
-
-
-
+
+
+ {{ message }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
- {{$t('menu.menuChildDialog.determine')}}
-
-
- {{$t('menu.menuChildDialog.cancel')}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
- {{$t('global.confirm')}}
- {{$t('global.cancel')}}
+ {{ $t('global.confirm') }}
+ {{ $t('global.cancel') }}
diff --git a/src/jmap/theme/fuzhou_01/planConvert.js b/src/jmap/theme/fuzhou_01/planConvert.js
index e9671a035..d6713e0ca 100644
--- a/src/jmap/theme/fuzhou_01/planConvert.js
+++ b/src/jmap/theme/fuzhou_01/planConvert.js
@@ -10,108 +10,149 @@ export default {
/** 偏移时间*/
TranslationTime: 60 * 60 * 2,
+ /** excel解析配置*/
+ ExcelConfig: {
+ beginRow: 1,
+ beginCol: 0,
+ // fieldNum: 10,
+ columns: {
+ '默认上行折返轨': { key: 'upTrack', formatter: (val) => { return val; } },
+ '默认下行折返轨': { key: 'downTrack', formatter: (val) => { return val; } }
+ }
+ },
+
/** 解析exal数据转换为Json后台数据*/
importData(Sheet, JsonData) {
const dataList = convertSheetToList(Sheet, true);
-
- if (dataList && dataList.length) {
+ const needList = Object.keys(this.ExcelConfig.columns);
+ const tripObj = { upTrack: '', downTrack: '' };
+ if (dataList && dataList.length) {
const tIndex = dataList.findIndex(it => { return it[0]; });
+ if (dataList[0][0] == needList[0] && dataList[1][0] == needList[1]) {
+ for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += 1) {
+ var isContinue = true;
- /** 解析二维数组为json对象*/
- const reg0 = /^[↑|↓|¡|ü|ý|]+(.*)/;
- const reg1 = /^([▼|▲|¡ø|¨]+)\s*(\d+:\d+:\d+)/;
- const reg2 = /^(\d+:\d+:\d+)\s*([▼|▲|¡ø|¨]+)/;
- const reg3 = /^(\d+:\d+:\d+)\s*(\d+:\d+:\d+|)/;
- const reg4 = /[▼|▲|¡|ø|¨|]+/;
+ for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
+ isContinue = false;
- dataList.forEach((elem, i) => {
- var begin = -1;
- /** 跳过名称所在的行*/
- if (i != tIndex && elem && elem.length > 0) {
- elem.forEach((item, j) => {
- /** 过滤空值*/
- if (item) {
- var value = `${item}`.trim();
- var title = `${dataList[tIndex][j]}`.trim();
- /** 匹配到开始位置或者结束位置*/
- if (reg0.test(value)) {
- if (begin == -1) {
- begin = value; // 设置初始索引
- JsonData.push({
- code: reg0.exec(value)[1],
- arrivalList: []
- });
- } else if (begin === value) {
- begin = -1; // 清空初始索引
- }
- } else if (begin !== -1) {
- /** 匹配到中间位置*/
- var begTime, endTime;
- var runFlag = JsonData[JsonData.length - 1].code[2];
- var stationName = title.replace(/\s/, '');
- var need = false;
- var flag = false;
- if (reg1.test(value)) {
- /** 含有特殊字符的时间格式*/
- [, begTime, endTime] = reg1.exec(value);
+ var title = dataList[colIndex][0];
+ var value = dataList[colIndex][rowIndex];
- begTime = reg4.test(begTime) ? '' : begTime;
- endTime = reg4.test(endTime) ? '' : endTime;
+ if (title && value) {
+ // 数据列解析
+ isContinue = true;
+ var titleStr = `${title}`.replace(/\s*/g, '');
+ var valueStr = `${value}`.replace(/\s*/g, '');
- /** 下行方向时间互换*/
- if (runFlag === '2') {
- [begTime, endTime] = [endTime, begTime];
- }
-
- /** 设置标志*/
- [need, flag] = [true, true];
- } else if (reg2.test(value)) {
- /** 含有特殊字符的时间格式*/
- [, begTime, endTime] = reg2.exec(value);
-
- begTime = reg4.test(begTime) ? '' : begTime;
- endTime = reg4.test(endTime) ? '' : endTime;
-
- /** 下行方向时间互换*/
- if (runFlag === '2') {
- [begTime, endTime] = [endTime, begTime];
- }
-
- /** 设置标志*/
- [need, flag] = [true, true];
- } else if (reg3.test(value)) {
- /** 正常时间格式*/
- [, begTime, endTime] = reg3.exec(value);
-
- /** 如果只存在一个数据时，则开始和结束设置一样*/
- endTime = endTime || begTime;
-
- /** 下行方向时间互换*/
- if (runFlag === '2') {
- [begTime, endTime] = [endTime, begTime];
- }
-
- /** 设置标志*/
- [need, flag] = [true, false];
- }
-
- /** 添加json数据*/
- if (need) {
- var stationObj = {
- stationName: stationName
- };
-
- if (begTime) { stationObj['arriveTime'] = prefixTime(begTime); }
- if (endTime) { stationObj['departureTime'] = prefixTime(endTime); }
- if (flag) { stationObj['flag'] = flag; }
- JsonData[JsonData.length - 1].arrivalList.push(stationObj);
- }
+ // 取需要的字段
+ if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
+ tripObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
}
}
- });
+
+ }
}
- });
+ } else {
+ /** 解析二维数组为json对象*/
+ const reg0 = /^[↑|↓|¡|ü|ý|]+(.*)/; // ↑|↓
+ const reg1 = /^([▼|▲|¡ø|¨]+)\s*(\d+:\d+:\d+)/; // ▲ 06:10:00
+ const reg2 = /^(\d+:\d+:\d+)\s*([▼|▲|¡ø|¨]+)/; // 06:10:00 ▲
+ const reg3 = /^(\d+:\d+:\d+)\s*(\d+:\d+:\d+|)/; // 06:10:00 06:12:00
+ const reg4 = /[▼|▲|¡|ø|¨|]+/; // ▲
+
+ dataList.forEach((elem, i) => {
+ var begin = -1;
+ /** 跳过名称所在的行*/
+ if (i != tIndex && elem && elem.length > 0) {
+ elem.forEach((item, j) => {
+ /** 过滤空值*/
+ if (item) {
+ var value = `${item}`.trim();
+ var title = `${dataList[tIndex][j]}`.replace(/\s*/g, '');
+ /** 匹配到开始位置或者结束位置*/
+ if (reg0.test(value)) {
+ if (begin == -1) {
+ begin = value; // 设置初始索引
+ JsonData.push({
+ code: reg0.exec(value)[1],
+ arrivalList: []
+ });
+ } else if (begin === value) {
+ begin = -1; // 清空初始索引
+ }
+ } else if (begin !== -1) {
+ /** 匹配到中间位置*/
+ var begTime, endTime;
+ var runFlag = JsonData[JsonData.length - 1].code[2];
+ var stationName = title.replace(/\s/, '');
+ var need = false;
+ var flag = false;
+ if (reg1.test(value)) {
+ /** 含有特殊字符的时间格式*/
+ [, begTime, endTime] = reg1.exec(value);
+
+ begTime = reg4.test(begTime) ? '' : begTime;
+ endTime = reg4.test(endTime) ? '' : endTime;
+
+ /** 下行方向时间互换*/
+ if (runFlag === '2') {
+ [begTime, endTime] = [endTime, begTime];
+ }
+
+ /** 设置标志*/
+ [need, flag] = [true, true];
+ } else if (reg2.test(value)) {
+ /** 含有特殊字符的时间格式*/
+ [, begTime, endTime] = reg2.exec(value);
+
+ begTime = reg4.test(begTime) ? '' : begTime;
+ endTime = reg4.test(endTime) ? '' : endTime;
+
+ /** 下行方向时间互换*/
+ if (runFlag === '2') {
+ [begTime, endTime] = [endTime, begTime];
+ }
+
+ /** 设置标志*/
+ [need, flag] = [true, true];
+ } else if (reg3.test(value)) {
+ /** 正常时间格式*/
+ [, begTime, endTime] = reg3.exec(value);
+
+ /** 如果只存在一个数据时，则开始和结束设置一样*/
+ endTime = endTime || begTime;
+
+ /** 下行方向时间互换*/
+ if (runFlag === '2') {
+ [begTime, endTime] = [endTime, begTime];
+ }
+
+ /** 设置标志*/
+ [need, flag] = [true, false];
+ }
+
+ /** 添加json数据*/
+ if (need) { // 储存非空 数据
+ var stationObj = {
+ stationName: stationName
+ };
+
+ if (begTime) { stationObj['arriveTime'] = prefixTime(begTime); }
+ if (endTime) { stationObj['departureTime'] = prefixTime(endTime); }
+ if (flag) { stationObj['flag'] = flag; } // 是否转换轨
+ JsonData[JsonData.length - 1].arrivalList.push(stationObj);
+ }
+ }
+ }
+ });
+ }
+ });
+ }
}
+ JsonData.forEach(item => {
+ item['upTrack'] = tripObj.upTrack;
+ item['downTrack'] = tripObj.downTrack;
+ });
return JsonData;
},
@@ -154,8 +195,9 @@ export default {
if (!train.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
lastPoint = train.stationTimeList[idx];
nextPoint = service.tripNumberDataList[j + 1].stationTimeList[0];
- opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode]);
- opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode]);
+ const aa = `${train.directionCode}${train.tripNumber}`;
+ opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']);
+ opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']);
}
/** 如果是备用车，按车次添加线*/
diff --git a/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue b/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
index 1c59e0e01..051bf99f5 100644
--- a/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
+++ b/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
@@ -3,23 +3,23 @@
-
-
-
+
- {{$t('menu.menuDialog.versionName')}}
- {{$t('menu.menuDialog.confirm')}}
-
-
- {{$t('menu.menuDialog.copyright')}}
-
-
+
+
-
-
- {{$t('menu.menuDialog.confirm')}}
-
-
- {{$t('menu.menuDialog.cancel')}}
-
-
-
+
+
+
+ {{ $t('menu.menuDialog.confirm') }}
+
+
+ {{ $t('menu.menuDialog.cancel') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
index c7980de07..881bd0b50 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
@@ -1,188 +1,196 @@
-
-
-
-
- {{$t('menu.menuDialog.confirm')}}
-
-
- {{$t('menu.menuDialog.cancel')}}
-
-
-
+
+
+
+
+ {{ $t('menu.menuDialog.confirm') }}
+
+
+ {{ $t('menu.menuDialog.cancel') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
index adfc1e675..b88e1b9d0 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
@@ -1,441 +1,472 @@
-
-
-
-
-
-
-
- {{scope.row.operate}}
-
-
-
-
- {{scope.row.control}}
-
-
-
-
- {{scope.row.status}}
-
-
-
-
- {{scope.row.result}}
-
-
-
-
-
- {{$t('menu.menuDialog.forcedStationControl')}}
- {{$t('menu.menuDialog.requestStationControl')}}
-
- {{$t('menu.menuDialog.requestInTheControl')}}
-
-
-
- {{$t('menu.menuDialog.close')}}
-
-
-
-
+
+
+
+
+
+
+
+ {{ scope.row.operate }}
+
+
+
+
+ {{ scope.row.control }}
+
+
+
+
+ {{ scope.row.status }}
+
+
+
+
+ {{ scope.row.result }}
+
+
+
+
+
+ {{ $t('menu.menuDialog.forcedStationControl') }}
+ {{ $t('menu.menuDialog.requestStationControl') }}
+
+ {{ $t('menu.menuDialog.requestInTheControl') }}
+
+
+
+ {{ $t('menu.menuDialog.close') }}
+
+
+
+
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
index b890854f5..dea29ff74 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
@@ -1,155 +1,167 @@
-
-
-
-
-
-
-
- {{$t('menu.menuDialog.confirm')}}
-
-
- {{$t('menu.menuDialog.cancel')}}
-
-
-
+
+
+
+
+
+
+
+ {{ $t('menu.menuDialog.confirm') }}
+
+
+ {{ $t('menu.menuDialog.cancel') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
index 29dabbd91..d33c7bfdd 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
@@ -1,141 +1,149 @@
-
-
-
- {{$t('menu.menuDialog.terminalTwo')}}
-
-
-
-
-
-
-
-
-
-
- {{$t('menu.menuDialog.confirm')}}
-
-
- {{$t('menu.menuDialog.cancel')}}
-
-
-
+
+
+
+ {{ $t('menu.menuDialog.terminalTwo') }}
+
+
+
+
+
+
+
+
+ {{ $t('menu.menuDialog.confirm') }}
+
+
+ {{ $t('menu.menuDialog.cancel') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
index b57f51969..938f5227a 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
@@ -1,152 +1,164 @@
-
-
-
-
-
-
-
- {{$t('menu.menuDialog.confirm')}}
-
-
- {{$t('menu.menuDialog.cancel')}}
-
-
-
+
+
+
+
+
+
+
+ {{ $t('menu.menuDialog.confirm') }}
+
+
+ {{ $t('menu.menuDialog.cancel') }}
+
+
+
\ No newline at end of file
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.doClose();
+ }
+ }).catch(() => { this.doClose(); });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewDevice.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
index 48a0b769e..f188b6b0a 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
@@ -1,158 +1,166 @@
-
-
-
-
-
- {{$t('menu.menuDialog.confirm')}}
-
-
-
- {{$t('menu.menuDialog.cancel')}}
-
-
-
+
+
+
+
+
+ {{ $t('menu.menuDialog.confirm') }}
+
+
+
+ {{ $t('menu.menuDialog.cancel') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewName.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewName.vue
index e4a4480e7..a3cd8e862 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewName.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewName.vue
@@ -13,59 +13,59 @@
- {{$t('menu.menuDialog.signalName')}}
+ {{ $t('menu.menuDialog.signalName') }}
- {{$t('menu.menuDialog.standTrackName')}}
+ {{ $t('menu.menuDialog.standTrackName') }}
- {{$t('menu.menuDialog.buttonName')}}
+ {{ $t('menu.menuDialog.buttonName') }}
- {{$t('menu.menuDialog.reentryTrackName')}}
+ {{ $t('menu.menuDialog.reentryTrackName') }}
- {{$t('menu.menuDialog.trackName')}}
+ {{ $t('menu.menuDialog.trackName') }}
- {{$t('menu.menuDialog.transferTrackName')}}
+ {{ $t('menu.menuDialog.transferTrackName') }}
- {{$t('menu.menuDialog.turnoutName')}}
+ {{ $t('menu.menuDialog.turnoutName') }}
- {{$t('menu.menuDialog.indicatorName')}}
+ {{ $t('menu.menuDialog.indicatorName') }}
- {{$t('menu.menuDialog.turnoutSectionName')}}
+ {{ $t('menu.menuDialog.turnoutSectionName') }}
- {{$t('menu.menuDialog.destinationName')}}
+ {{ $t('menu.menuDialog.destinationName') }}
- {{$t('menu.menuDialog.axisSectionName')}}
+ {{ $t('menu.menuDialog.axisSectionName') }}
- {{$t('menu.menuDialog.kmPost')}}
+ {{ $t('menu.menuDialog.kmPost') }}
- {{$t('menu.menuDialog.confirm')}}
+ {{ $t('menu.menuDialog.confirm') }}
- {{$t('menu.menuDialog.cancel')}}
+ {{ $t('menu.menuDialog.cancel') }}
- {{$t('menu.menuDialog.confirm')}}
+ {{ $t('menu.menuDialog.confirm') }}
- {{$t('menu.menuDialog.cancel')}}
+ {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('menu.passiveDialog.level')}}
-
-
-
-
-
-
-
-
-
-
- {{$t('menu.passiveDialog.type')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('menu.passiveDialog.confirm')}}
-
-
- {{$t('menu.passiveDialog.unconfirmedMessageOne')}}{{level}}{{$t('menu.passiveDialog.unconfirmedMessageTwo')}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('menu.passiveDialog.level') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('menu.passiveDialog.type') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('menu.passiveDialog.confirm') }}
+
+
+ {{ $t('menu.passiveDialog.unconfirmedMessageOne') }}{{ level }}{{ $t('menu.passiveDialog.unconfirmedMessageTwo') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
index 04b760bae..af7a6ef96 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
+++ b/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
@@ -1,290 +1,308 @@
-
- {{`${requestInfo}${$t('menu.passiveDialog.requestAreaControlMode')}`}}
-
-
-
- {{scope.row.operate}}
-
-
-
-
- {{scope.row.control.name}}
-
-
-
-
- {{scope.row.target.name}}
-
-
-
-
-
-
- {{$t('menu.passiveDialog.messageOne')}} {{count}} {{$t('menu.passiveDialog.messageTwo')}}
-
-
- {{$t('menu.passiveDialog.agree')}}
-
-
-
- {{$t('menu.passiveDialog.refuse')}}
-
-
-
+
+ {{ `${requestInfo}${$t('menu.passiveDialog.requestAreaControlMode')}` }}
+
+
+
+ {{ scope.row.operate }}
+
+
+
+
+ {{ scope.row.control.name }}
+
+
+
+
+ {{ scope.row.target.name }}
+
+
+
+
+
+
+ {{ $t('menu.passiveDialog.messageOne') }} {{ count }} {{ $t('menu.passiveDialog.messageTwo') }}
+
+
+ {{ $t('menu.passiveDialog.agree') }}
+
+
+
+ {{ $t('menu.passiveDialog.refuse') }}
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue
index 68635274a..960018160 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue
+++ b/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue
@@ -1,106 +1,115 @@
-
- {{name}}，{{msg}}!
-
- {{$t('menu.passiveDialog.operationConfirm')}}
-
-
+
+ {{ name }}，{{ msg }}!
+
+ {{ $t('menu.passiveDialog.operationConfirm') }}
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue b/src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue
index 14f092b23..374b15bba 100644
--- a/src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue
+++ b/src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue
@@ -1,31 +1,25 @@
-
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue b/src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue
index afafa39cf..7f5e09c16 100644
--- a/src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue
+++ b/src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue
@@ -1,31 +1,26 @@
-
+
\ No newline at end of file
+
+
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
index 71be68ee9..a374d3359 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
@@ -13,10 +13,10 @@
- {{$t('menu.addToTheFront')}}
+ {{ $t('menu.addToTheFront') }}
- {{$t('menu.tripNumber') + $t('global.colon')}}
+ {{ $t('menu.tripNumber') + $t('global.colon') }}
@@ -29,7 +29,7 @@
- {{$t('global.startTime') + $t('global.colon')}}
+ {{ $t('global.startTime') + $t('global.colon') }}
@@ -44,10 +44,10 @@
- {{$t('menu.addToTheEnd')}}
+ {{ $t('menu.addToTheEnd') }}
- {{$t('menu.tripNumber') + $t('global.colon')}}
+ {{ $t('menu.tripNumber') + $t('global.colon') }}
@@ -60,7 +60,7 @@
- {{$t('global.startTime') + $t('global.colon')}}
+ {{ $t('global.startTime') + $t('global.colon') }}
@@ -75,7 +75,7 @@
- {{$t('menu.crossing') + $t('global.colon')}}
+ {{ $t('menu.crossing') + $t('global.colon') }}
@@ -86,7 +86,7 @@
- {{$t('global.details') + $t('global.colon')}}
+ {{ $t('global.details') + $t('global.colon') }}
@@ -98,13 +98,13 @@
- {{$t('menu.displaysDefaultStopTimesAndRunLevels')}}
+ {{ $t('menu.displaysDefaultStopTimesAndRunLevels') }}
- {{$t('global.confirm')}}
- {{$t('global.cancel')}}
+ {{ $t('global.confirm') }}
+ {{ $t('global.cancel') }}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
index 6fabe9ae7..5f611de38 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
@@ -11,8 +11,8 @@
>
- {{$t('global.select')}}
- {{$t('global.cancel')}}
+ {{ $t('global.select') }}
+ {{ $t('global.cancel') }}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
index 7386807c3..f47857639 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
@@ -11,8 +11,8 @@
>
- {{$t('menu.load')}}
- {{$t('global.cancel')}}
+ {{ $t('menu.load') }}
+ {{ $t('global.cancel') }}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue
index e2317098c..2fb45f3c2 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue
@@ -18,7 +18,7 @@
- {{this.$t('global.select')}}
+ {{ this.$t('global.select') }}
@@ -36,8 +36,8 @@
- {{$t('global.confirm')}}
- {{$t('global.cancel')}}
+ {{ $t('global.confirm') }}
+ {{ $t('global.cancel') }}
- {{$t('menu.deleteAllPreviousTasks')}}
+ {{ $t('menu.deleteAllPreviousTasks') }}
- {{$t('menu.deleteAllSubsequentTasks')}}
+ {{ $t('menu.deleteAllSubsequentTasks') }}
- {{$t('global.confirm')}}
- {{$t('global.cancel')}}
+ {{ $t('global.confirm') }}
+ {{ $t('global.cancel') }}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
index b2de44fca..a4a3725fb 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
@@ -11,8 +11,8 @@
:close-on-click-modal="false"
>
- {{$t('global.confirm')}}
- {{$t('global.cancel')}}
+ {{ $t('global.confirm') }}
+ {{ $t('global.cancel') }}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue
index 683a52308..a5ff93a21 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue
@@ -11,7 +11,7 @@
:close-on-click-modal="false"
>
- {{$t('menu.trainLine')}}
+ {{ $t('menu.trainLine') }}
@@ -24,19 +24,19 @@
- {{this.$t('menu.addTask2')}}
+ {{ this.$t('menu.addTask2') }}
- {{this.$t('menu.replace')}}
+ {{ this.$t('menu.replace') }}
- {{this.$t('menu.deleteTask2')}}
+ {{ this.$t('menu.deleteTask2') }}
- {{this.$t('menu.inTheLibrary')}}
- {{this.$t('menu.outOfTheLibrary')}}
+ {{ this.$t('menu.inTheLibrary') }}
+ {{ this.$t('menu.outOfTheLibrary') }}
@@ -50,21 +50,21 @@
- {{$t('menu.changeTripNumber')}}
+ {{ $t('menu.changeTripNumber') }}
- {{$t('menu.lineStartTime')}}
+ {{ $t('menu.lineStartTime') }}
- {{$t('menu.lineEndTime')}}
+ {{ $t('menu.lineEndTime') }}
- {{$t('menu.lineDetails')}}
+ {{ $t('menu.lineDetails') }}
@@ -76,11 +76,11 @@
- {{$t('menu.affectSubsequentTasks')}}
+ {{ $t('menu.affectSubsequentTasks') }}
- {{$t('global.confirm')}}
- {{$t('global.cancel')}}
+ {{ $t('global.confirm') }}
+ {{ $t('global.cancel') }}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
index a24c58412..5d6a1405a 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
@@ -15,7 +15,7 @@
- {{$t('menu.tripNumber') + $t('global.colon')}}
+ {{ $t('menu.tripNumber') + $t('global.colon') }}
@@ -32,14 +32,14 @@
- {{this.$t('menu.manual')}}
+ {{ this.$t('menu.manual') }}
- {{$t('menu.defaultStopTime') + $t('global.colon')}}
+ {{ $t('menu.defaultStopTime') + $t('global.colon') }}
@@ -56,7 +56,7 @@
- {{$t('menu.serviceNumber') + $t('global.colon')}}
+ {{ $t('menu.serviceNumber') + $t('global.colon') }}
- {{$t('menu.clearGuest')}}
+ {{ $t('menu.clearGuest') }}
- {{$t('menu.continuationPlan')}}
+ {{ $t('menu.continuationPlan') }}
- {{$t('menu.firstTrain')}}
+ {{ $t('menu.firstTrain') }}
@@ -85,7 +85,7 @@
- {{$t('menu.serialNumber') + $t('global.colon')}}
+ {{ $t('menu.serialNumber') + $t('global.colon') }}
@@ -102,14 +102,14 @@
- {{this.$t('menu.manual')}}
+ {{ this.$t('menu.manual') }}
- {{$t('menu.defaultRunLevel') + $t('global.colon')}}
+ {{ $t('menu.defaultRunLevel') + $t('global.colon') }}
@@ -126,7 +126,7 @@
- {{$t('global.startTime') + $t('global.colon')}}
+ {{ $t('global.startTime') + $t('global.colon') }}
- {{$t('menu.crossing') + $t('global.colon')}}
+ {{ $t('menu.crossing') + $t('global.colon') }}
@@ -161,7 +161,7 @@
{{ formatName(scope.row.beginStationCode) }}
-
{{ formatName(scope.row.endStationCode) }}
@@ -173,7 +173,7 @@
- {{$t('global.details') + $t('global.colon')}}
+ {{ $t('global.details') + $t('global.colon') }}
@@ -203,13 +203,13 @@
- {{$t('menu.displaysDefaultStopTimesAndRunLevels')}}
+ {{ $t('menu.displaysDefaultStopTimesAndRunLevels') }}
+
+
+ {{ $t('menu.menuDialog.versionName') }}
+ {{ $t('menu.menuDialog.confirm') }}
-
-
-
-
-
-
-
-
-
+
+
+ {{ $t('menu.menuDialog.copyright') }}
-
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/manageUser.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/manageUser.vue
index ed4f5ce58..dca68f04a 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/manageUser.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/manageUser.vue
@@ -1,282 +1,301 @@
-
- {{$t('menu.menuDialog.userList')}}
-
-
-
-
-
- {{scope.row.jobNumber}}
-
-
-
-
- {{scope.row.userName}}
-
-
-
-
-
-
-
- {{$t('menu.menuDialog.refresh')}}
-
- {{$t('menu.menuDialog.add')}}
-
- {{$t('menu.menuDialog.modify')}}
-
- {{$t('menu.menuDialog.delete')}}
-
-
-
-
-
+ {{ $t('menu.menuDialog.userList') }}
+
+
+
+
+
+ {{ scope.row.jobNumber }}
+
+
+
+
+ {{ scope.row.userName }}
+
+
+
+
+
+ {{ $t('menu.menuDialog.refresh') }}
+
+ {{ $t('menu.menuDialog.add') }}
+
+ {{ $t('menu.menuDialog.modify') }}
+
+ {{ $t('menu.menuDialog.delete') }}
+
+
+
+
+
- {{$t('menu.menuDialog.addLocation')}}
-
-
-
- {{$t('menu.menuDialog.terminalOne')}}
-
-
-
-
-
-
- {{$t('menu.menuDialog.frontTrainNumber')}}
-
-
-
+ {{ $t('menu.menuDialog.addLocation') }}
+
+
+
+ {{ $t('menu.menuDialog.terminalOne') }}
+
+
+
+
+ {{ $t('menu.menuDialog.frontTrainNumber') }}
+
+
+
- {{$t('menu.menuDialog.purpose')}}
-
-
-
- {{$t('menu.menuDialog.terminalTwo')}}
-
-
-
-
-
-
-
-
-
+ {{ $t('menu.menuDialog.purpose') }}
+
+
+
+ {{ $t('menu.menuDialog.terminalTwo') }}
+
+
+
+
+
+
+
- {{$t('menu.menuDialog.trainWindow')}}
-
-
- {{$t('menu.menuDialog.sectionBoundary')}}
-
-
- {{$t('menu.menuDialog.linkageAutoRouteShow')}}
-
-
- {{$t('menu.menuDialog.atsAutoTriggerShow')}}
-
-
+ {{ $t('menu.menuDialog.trainWindow') }}
+
+
+ {{ $t('menu.menuDialog.sectionBoundary') }}
+
+
+ {{ $t('menu.menuDialog.linkageAutoRouteShow') }}
+
+
+ {{ $t('menu.menuDialog.atsAutoTriggerShow') }}
+
+
- {{$t('menu.menuDialog.plantrainDisplayMode')}}
+ {{ $t('menu.menuDialog.plantrainDisplayMode') }}
- {{$t('menu.menuDialog.serviceNumber')}} + {{$t('menu.menuDialog.tripNumber')}}
+ {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}
- {{$t('menu.menuDialog.serviceNumber')}} + {{$t('menu.menuDialog.groupNumber')}}
+ {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}
- {{$t('menu.menuDialog.targetNumber')}} + {{$t('menu.menuDialog.tripNumber')}}
+ {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}
- {{$t('menu.menuDialog.targetNumber')}} + {{$t('menu.menuDialog.groupNumber')}}
+ {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}
- {{$t('menu.menuDialog.targetNumber')}} + {{$t('menu.menuDialog.serviceNumber')}} + {{$t('menu.menuDialog.tripNumber')}}
+ {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}
- {{$t('menu.menuDialog.targetNumber')}} + {{$t('menu.menuDialog.serviceNumber')}} + {{$t('menu.menuDialog.groupNumber')}}
+ {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}
- {{$t('menu.menuDialog.headCodeStationDisplayMode')}}
+ {{ $t('menu.menuDialog.headCodeStationDisplayMode') }}
- {{$t('menu.menuDialog.targetNumber')}} + {{$t('menu.menuDialog.tripNumber')}}
+ {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}
- {{$t('menu.menuDialog.targetNumber')}} + {{$t('menu.menuDialog.groupNumber')}}
+ {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}
- {{$t('menu.menuDialog.fontSize')}}
+ {{ $t('menu.menuDialog.fontSize') }}
- {{$t('menu.menuDialog.range')}}
+ {{ $t('menu.menuDialog.range') }}
-
+
+
\ No newline at end of file
+ this.menu = menuConvert(this.menu);
+ },
+ doShow(point) {
+ this.clickEvent();
+ this.initMenu();
+ if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+ this.$refs.popMenu.resetShowPosition(point);
+ }
+ },
+ doClose() {
+ if (this.$refs && this.$refs.popMenu) {
+ this.$refs.popMenu.close();
+ }
+ },
+ // 设置故障
+ setStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.stoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 取消故障
+ cancelStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.cancelStoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 故障解锁
+ fault() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.fault.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 切除
+ split() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.split.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 激活
+ active() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.active.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 区段计轴预复位
+ axlePreReset() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.axlePreReset.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 区段解锁
+ lock() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.lock.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 区段封锁
+ unlock() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.unlock.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.sectionCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 设置速度
+ setSpeed() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.setSpeed.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.speedCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 取消速度
+ cancelSpeed() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.cancelSpeed.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+ if (valid) {
+ const tempData = response.data;
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
+ }
+ });
+ },
+ // 新建列车
+ newTrain() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Section.type,
+ label: MapDeviceType.Section.label,
+ operation: OperationEvent.Section.newtrain.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainCreate.doShow(operate, this.selected);
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuSignal.vue b/src/jmap/theme/fuzhou_01/menus/menuSignal.vue
index 7fdcea09a..8924000c7 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuSignal.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuSignal.vue
@@ -39,7 +39,10 @@ export default {
},
props: {
selected: {
- type: Object
+ type: Object,
+ default() {
+ return null;
+ }
}
},
data() {
diff --git a/src/jmap/theme/fuzhou_01/menus/menuStation.vue b/src/jmap/theme/fuzhou_01/menus/menuStation.vue
index ff7540e4c..bd5ce0be0 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuStation.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuStation.vue
@@ -1,299 +1,302 @@
-
-
+
+
\ No newline at end of file
+ this.menu = menuConvert(this.menu);
+ },
+ doShow(point) {
+ this.clickEvent();
+ this.initMenu();
+ if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+ this.$refs.popMenu.resetShowPosition(point);
+ }
+ },
+ doClose() {
+ if (this.$refs && this.$refs.popMenu) {
+ this.$refs.popMenu.close();
+ }
+ },
+ // 设置故障
+ setStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Station.type,
+ label: MapDeviceType.Station.label,
+ operation: OperationEvent.Station.stoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 取消故障
+ cancelStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Station.type,
+ label: MapDeviceType.Station.label,
+ operation: OperationEvent.Station.cancelStoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 全站设置联锁自动触发
+ setAutoTrigger() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Station.type,
+ label: MapDeviceType.Station.label,
+ operation: OperationEvent.Station.setAutoTrigger.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 全站取消联锁自动触发
+ cancelAutoTrigger() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Station.type,
+ label: MapDeviceType.Station.label,
+ operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 上电解锁
+ powerUnLock() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Station.type,
+ label: MapDeviceType.Station.label,
+ operation: OperationEvent.Station.powerUnLock.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.stationCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 执行关键操作测试
+ execKeyOperationTest() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Station.type,
+ label: MapDeviceType.Station.label,
+ operation: OperationEvent.Station.execKeyOperationTest.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.stationCmdControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 所有进路自排关
+ humanControlALL() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Station.type,
+ label: MapDeviceType.Station.label,
+ operation: OperationEvent.Station.humanControlALL.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.stationHumanControlAll.doShow(operate);
+ }
+ });
+ },
+ // 所有进路自排开
+ atsAutoControlALL() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Station.type,
+ label: MapDeviceType.Station.label,
+ operation: OperationEvent.Station.atsAutoControlALL.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuStationControl.vue b/src/jmap/theme/fuzhou_01/menus/menuStationControl.vue
index 3d6215a27..6e394cecd 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuStationControl.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuStationControl.vue
@@ -1,68 +1,69 @@
-
-
+
+
\ No newline at end of file
+ }
+};
+
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
index 57f11dab4..ee1a74227 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
+++ b/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
@@ -1,209 +1,214 @@
-
- {{$t('menu.passiveDialog.alarmDetailedDescription')}}
-
-
-
- -
+ {{ $t('menu.passiveDialog.alarmDetailedDescription') }}
+
+ +