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

iscs调整

Browse Source
This commit is contained in:
fan 2020-06-24 15:02:09 +08:00
parent e71f74a769
commit 86c7e44876
6 changed files with 257 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/iscs/constant/iscsData.js
View File

File diff suppressed because one or more lines are too long

4
src/router/index_Common.js
View File

@ -866,7 +866,7 @@ export const asyncRouter = [
}, },
children: [ children: [
{ {
path: 'edit/:id/:mode', path: 'edit',
component: IscsDraw, component: IscsDraw,
hidden: true hidden: true
} }
@ -908,7 +908,7 @@ export const asyncRouter = [
}, },
children: [ children: [
{ {
path: 'edit/:id/:mode', path: 'edit',
component: IscsDraw, component: IscsDraw,
hidden: true hidden: true
} }

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

@ -73,11 +73,6 @@ export default {
async loadInitData() { async loadInitData() {
this.treeList = []; this.treeList = [];
this.treeList = [ this.treeList = [
{
name: 'iscs系统',
id: 0,
type: 'system',
children: [
{ {
name: 'FAS界面', name: 'FAS界面',
mode: 'fas', mode: 'fas',
@ -103,197 +98,325 @@ export default {
mode: 'fas', mode: 'fas',
id: 'stand', id: 'stand',
type: 'system', type: 'system',
children: { children: [
{
name: '站台报警', name: '站台报警',
mode: 'fas', mode: 'fas',
id: 'stand', id: 'stand',
type: 'interface' type: 'interface'
}
}, },
{ {
name: '站台报警-公共', name: '公共区域',
mode: 'fas', mode: 'fas',
id: '12', id: 'standPublicArea',
type: 'interface' type: 'interface'
}
]
}, },
{ {
name: '系统状态', name: '系统状态',
mode: 'fas', mode: 'fas',
id: '13', id: 'systemState',
type: 'system',
children: [
{
name: '系统状态',
mode: 'fas',
id: 'systemState',
type: 'interface' type: 'interface'
} }
] ]
}
]
}, },
{ {
name: 'BAS界面', name: 'BAS界面',
mode: 'bas', mode: 'bas',
id: '2', id: 'bas',
type: 'system', type: 'system',
children: [ children: [
{ {
name: '大系统', name: '大系统',
mode: 'bas', mode: 'bas',
id: '21', id: 'bigSystem',
type: 'system',
children:[
{
name: '大系统',
mode: 'bas',
id: 'bigSystem',
type: 'interface' type: 'interface'
}
]
}, },
{ {
name: '小系统', name: '小系统',
mode: 'bas', mode: 'bas',
id: '22', id: 'smallSystem',
type: 'interface' type: 'system',
}, children: [
{ {
name: '小系统B端', name: '小系统A端(一)',
mode: 'bas', mode: 'bas',
id: '22-1', id: 'aSideOne',
type: 'interface' type: 'interface'
}, },
{ {
name: '小系统A端(二)', name: '小系统A端(二)',
mode: 'bas', mode: 'bas',
id: '22-2', id: 'aSideTwo',
type: 'interface' type: 'interface'
}, },
{
name: '小系统B端',
mode: 'bas',
id: 'bSide',
type: 'interface'
}
]
},
{ {
name: '水系统', name: '水系统',
mode: 'bas', mode: 'bas',
id: '23', id: 'waterSystem',
type: 'system',
children: [
{
name: '水系统',
mode: 'bas',
id: 'waterSystem',
type: 'interface' type: 'interface'
}
]
}, },
{ {
name: '照明', name: '照明',
mode: 'bas', mode: 'bas',
id: '24', id: 'lightingSystem',
type: 'system',
children: [
{
name: '照明系统',
mode: 'bas',
id: 'lightingSystem',
type: 'interface' type: 'interface'
}, },
{ {
name: 'EPS系统', name: 'EPS系统',
mode: 'bas', mode: 'bas',
id: '25', id: 'epsSystem',
type: 'interface' type: 'interface'
}
]
}, },
{ {
name: '电扶梯', name: '电扶梯',
mode: 'bas', mode: 'bas',
id: '26', id: 'electricEscalator',
type: 'system',
children: [
{
name: '电扶梯',
mode: 'bas',
id: 'electricEscalator',
type: 'interface' type: 'interface'
}
]
}, },
{ {
name: '机电排水', name: '机电排水',
mode: 'bas', mode: 'bas',
id: '27', id: 'waterSupply',
type: 'system',
children: [
{
name: '机电排水',
mode: 'bas',
id: 'waterSupply',
type: 'interface' type: 'interface'
}
]
}, },
{ {
name: '隧道通风', name: '隧道通风',
mode: 'bas', mode: 'bas',
id: '28', id: 'tunnelVentilation',
type: 'system',
children: [
{
name: '隧道通风',
mode: 'bas',
id: 'tunnelVentilation',
type: 'interface' type: 'interface'
}, },
{ {
name: '隧道通风-射流风机图', name: '射流风机图',
mode: 'bas', mode: 'bas',
id: '29', id: 'jetFan',
type: 'interface' type: 'interface'
}
]
}, },
{ {
name: '车站网络', name: '车站网络',
mode: 'bas', mode: 'bas',
id: '210', id: 'stationNet',
type: 'system',
children: [
{
name: '车站网络',
mode:'bas',
id: 'stationNet',
type: 'interface' type: 'interface'
} }
] ]
}
]
}, },
{ {
name: 'PSD界面', name: 'PSD界面',
mode: 'psd', mode: 'psd',
id: '3', id: 'psd',
type: 'system', type: 'system',
children: [ children: [
{ {
name: '屏蔽门', name: '屏蔽门',
mode: 'psd', mode: 'psd',
id: '31', id: 'psd',
type: 'system',
children: [
{
name: '屏蔽门',
mode: 'psd',
id: 'psd',
type: 'interface' type: 'interface'
} }
] ]
}
]
}, },
{ {
name: 'cctv界面', name: 'cctv界面',
mode: 'cctv', mode: 'cctv',
id: '4', id: 'cctv',
type: 'system', type: 'system',
children: [ children: [
{ {
name: '车站控制-站厅', name: '车站控制',
mode: 'cctv', mode: 'cctv',
id: '41', id: 'cctv',
type: 'system',
children: [
{
name: '站厅',
mode: 'cctv',
id: 'stationHall',
type: 'interface' type: 'interface'
}, },
{ {
name: '车站控制-站台', name: '站台',
mode: 'cctv', mode: 'cctv',
id: '42', id: 'stand',
type: 'interface' type: 'interface'
}, },
{
name: '云台',
mode: 'cctv',
id: 'holder',
type: 'interface'
}
]
},
{ {
name: '中心设备状态', name: '中心设备状态',
mode: 'cctv', mode: 'cctv',
id: '43', id: 'centralDeviceState',
type: 'interface' type: 'system',
}, children: [
{ {
name: '车站控制-云台', name: '中心设备状态',
mode: 'cctv', mode: 'cctv',
id: '44', id: 'centralDeviceState',
type: 'interface' type: 'interface'
} }
] ]
}
]
}, },
{ {
name: 'AFC界面', name: 'AFC界面',
mode: 'afc', mode: 'afc',
id: '5', id: 'afc',
type: 'system', type: 'system',
children: [ children: [
{ {
name: '售检票', name: '售检票',
mode: 'afc', mode: 'afc',
id: '51', id: 'afc',
type: 'system',
children: [
{
name: '售检票',
mode: 'afc',
id: 'afc',
type: 'interface' type: 'interface'
} }
] ]
}
]
}, },
{ {
name: 'ACS界面', name: 'ACS界面',
mode: 'acs', mode: 'acs',
id: '6', id: 'acs',
type: 'system', type: 'system',
children: [ children: [
{ {
name: '门禁-站台层', name: '门禁-站台层',
mode: 'acs', mode: 'acs',
id: '61', id: 'stand',
type: 'system',
children: [
{
name: '门禁-站台层',
mode: 'acs',
id: 'stand',
type: 'interface' type: 'interface'
}
]
}, },
{ {
name: '门禁-站厅层', name: '门禁-站厅层',
mode: 'acs', mode: 'acs',
id: '62', id: 'stationHall',
type: 'system',
children: [
{
name: '门禁-站厅层',
mode: 'acs',
id: 'stationHall',
type: 'interface' type: 'interface'
} }
] ]
}
]
}, },
{ {
name: '网络状态', name: '网络状态',
mode: 'netState', mode: 'netState',
id: '7', id: 'netState',
type: 'system', type: 'system',
children: [ children: [
{ {
name: '网络状态', name: '网络状态',
mode: 'netState', mode: 'netState',
id: '71', id: 'netState',
type: 'system',
children: [
{
name: '网络状态',
mode: 'netState',
id: 'netState',
type: 'interface' type: 'interface'
} }
] ]
@ -307,7 +430,7 @@ export default {
case 'system' : case 'system' :
break; break;
case 'interface': case 'interface':
this.$router.push({ path: `/iscs/design/edit/${obj.id}/${obj.mode}` }); this.$router.push({ path: `/iscs/design/edit`, query: {mode: obj.mode, system: data.parent.data.id, part: obj.id} });
break; break;
} }
}, },

10
src/views/iscs/iscsDraw/index.vue
View File

@ -49,24 +49,24 @@ export default {
}, },
computed:{ computed:{
iscsMode() { iscsMode() {
return this.$route.params.mode; return this.$route.query.mode;
} }
}, },
watch: { watch: {
$route(val) { $route(val) {
this.iscsChange(this.$route.params.id); this.iscsChange(this.$route.query.mode, this.$route.query.system, this.$route.query.part);
} }
}, },
mounted() { mounted() {
this.$refs.iscsPlate.show(); this.$refs.iscsPlate.show(this.$route.query.mode, this.$route.query.system, this.$route.query.part);
this.$refs.iscsPlate.drawIscsInit(); this.$refs.iscsPlate.drawIscsInit();
}, },
beforeDestroy() { beforeDestroy() {
}, },
methods: { methods: {
iscsChange(id) { iscsChange(mode, system, part) {
this.$refs.iscsPlate.show(id); this.$refs.iscsPlate.show(mode, system, part);
this.$refs.iscsPlate.drawIscsInit(); this.$refs.iscsPlate.drawIscsInit();
} }
} }

2
src/views/iscs/iscsSystem/config/net/netState.vue
View File

@ -18,7 +18,7 @@ export default {
}; };
}, },
mounted() { mounted() {
this.$refs.iscsPlate.show('net', 'netState', 'netState'); this.$refs.iscsPlate.show('netState', 'netState', 'netState');
}, },
methods: {} methods: {}
}; };

12
src/views/iscsSystem/index.vue
View File

@ -9,7 +9,7 @@
import Vue from 'vue'; import Vue from 'vue';
import Iscs from '@/iscs/iscs'; import Iscs from '@/iscs/iscs';
import { parser, deviceFactory } from '@/iscs/utils/parser'; import { parser, deviceFactory } from '@/iscs/utils/parser';
import iscsData from '@/iscs/constant/iscsData'; import {getIscsData} from '@/iscs/constant/iscsData';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { exitFullscreen } from '@/utils/screen'; import { exitFullscreen } from '@/utils/screen';
import { putJointTrainingSimulationUser } from '@/api/chat'; import { putJointTrainingSimulationUser } from '@/api/chat';
@ -92,8 +92,8 @@ export default {
this.iscsDestroy(); this.iscsDestroy();
}, },
methods: { methods: {
show (deviceCode) { show (mode, system, part) {
if (!deviceCode) { if (!mode || !system || !part) {
return; return;
} }
document.getElementById(this.iscsId).oncontextmenu = function (e) { document.getElementById(this.iscsId).oncontextmenu = function (e) {
@ -101,7 +101,7 @@ export default {
}; };
this.iscsDestroy(); this.iscsDestroy();
this.loading = true; this.loading = true;
const data = parser(iscsData[deviceCode], {width: this.canvasWidth, height: this.canvasHeight}); const data = parser(getIscsData(mode, system, part), {width: this.canvasWidth, height: this.canvasHeight});
this.$iscs = new Iscs({ this.$iscs = new Iscs({
dom: document.getElementById(this.iscsId), dom: document.getElementById(this.iscsId),
config: { config: {
@ -123,8 +123,8 @@ export default {
if (this.$route.query.group) { if (this.$route.query.group) {
this.$iscs.on('selected', this.onSelected, this); this.$iscs.on('selected', this.onSelected, this);
} }
this.setIscs(data, iscsData[deviceCode]); this.setIscs(data, getIscsData(mode, system, part));
this.$store.dispatch('iscs/setIscsData', iscsData[deviceCode]); this.$store.dispatch('iscs/setIscsData', getIscsData(mode, system, part));
if (this.$route.path.startsWith('/iscs/design')) { if (this.$route.path.startsWith('/iscs/design')) {
this.$iscs.on('keyboard', this.onKeyboard, this); this.$iscs.on('keyboard', this.onKeyboard, this);
} }