@@ -138,19 +138,23 @@ export default {
}
},
methods:{
- doShow(actionInfo) {
- this.tableData = [];
- this.delay = 0;
- this.actionId = actionInfo.id;
- getActionCondition(this.$route.query.group, this.actionId).then(resp => {
- if (resp.data) {
- this.tableData = resp.data.trainStatuses;
- this.delay = (resp.data.delay || 0) / 1000;
- }
- }).catch(()=> {
- this.$message.error('获取条件失败');
- });
- this.dialogVisible = true;
+ doShow(actionId) {
+ if (this.actionId === actionId && this.dialogVisible) {
+ this.handleClose();
+ } else {
+ this.tableData = [];
+ this.delay = 0;
+ this.actionId = actionId;
+ getActionCondition(this.$route.query.group, this.actionId).then(resp => {
+ if (resp.data) {
+ this.tableData = resp.data.trainStatuses;
+ this.delay = (resp.data.delay || 0) / 1000;
+ }
+ }).catch(()=> {
+ this.$message.error('获取条件失败');
+ });
+ this.dialogVisible = true;
+ }
},
handleClose() {
this.dialogVisible = false;
@@ -274,5 +278,6 @@ export default {
background: #FFF;
width: 400px;
height: 600px;
+ border-radius: 5px;
}
diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue
index f5916281a..d14ddc853 100644
--- a/src/views/scriptManage/getAction.vue
+++ b/src/views/scriptManage/getAction.vue
@@ -43,7 +43,7 @@
- 触发条件
+ {{ conditionActionId === actionInfo.id? '关闭条件':'触发条件' }}
{{ $t('scriptRecord.modifyConversitionButton') }}
确定
取消
@@ -86,7 +86,8 @@ export default {
modifyTextLoading:false,
deleteLoading:false,
// behaviorName:"",
- memberName: ''
+ memberName: '',
+ conditionActionId: ''
};
},
watch: {
@@ -114,7 +115,12 @@ export default {
this.loadOtherData(this.$route.query);
},
handleCondition(actionInfo) {
- this.$emit('showConditionManage', actionInfo);
+ if (this.conditionActionId === actionInfo.id) {
+ this.conditionActionId = '';
+ } else {
+ this.conditionActionId = actionInfo.id;
+ }
+ this.$emit('showConditionManage', actionInfo.id);
},
covertData(memberList, element) {
const member = memberList.find(elem=>{ return elem.id == element.memberId; });
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index c46217fa7..5612a9e39 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -430,6 +430,8 @@ export default {
this.quickChangeMember.list = [new_member];
this.$emit('resetChat');
}
+ this.$refs.conditionManage && this.$refs.conditionManage.handleClose();
+ this.$refs.getAction.conditionActionId = '';
this.$store.dispatch('training/setPrdType', '02');
this.$store.dispatch('map/resetActiveTrainList');
this.$store.dispatch('scriptRecord/updateRole', new_member.type + ':' + this.orignalUserRoleId);
@@ -558,8 +560,8 @@ export default {
this.$messageBox(error.message);
});
},
- showConditionManage(actionInfo) {
- this.$refs.conditionManage.doShow(actionInfo);
+ showConditionManage(actionId) {
+ this.$refs.conditionManage.doShow(actionId);
}
}
};
From 241633ef53e160ec299ea0ee493e14d4a0518b0b Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 5 Nov 2020 15:50:35 +0800
Subject: [PATCH 39/43] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=20=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=20=20=E9=BB=98=E8=AE=A4=E9=80=89id=E6=9C=80?=
=?UTF-8?q?=E5=B0=8F=E7=9A=84=E8=A1=8C=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../displayNew/dispatherContest/index.vue | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index babc8d6ac..52f6b213f 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -517,16 +517,16 @@ export default {
}
});
if (currentPlayList.length > 0) {
- if (currentPlayList.length > 1) {
- this.currentPlayList = currentPlayList;
- this.$refs.selectRole.doShow();
- } else {
- const member = currentPlayList[0];
- const memberId = member.id;
- (this.$store.state.training.memberData[member.id] || {}).userId = this.$store.state.user.id;
- (this.$store.state.training.memberData[member.id] || {}).disabled = true;
- this.runScriptMode(memberId);
- }
+ // if (currentPlayList.length > 1) {
+ // this.currentPlayList = currentPlayList;
+ // this.$refs.selectRole.doShow();
+ // } else {
+ const member = currentPlayList[0];
+ const memberId = member.id;
+ (this.$store.state.training.memberData[member.id] || {}).userId = this.$store.state.user.id;
+ (this.$store.state.training.memberData[member.id] || {}).disabled = true;
+ this.runScriptMode(memberId);
+ // }
}
},
runScriptMode(memberId) {
From cfc6f9648a32041a14827cfa6d1e001eae20a2ea Mon Sep 17 00:00:00 2001
From: lVAL
Date: Thu, 5 Nov 2020 16:58:42 +0800
Subject: [PATCH 40/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E7=BD=AE?=
=?UTF-8?q?=E8=83=8C=E6=99=AF=EF=BC=8C=E6=8C=89=E8=AE=A1=E5=88=92=E8=A1=8C?=
=?UTF-8?q?=E8=BD=A6=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/newMap/displayNew/index.vue | 4 +++-
.../scriptDisplay/scriptRecord/index.vue | 15 +++++----------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 0d0158e1e..4b46cb4f4 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -237,7 +237,9 @@ export default {
if (this.isDemon) {
this.$refs.menuDemon.initPlannedDriving(this.planRunning); // 是否正在按计划行车
} else if (this.isScript) {
- // this.$refs.menuScript.initPlannedDriving(resp.data.planRunning);
+ if (resp.data.planRunning) {
+ this.$store.commit('training/start');
+ }
}
} else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
this.dataError = true;
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index 0853d6856..1492e9d72 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -98,7 +98,6 @@ export default {
},
data() {
return {
- isDisable: false,
isScriptCommand:false,
isReplaceBg: false,
userRole:''
@@ -123,7 +122,10 @@ export default {
},
isStation() {
return this.$store.state.training.prdType == '01';
- }
+ },
+ isDisable() {
+ return this.$store.state.training.started;
+ }
},
watch: {
'$store.state.scriptRecord.bgSet':function (val) {
@@ -161,7 +163,7 @@ export default {
},
'$store.state.scriptRecord.userRole':function (val) {
this.userRole = val;
- }
+ }
},
beforeDestroy() {
// this.clearAutoSave();
@@ -182,18 +184,13 @@ export default {
selectBeginTime() {
this.$refs.setTime.doShow();
},
- resetBeginTime() {
- this.isDisable = false;
- },
start(model) {
- this.isDisable = true;
const data = {
time: model.initTime
};
ranAsPlan(data, this.group).then(res => {
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
}).catch((error) => {
- this.isDisable = false;
if (error.code == '5001') {
this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
} else if (error.code == '5002') {
@@ -218,7 +215,6 @@ export default {
});
},
end() {
- this.isDisable = false;
exitRunPlan(this.group).then(() => {
this.$store.dispatch('training/over').then(() => {
this.$store.dispatch('training/setMapDefaultState').then(() => {
@@ -228,7 +224,6 @@ export default {
});
});
}).catch(() => {
- this.isDisable = true;
this.$messageBox(this.$t('display.demon.endSimulationFail'));
});
},
From f09b1aa17d092a646f6173360446ddaa6b50b1af Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 5 Nov 2020 17:32:48 +0800
Subject: [PATCH 41/43] =?UTF-8?q?=E6=8C=89=E8=AE=A1=E5=88=92=E8=A1=8C?=
=?UTF-8?q?=E8=BD=A6=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../newMap/displayNew/dispatherContest/index.vue | 13 +++----------
src/views/newMap/displayNew/index.vue | 9 ++-------
src/views/newMap/displayNew/menuDemon.vue | 12 +++---------
src/views/newMap/jointTrainingNew/menuDemon.vue | 13 +++----------
4 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index 52f6b213f..83814e130 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -149,7 +149,6 @@ export default {
},
data() {
return {
- isDisable: false,
tryTime: 0, // 进入页面多少秒
timeNow: 0, // 进入页面 相对时间
time: null, // 定时器
@@ -198,6 +197,9 @@ export default {
},
scriptModeList() {
return ScriptMode;
+ },
+ isDisable() {
+ return this.$store.state.training.started;
}
},
watch: {
@@ -236,8 +238,6 @@ export default {
const initTime = new Date(this.$store.state.training.initTime || null);
const model = {initTime:this.formatTime(initTime)};
this.start(model);
- } else {
- this.isDisable = true;
}
}
},
@@ -286,9 +286,6 @@ export default {
const ss = prefixIntrger(initTime.getSeconds(), 2);
return `${hh}:${mm}:${ss}`;
},
- initPlannedDriving(isDisable) {
- this.isDisable = isDisable;
- },
loadInitData() {
const data = {
mapId: this.$route.query.mapId,
@@ -334,7 +331,6 @@ export default {
});
},
start(model) { // 开始仿真
- this.isDisable = true;
const data = {
time: model.initTime
};
@@ -344,7 +340,6 @@ export default {
ranAsPlan(data, this.group).then(res => {
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
}).catch(error => {
- this.isDisable = false;
if (error.code == '5001') {
this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
} else if (error.code == '5002') {
@@ -375,7 +370,6 @@ export default {
this.$refs.demonMenu.hideScheduling(run);
},
end() {
- this.isDisable = false;
exitRunPlan(this.group).then(() => {
this.$store.dispatch('training/over').then(() => {
this.$store.dispatch('training/setMapDefaultState').then(() => {
@@ -385,7 +379,6 @@ export default {
});
});
}).catch(() => {
- this.isDisable = true;
this.$messageBox(this.$t('display.demon.endSimulationFail'));
});
},
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 4b46cb4f4..08283ca47 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -233,13 +233,8 @@ export default {
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
this.$store.dispatch('training/countTime');
this.planRunning = resp.data.planRunning;
-
- if (this.isDemon) {
- this.$refs.menuDemon.initPlannedDriving(this.planRunning); // 是否正在按计划行车
- } else if (this.isScript) {
- if (resp.data.planRunning) {
- this.$store.commit('training/start');
- }
+ if (resp.data.planRunning) {
+ this.$store.commit('training/start');
}
} else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
this.dataError = true;
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 57e8d5b9f..b48b9eccf 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -98,7 +98,6 @@ export default {
},
data() {
return {
- isDisable: false,
tryTime: 0, // 进入页面多少秒
timeNow: 0, // 进入页面 相对时间
time: null, // 定时器
@@ -140,6 +139,9 @@ export default {
},
projectDevice() {
return this.$route.query.projectDevice;
+ },
+ isDisable() {
+ return this.$store.state.training.started;
}
},
watch: {
@@ -210,9 +212,6 @@ export default {
console.log(error);
}
},
- initPlannedDriving(isDisable) {
- this.isDisable = isDisable;
- },
loadInitData() {
const data = {
mapId: this.$route.query.mapId,
@@ -239,7 +238,6 @@ export default {
this.$refs.setTime.doShow();
},
start(model) { // 开始仿真
- this.isDisable = true;
const data = {
time: model.initTime
};
@@ -249,7 +247,6 @@ export default {
ranAsPlan(data, this.group).then(res => {
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
}).catch(error => {
- this.isDisable = false;
if (error.code == '5001') {
this.$messageBox(this.$t('error.mapDataError') + ',' + this.$t('error.startSimulationFailed'));
} else if (error.code == '5002') {
@@ -280,7 +277,6 @@ export default {
this.$refs.demonMenu.hideScheduling(run);
},
end() {
- this.isDisable = false;
exitRunPlan(this.group).then(() => {
this.$store.dispatch('training/over').then(() => {
this.$store.dispatch('training/setMapDefaultState').then(() => {
@@ -290,14 +286,12 @@ export default {
});
});
}).catch(() => {
- this.isDisable = true;
this.$messageBox(this.$t('display.demon.endSimulationFail'));
});
},
handleQuitQuest() {
quitScriptNew(this.group).then(resp => {
getSimulationInfoNew(this.group).then((res)=>{
- this.isDisable = false;
EventBus.$emit('clearRunSeries');
this.quitQuest();
this.initLoadPage();
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 6d45b0a21..b7fe108be 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -109,7 +109,6 @@ export default {
},
data() {
return {
- isDisable: false,
backLoading: false,
chatShow: true,
jsStart: true,
@@ -161,6 +160,9 @@ export default {
isDeviceLogin() {
const typeList = ['LW', 'CW'];
return typeList.includes(this.$route.query.type);
+ },
+ isDisable() {
+ return this.$store.state.training.started;
}
},
watch: {
@@ -172,11 +174,6 @@ export default {
});
}
},
- '$store.state.training.started': function (val) {
- if (val) {
- this.isDisable = true;
- }
- },
'$store.state.socket.simulationOver':function(val) {
if (val && this.project == 'refereeJsxt') {
this.$router.go(-1);
@@ -284,7 +281,6 @@ export default {
},
// 开始仿真
start(model) {
- this.isDisable = true;
const data = {
time: model.initTime
};
@@ -294,7 +290,6 @@ export default {
}
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
}).catch((error) => {
- this.isDisable = false;
if (error.code == '5001') {
this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
} else if (error.code == '5002') {
@@ -319,13 +314,11 @@ export default {
});
},
end() {
- this.isDisable = false;
exitRunPlan(this.group).then(()=>{
this.$store.dispatch('map/setTrainWindowShow', false);
this.$store.dispatch('map/resetActiveTrainList', false);
}).catch(() => {
this.$store.dispatch('training/over').then(() => {
- this.isDisable = true;
this.$store.dispatch('map/resetActiveTrainList', false);
this.$messageBox(this.$t('error.endSimulationFailed'));
});
From a212984e3db2cb3c9ae694b232b8fb4fb0abb989 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 5 Nov 2020 17:50:35 +0800
Subject: [PATCH 42/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BF=E7=9C=9F?=
=?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=8A=A0=E8=BD=BD=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/socket.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index b659b9c13..cbf64cbaf 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -141,6 +141,13 @@ function handle(state, data) {
case 'Simulation_Alarm':
state.simulationAlarmInfo = msg;
break;
+ case 'Simulation_Scenes_Reload':
+ if (msg) {
+ store.dispatch('training/start');
+ } else {
+ store.dispatch('training/over');
+ }
+ break;
}
}
From 02615110a26888463e0f3924531b5e6ac654286b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 5 Nov 2020 18:02:02 +0800
Subject: [PATCH 43/43] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=A1=E4=BB=B6?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/scriptManage/conditionManage.vue | 1 +
src/views/scriptManage/tipScriptRecord.vue | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/views/scriptManage/conditionManage.vue b/src/views/scriptManage/conditionManage.vue
index b8d4fb438..ce7bfa0cd 100644
--- a/src/views/scriptManage/conditionManage.vue
+++ b/src/views/scriptManage/conditionManage.vue
@@ -158,6 +158,7 @@ export default {
},
handleClose() {
this.dialogVisible = false;
+ this.$emit('clearConditionActionId');
this.initData();
},
getSectionName(code) {
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 5612a9e39..ddc1ca437 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -66,7 +66,7 @@