From ecbb6a964f96707907782b5c212d8203ce51f69d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 2 Sep 2020 09:17:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=87=8D=E7=BD=AE?=
=?UTF-8?q?=E4=BB=BF=E7=9C=9F=E4=BF=A1=E6=81=AF=E6=97=B6=E6=B8=85=E9=99=A4?=
=?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ningbo_03/menus/menuDialog/routeCommand.vue | 15 +++++++++------
src/views/newMap/jlmapNew/index.vue | 3 +--
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
index 145666c50..47599d7bb 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
@@ -23,22 +23,25 @@
- 用户管理
- 配置管理
- 角色管理
+ 设置进路
+ 取消进路
+ 禁止进路
-
+
确定(O)
-
+
应用(A)
-
+
关闭(C)
+
+ 帮助(H)
+
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index 381dc3eab..055d4f3aa 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -355,7 +355,7 @@ export default {
async simulationReset() {
await this.$store.dispatch('map/clearJlmapTrainView');
await this.$store.dispatch('map/setTrainWindowShow', false);
- // await this.$store.dispatch('training/over');
+ await this.$store.dispatch('map/resetActiveTrainList');
await this.$store.dispatch('socket/setSimulationReset'); // 清空
await this.$store.dispatch('socket/setSimulationStart');
await this.$store.dispatch('training/setMapDefaultState');
@@ -392,7 +392,6 @@ export default {
},
// 设置地图加载状态
mapViewLoaded(loading) {
- // console.log(loading, '**************');
this.loading = loading;
if (loading) {
this.$refs.progressBar && this.$refs.progressBar.start();
From 0d026649f33ae47256346e21bb752e5e5c6080b8 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 2 Sep 2020 09:23:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/shape/Section/index.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 2b6826dec..49ff8fa9b 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -160,7 +160,6 @@ export default class Section extends Group {
});
this.add(this.name);
model.nameShow && style.Section.logicText.show ? this.name.show() : this.name.hide();
- console.log(model.nameShow, style.Section.logicText.show);
} else if (model.type == '04') { // 道岔计轴区段
this.name = new ETextName({
zlevel: this.zlevel,