From 31605db52e287e415de8648af0a5850fa316bc52 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 23 Dec 2020 16:39:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7?=
=?UTF-8?q?=E7=BA=BF=20=E5=AE=9E=E8=AE=AD=E5=AE=9A=E4=B9=89=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../menus/dialog/routeSelection.vue | 6 +-
.../theme/chengdu_03/operationConfig.js | 67 +++++++++----------
.../components/menus/dialog/routeControl.vue | 7 +-
.../menus/dialog/sectionControl.vue | 7 +-
.../components/menus/dialog/switchControl.vue | 20 ++++--
5 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
index cc9bc606f..275a25208 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
@@ -127,7 +127,7 @@ export default {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
},
domIdConfirm() {
- return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+ return this.dialogShow ? OperationEvent.Signal.arrangementRoute.confirm.domId : '';
},
title() {
return '办理进路';
@@ -262,10 +262,10 @@ export default {
commit() {
if (this.row && this.row.canSetting) {
this.loading = true;
- commitOperate(menuOperate.Signal.arrangementRoute, {routeCode: this.row.code}, 1).then(({valid, operate})=>{
+ commitOperate({operation:OperationEvent.Signal.arrangementRoute.confirm.operation}, {routeCode: this.row.code}, 1).then(({valid, operate})=>{
this.loading = false;
if (valid) {
- this.$refs.passwordBox.doShow(operate);
+ this.$refs.passwordBox.doShow({operation:OperationEvent.Signal.arrangementRoute.menu.operation});
this.doClose();
}
}).catch((error) => {
diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js
index 347ee8804..bb58320ef 100644
--- a/src/jmapNew/theme/chengdu_03/operationConfig.js
+++ b/src/jmapNew/theme/chengdu_03/operationConfig.js
@@ -24,7 +24,7 @@ export default {
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【办理进路】' },
{ deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
- { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '04', orderNum: 3, operateCode: '3012', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '301', tip: '输入密码123，点击【确定】按钮' }
]
},
@@ -101,7 +101,7 @@ export default {
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
{ deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
- { deviceType: '04', orderNum: 3, operateCode: '2994', tip: '鼠标左键点击【{5}】按钮', codeType:'SIGNAL' }
+ { deviceType: '04', orderNum: 3, operateCode: '2994', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
]
},
{ // 不生成实训
@@ -173,8 +173,7 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封锁】' },
- { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' },
- { deviceType: '04', orderNum: 3, operateCode: '306', tip: '输入密码123，点击【确定】按钮' }
+ { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@@ -187,7 +186,7 @@ export default {
trainingType: 'Signal',
productTypes: ['01'],
stepVOList: [
- { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' },
+ { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【封锁】' },
{ deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
]
},
@@ -202,8 +201,8 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
- { deviceType: '04', orderNum: 2, operateCode: '307', tip: '鼠标左键点击【确认】按钮' },
- { deviceType: '04', orderNum: 3, operateCode: '307', tip: '输入密码123，点击【确认】按钮' }
+ { deviceType: '04', orderNum: 2, operateCode: '3072', tip: '鼠标左键点击【确认】按钮' },
+ { deviceType: '04', orderNum: 3, operateCode: '307', tip: '输入密码123，点击【确定】按钮' }
]
},
{
@@ -216,8 +215,8 @@ export default {
trainingType: 'Signal',
productTypes: ['01'],
stepVOList: [
- { deviceType: '04', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' },
- { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' },
+ { deviceType: '04', orderNum: 1, operateCode: '2992', tip: '鼠标左键点击【解封】' },
+ { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
]
},
@@ -318,7 +317,7 @@ export default {
trainingType: 'Switch',
productTypes: ['01'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【道岔定操】' },
+ { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键点击【道岔定操】' },
{ deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
]
},
@@ -346,8 +345,8 @@ export default {
trainingType: 'Switch',
productTypes: ['01'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键菜单选择【道岔反操】' },
- { deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【{7}】按钮', codeType:'SWITCH' }
+ { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键点击【道岔反操】' },
+ { deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
]
},
{
@@ -374,8 +373,8 @@ export default {
trainingType: 'Switch',
productTypes: ['01'], // 现地操作
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键菜单选择【道岔单锁】' },
- { deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{{7}}】', codeType:'SWITCH' }
+ { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键点击【道岔单锁】' },
+ { deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
]
},
{
@@ -402,9 +401,9 @@ export default {
trainingType: 'Switch',
productTypes: ['01'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键菜单选择【道岔解锁】' },
- { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' },
- { deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】按钮', codeType:'SWITCH' }
+ { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' },
+ { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
+ { deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
]
},
{
@@ -418,7 +417,7 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
- { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '02', orderNum: 2, operateCode: '1051', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '02', orderNum: 3, operateCode: '105', tip: '输入密码123，点击【确定】按钮' }
]
},
@@ -432,8 +431,8 @@ export default {
trainingType: 'Switch',
productTypes: ['01'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' },
- { deviceType: '02', orderNum: 2, operateCode: '2991', tip: '鼠标左键点击【{7}】按钮', codeType:'SWITCH' }
+ { deviceType: '02', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【封锁】' },
+ { deviceType: '02', orderNum: 2, operateCode: '2991', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
]
},
{
@@ -447,8 +446,8 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
- { deviceType: '02', orderNum: 2, operateCode: '106', tip: '鼠标左键点击【确认】按钮' },
- { deviceType: '02', orderNum: 3, operateCode: '106', tip: '输入密码123，点击【确认】按钮' }
+ { deviceType: '02', orderNum: 2, operateCode: '1062', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '02', orderNum: 3, operateCode: '106', tip: '输入密码123，点击【确定】按钮' }
]
},
{
@@ -461,9 +460,9 @@ export default {
trainingType: 'Switch',
productTypes: ['01'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' },
- { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' },
- { deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】按钮', codeType:'SWITCH' }
+ { deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键点击【解封】' },
+ { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
+ { deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
]
},
{
@@ -477,8 +476,8 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【区故解】' },
- { deviceType: '02', orderNum: 2, operateCode: '109', tip: '鼠标左键点击【确认】按钮' },
- { deviceType: '02', orderNum: 3, operateCode: '109', tip: '输入密码123，点击【确认】按钮' }
+ { deviceType: '02', orderNum: 2, operateCode: '1092', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '02', orderNum: 3, operateCode: '109', tip: '输入密码123，点击【确定】按钮' }
]
},
// 区段列表
@@ -493,8 +492,8 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区故解】' },
- { deviceType: '03', orderNum: 2, operateCode: '402', tip: '鼠标左键点击【确认】按钮' },
- { deviceType: '03', orderNum: 3, operateCode: '402', tip: '输入密码123，点击【确认】按钮' }
+ { deviceType: '03', orderNum: 2, operateCode: '4023', tip: '鼠标左键点击【确定】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '402', tip: '输入密码123，点击【确定】按钮' }
]
},
{
@@ -502,14 +501,14 @@ export default {
minDuration: 8,
operateType: CMD.Section.CMD_SECTION_FAULT_UNLOCK.value,
skinCode: '04',
- trainingName: '区故解({9})',
+ trainingName: '区故解({8}{9})',
trainingRemark: '故障解锁功能',
trainingType: 'Section',
productTypes: ['01'],
stepVOList: [
- { deviceType: '03', orderNum: 1, operateCode: '4020', tip: '鼠标右键菜单选择【区故解】' },
- { deviceType: '03', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' },
- { deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{9}】', codeType:'SECTION' }
+ { deviceType: '03', orderNum: 1, operateCode: '4020', tip: '鼠标左键点击【区故解】'},
+ { deviceType: '03', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{8}{9}】', codeType:'SECTION' }
]
},
{
@@ -523,7 +522,7 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: '410', tip: '鼠标右键菜单选择【属性】' },
- { deviceType: '03', orderNum: 2, operateCode: '410', tip: '鼠标左键点击【确认】按钮' }
+ { deviceType: '03', orderNum: 2, operateCode: '410', tip: '鼠标左键点击【确定】按钮' }
]
},
// 站台列表
diff --git a/src/jmapNew/theme/components/menus/dialog/routeControl.vue b/src/jmapNew/theme/components/menus/dialog/routeControl.vue
index 4a9b5d40e..050c532cd 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeControl.vue
@@ -83,6 +83,9 @@ export default {
return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
},
domIdConfirm() {
+ if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+ return OperationEvent.Signal.unlock.confirm.domId;
+ }
return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
},
title() {
@@ -276,8 +279,8 @@ export default {
unlock() {
switch (this.popClass) {
case 'chengdou-03__systerm':
- this.sendCommandNext(menuOperate.Signal.unlock).then(operate => {
- this.$refs.password.doShow(operate);
+ this.sendCommandNext({operation:OperationEvent.Signal.unlock.confirm.operation}).then(operate => {
+ this.$refs.password.doShow({operation:OperationEvent.Signal.unlock.menu.operation});
});
break;
default: this.sendCommand(menuOperate.Signal.unlock);
diff --git a/src/jmapNew/theme/components/menus/dialog/sectionControl.vue b/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
index 6d2bc097e..4de896c45 100644
--- a/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
@@ -85,6 +85,9 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
+ if (this.operation == OperationEvent.Section.fault.menu.operation) {
+ return OperationEvent.Section.fault.confirm.domId;
+ }
return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
},
title() {
@@ -187,7 +190,7 @@ export default {
// 区故解
fault() {
const operate = {
- operation: OperationEvent.Section.fault.menu.operation
+ operation: OperationEvent.Section.fault.confirm.operation
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -195,7 +198,7 @@ export default {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.doClose();
- this.$refs.passwordBox.doShow(operate);
+ this.$refs.passwordBox.doShow({operation: OperationEvent.Section.fault.menu.operation});
}
}).catch(() => {
this.loading = false;
diff --git a/src/jmapNew/theme/components/menus/dialog/switchControl.vue b/src/jmapNew/theme/components/menus/dialog/switchControl.vue
index 4010a5333..303952c07 100644
--- a/src/jmapNew/theme/components/menus/dialog/switchControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/switchControl.vue
@@ -110,6 +110,13 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
+ if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+ return OperationEvent.Switch.fault.confirm.domId;
+ } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+ return OperationEvent.Switch.unblock.confirm.domId;
+ } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+ return OperationEvent.Switch.block.confirm.domId;
+ }
return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
},
title() {
@@ -226,11 +233,10 @@ export default {
block() {
switch (this.popClass) {
case 'chengdou-03__systerm':
- this.openPasswordBox(this.operation);
+ this.openPasswordBox(OperationEvent.Switch.block);
break;
default: this.sendCommand(menuOperate.Switch.block);
}
-
},
// 道岔定位
locate() {
@@ -260,7 +266,7 @@ export default {
unblock() {
switch (this.popClass) {
case 'chengdou-03__systerm':
- this.openPasswordBox(this.operation);
+ this.openPasswordBox(OperationEvent.Switch.unblock);
break;
default: this.sendCommand(menuOperate.Switch.unblock);
}
@@ -269,7 +275,7 @@ export default {
fault() {
switch (this.popClass) {
case 'chengdou-03__systerm':
- this.openPasswordBox(this.operation);
+ this.openPasswordBox(OperationEvent.Switch.fault);
break;
default: this.sendCommand(menuOperate.Switch.fault);
}
@@ -280,9 +286,9 @@ export default {
},
// 打开密码输入框
- openPasswordBox(operation) {
+ openPasswordBox(operator) {
const operate = {
- operation: operation
+ operation: operator.confirm.operation
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -290,7 +296,7 @@ export default {
if (valid) {
this.doClose();
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.passwordBox.doShow(operate);
+ this.$refs.passwordBox.doShow({operation:operator.menu.operation});
}
}).catch(() => {
this.doClose();
From 0e340e53f3e94b514f0c4e5b11f4f8c545c62048 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 23 Dec 2020 17:49:51 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BC=96?=
=?UTF-8?q?=E5=88=B6=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/planMonitor/editTool/menuBar.vue | 16 +++++----
.../editTool/routingoperate/routeConfig.vue | 36 ++++++++++++-------
2 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue
index 79adb8aac..9f5aa4ea4 100644
--- a/src/views/planMonitor/editTool/menuBar.vue
+++ b/src/views/planMonitor/editTool/menuBar.vue
@@ -485,12 +485,16 @@ export default {
async handleTestRunPlan() {
const data = { planId: this.$route.query.planId || this.loadRunPlanId };
runPlanNotify(data).then(resp => {
- const query = {
- prdType: '01', group: resp.data, mapId: this.$route.query.mapId, planId: this.$route.query.planId
- };
- // this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
- this.$router.push({ path: UrlConfig.design.testRunPlan, query: query });
- launchFullscreen();
+ if (resp.data) {
+ const query = {
+ prdType: '01', group: resp.data, mapId: this.$route.query.mapId, planId: this.$route.query.planId
+ };
+ // this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
+ this.$router.push({ path: UrlConfig.design.testRunPlan, query: query });
+ launchFullscreen();
+ } else {
+ this.$messageBox(this.$t('error.checkTheValidityFirst'));
+ }
}).catch(error => {
this.$messageBox(this.$t('tip.createSimulationFaild') + this.$t('global.colon') + error.message);
});
diff --git a/src/views/planMonitor/editTool/routingoperate/routeConfig.vue b/src/views/planMonitor/editTool/routingoperate/routeConfig.vue
index afe856e72..4be242aaf 100644
--- a/src/views/planMonitor/editTool/routingoperate/routeConfig.vue
+++ b/src/views/planMonitor/editTool/routingoperate/routeConfig.vue
@@ -41,7 +41,7 @@
-
+
{{ $t('map.activate') }} -->
-
+
= 2) {
- list.splice(list.length - 1, 1, data);
- } else {
- list.push(data);
- }
+ // debugger;
+ // if (list.length >= 2) {
+ // list.splice(list.length - 1, 1, data);
+ // } else {
+ list.push(data);
+ // }
} else {
if (index == 0 && list.length >= 2) {
this.addModel.endSectionCode = list[list.length - 1].sectionCode;
From f3e235f78375c459da06c7d9c71725fa8b9e979a Mon Sep 17 00:00:00 2001
From: sunzhenyu
Date: Wed, 23 Dec 2020 18:02:41 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E7=BB=B4?=
=?UTF-8?q?=E7=89=B9=E5=88=AB=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8=E5=92=8C?=
=?UTF-8?q?=E8=AF=BB=E5=8F=96=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B2=99=E7=9B=98?=
=?UTF-8?q?=E5=92=8C=E9=A9=BE=E9=A9=B6=E8=AF=BB=E5=8F=96=E7=89=B9=E5=AE=9A?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?tdt=E8=AE=BE=E5=A4=87=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jlmap3d/edit/connect/specilDataSave.js | 191 ++++++++++++++++++
src/jlmap3d/edit/jl3dEditorLoader.js | 6 +-
.../edit/testEditorModel/StationStandList.js | 127 +++++++-----
src/jlmap3d/main/loaders/AssetLoader.js | 68 ++++---
src/jlmap3d/main/loaders/DriverLoadNew.js | 4 +-
src/jlmap3d/main/loaders/SimulationLoadNew.js | 5 +-
.../main/newmodel/StationStandListN.js | 55 +++--
src/jlmap3d/main/newmodel/TdtList.js | 4 +-
src/views/jlmap3d/edit/jlmap3dedit.vue | 4 +-
9 files changed, 357 insertions(+), 107 deletions(-)
create mode 100644 src/jlmap3d/edit/connect/specilDataSave.js
diff --git a/src/jlmap3d/edit/connect/specilDataSave.js b/src/jlmap3d/edit/connect/specilDataSave.js
new file mode 100644
index 000000000..04f4cddf4
--- /dev/null
+++ b/src/jlmap3d/edit/connect/specilDataSave.js
@@ -0,0 +1,191 @@
+//import request from '@/utils/request';
+export function specilDataSave(data) {
+ console.log(data);
+ let postmap = {
+ id:data.mapdata.id,
+ mapId:data.mapdata.mapId,
+ assets:"null",
+ sections:"null",
+ signals:"null",
+ trains:"null",
+ stands:"null",
+ switchs:"null",
+ others:"null",
+ };
+
+ if(data.mapdata.sectionlist.sections== undefined){
+ return postmap;
+ }
+
+
+ if(data == undefined){
+
+ return postmap;
+ }else{
+
+ let specilModel = [
+ {
+ id:"1",
+ name:"天府广场站",
+ code:"Station72223",
+ deviceType:"SimulationStation",
+ type:"Station72223",
+ url:"/MODEL/2020-12-23/119-45721.FBX"
+ },
+ {
+ id:"2",
+ name:"孵化园站",
+ code:"Station95125",
+ deviceType:"SimulationStation",
+ type:"Station95125",
+ url:"/MODEL/2020-12-23/117-12889.FBX"
+ },
+ {
+ id:"3",
+ name:"四河站",
+ code:"Station62009",
+ deviceType:"SimulationStation",
+ type:"Station62009",
+ url:"/MODEL/2020-12-23/118-99249.FBX"
+ },
+ ];
+
+
+ data.assetManager.others = specilModel;
+
+
+ let models = data.assetManager;
+ console.log(data.assetManager);
+ postmap.assets = JSON.stringify(models);
+
+
+ //section隧道
+ let sections = [];
+ for(let i in data.mapdata.sectionlist.sections.datalist){
+
+ let section = {
+ // uuid:data.mapdata.sectionlist.sections.modellist[i].uuid,
+ code:data.mapdata.sectionlist.sections.datalist[i].code,
+ name:data.mapdata.sectionlist.sections.datalist[i].name,
+ lengthFact:null,
+ standTrack:data.mapdata.sectionlist.sections.datalist[i].standTrack,
+ rp:data.mapdata.sectionlist.sections.datalist[i].rp,
+ lp:data.mapdata.sectionlist.sections.datalist[i].lp,
+ railpoint:null,
+ rail:data.mapdata.sectionlist.sections.datalist[i].rail,
+ position:null,
+ rotation:null,
+ scale:null,
+ }
+ if(data.mapdata.sectionlist.sections.datalist[i].mesh){
+ let nowmesh = data.mapdata.sectionlist.sectiongroup.getObjectByProperty("code",section.code);
+ section.railpoint = nowmesh.railpoint;
+ section.lengthFact = data.mapdata.sectionlist.sections.datalist[i].mesh.lengthFact;
+ section.position = data.mapdata.sectionlist.sections.datalist[i].mesh.position;
+ section.rotation = data.mapdata.sectionlist.sections.datalist[i].mesh.rotation;
+ section.scale = data.mapdata.sectionlist.sections.datalist[i].mesh.scale;
+ sections.push(section);
+ }
+
+ // if(data.mapdata.sectionlist.sections.datalist[i].rsection){
+ // section.rsection = data.mapdata.sectionlist.sections.datalist[i].rsection;
+ // }
+ // if(data.mapdata.sectionlist.sections.datalist[i].lsection){
+ // section.lsection = data.mapdata.sectionlist.sections.datalist[i].lsection;
+ // }
+ // if(data.mapdata.sectionlist.sections.datalist[i].csection){
+ // section.csection = data.mapdata.sectionlist.sections.datalist[i].csection;
+ // }
+
+ // testmesh1.position.z = link.position.z;
+
+
+ }
+ let arrray = {
+ section:sections,
+ };
+ postmap.sections = JSON.stringify(arrray);
+ //道岔
+ let switchs = [];
+
+ for(let i=0;i0;j--){
- let name = "C"+j;
- for(let i=0;i0;j--){
+ let name = "C"+j;
+ for(let i=0;i {
//console.log(data);
From 7705afc316dc236e24892a3691460bc5721a10dd Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 23 Dec 2020 18:57:49 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BB=98?=
=?UTF-8?q?=E5=88=B6=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/jmap/mapdraft.js | 9 ++++++++
.../editTool/routingoperate/routeConfig.vue | 22 +++++++++++++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index 63c48f6de..5f6529e7e 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -187,6 +187,15 @@ export function gernateRoutingSection(data) {
});
}
+/** 生成交路区段数据(运行图中)(新版)*/
+export function gernateRoutingSectionInRunplan(data) {
+ return request({
+ url: `/api/runPlan/userData/routing/path/generate`,
+ method: 'post',
+ data: data
+ });
+}
+
/** 更新交路(新版)*/
export function updateRoutingData(data) {
return request({
diff --git a/src/views/planMonitor/editTool/routingoperate/routeConfig.vue b/src/views/planMonitor/editTool/routingoperate/routeConfig.vue
index 4be242aaf..6a3d50a6f 100644
--- a/src/views/planMonitor/editTool/routingoperate/routeConfig.vue
+++ b/src/views/planMonitor/editTool/routingoperate/routeConfig.vue
@@ -90,6 +90,7 @@
+ 生成交路区段
import RouteOperate from './routeOperate';
import { setUID } from '@/jmapNew/utils/Uid';
-import { addRoutingData, updateRoutingData } from '@/api/jmap/mapdraft';
+import { addRoutingData, updateRoutingData, gernateRoutingSectionInRunplan } from '@/api/jmap/mapdraft';
import { mapGetters } from 'vuex';
import { formatName } from '@/utils/runPlan';
import Sortable from 'sortablejs';
@@ -194,6 +195,7 @@ export default {
isStartSelected:false,
allowSelect:false,
loading: false,
+ generating:false,
stationCode: '',
sectionCode: '',
DirectionCodeList: [{label: '右行', value: true}, {label: '左行', value: false}],
@@ -518,7 +520,7 @@ export default {
});
},
save() {
- this.addModel;
+ // this.addModel;
this.$refs.form.validate((valid) => {
if (valid) {
this.loading = true;
@@ -644,6 +646,22 @@ export default {
this.sectionCode = '';
this.stationCode = '';
}
+ },
+ generateParkSection() {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.generating = true;
+ gernateRoutingSectionInRunplan(this.buildModel(setUID('Routing'))).then(resp => {
+ this.generating = false;
+ if (resp.data.parkSectionCodeList && resp.data.parkSectionCodeList.length > 2) {
+ this.addModel.parkSectionCodeList = resp.data.parkSectionCodeList;
+ }
+ }).catch((error) => {
+ this.$messageBox('生成交路区段数据失败: ' + error.message);
+ this.generating = false;
+ });
+ }
+ });
}
}
};
From d9b7c7871d8ba83e83840710d595e57f53cecee6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 24 Dec 2020 09:35:47 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=B9=B3=E5=8F=B0=20?=
=?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=88=97=E8=A1=A8=20tree=20=E5=B1=95?=
=?UTF-8?q?=E5=BC=80=20=E6=94=B6=E8=B5=B7=E4=BB=A3=E7=A0=81=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trainingPlatform/demonList.vue | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index 7175a758e..29ab62e1c 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -88,6 +88,13 @@ export default {
return data.name.includes(value);
},
clickEvent(obj, data, ele, isReplace = false) {
+ if (ele) {
+ if ( ele.expanded) {
+ ele.expanded = false;
+ } else {
+ ele.expanded = true;
+ }
+ }
localStore.set('trainingPlatformCheckId' + this.filterSelect + this.userId + this.project, obj.key);
this.mapId = obj.key.split('-')[0];
if ( obj.type === 'Map') {
From a415d2e25cf2d74bbfe0bcaed6932a522f1828d1 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 24 Dec 2020 11:30:29 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/lesson/trainingRule/addBatch.vue | 1 -
src/views/publish/runPlanCommon/index.vue | 16 ++++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/views/lesson/trainingRule/addBatch.vue b/src/views/lesson/trainingRule/addBatch.vue
index 591c4074f..dbabf749c 100644
--- a/src/views/lesson/trainingRule/addBatch.vue
+++ b/src/views/lesson/trainingRule/addBatch.vue
@@ -19,7 +19,6 @@