joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

iscs退出仿真调整&iscs绘制地图调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 14m22s
Details

Browse Source
This commit is contained in:
fan 2024-04-19 22:25:43 +08:00 committed by joylink_fanyuhong
parent d5eb68ea1c
commit 3fc31777a2
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/iscs/iscsDesign/demonList.vue
View File

@ -58,7 +58,7 @@ export default {
mapPublishList: [], mapPublishList: [],
pageTreeMap: { pageTreeMap: {
'01': [], '01': [],
'49': [ '63': [
{ {
// 牵引降压混合变电所主接线图 变电所接线图 降压变电所主接线图 解除网图 混合变电所主接线图 // 牵引降压混合变电所主接线图 变电所接线图 降压变电所主接线图 解除网图 混合变电所主接线图
name: '电力监控系统', name: '电力监控系统',

13
src/views/iscs/iscsSystem/stationNav.vue
View File

@ -86,7 +86,7 @@ import { getByGroupStationList } from '@/api/jmap/map';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
// import { getSessionStorage } from '@/utils/auth'; // import { getSessionStorage } from '@/utils/auth';
import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
import { clearSimulation } from '@/api/simulation'; import { destroySimulationByAdmin } from '@/api/simulation';
import alarmConfig from './stationConfig/dialog/alarm'; import alarmConfig from './stationConfig/dialog/alarm';
import incidentConfig from './stationConfig/dialog/incident'; import incidentConfig from './stationConfig/dialog/incident';
@ -492,13 +492,16 @@ export default {
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {
location.reload(); location.reload();
}); });
} else { } else if(this.$store.state.training.simulationCreator){
clearSimulation(this.$route.query.group).then(resp => { destroySimulationByAdmin(this.$route.query.group).then(resp => {
this.$router.push({ path: `/trainingPlatform` }); history.go(-1);
}).catch(()=> { }).catch(()=> {
this.$message.error('清除仿真失败！'); this.$message.error('清除仿真失败！');
}); });
} } else {
history.go(-1);
}
}, },
quit() { quit() {
window.close(); window.close();

27
src/views/iscs/iscsSystemNew/stationNav.vue
View File

@ -82,6 +82,7 @@ import iscs_icon7 from '@/assets/iscs_system/iscs_icon7.png';
import alarmConfig from './stationConfig/dialog/alarm'; import alarmConfig from './stationConfig/dialog/alarm';
import incidentConfig from './stationConfig/dialog/incident'; import incidentConfig from './stationConfig/dialog/incident';
import malfunction from './stationConfig/dialog/malfunction'; import malfunction from './stationConfig/dialog/malfunction';
import { destroySimulationByAdmin } from '@/api/simulation';
export default { export default {
name:'StationNav', name:'StationNav',
components: { components: {
@ -402,19 +403,19 @@ export default {
this.$refs.malfunction.doShow('CANCEL'); this.$refs.malfunction.doShow('CANCEL');
}, },
back() { back() {
history.go(-1); if (this.projectDevice) {
// this.clearSubscribe(); this.$store.dispatch('LogOut').then(() => {
// if (this.projectDevice) { location.reload();
// this.$store.dispatch('LogOut').then(() => { });
// location.reload(); } else if(this.$store.state.training.simulationCreator){
// }); destroySimulationByAdmin(this.$route.query.group).then(resp => {
// } else { history.go(-1);
// clearSimulation(this.$route.query.group).then(resp => { }).catch(()=> {
// this.$router.push({ path: `/trainingPlatform` }); this.$message.error('清除仿真失败！');
// }).catch(()=> { });
// this.$message.error('清除仿真失败！'); } else {
// }); history.go(-1);
// } }
} }
} }
}; };