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

应急调度客户端逻辑生成调整&客户端切换调整

Browse Source
This commit is contained in:
fan 2023-05-12 15:57:40 +08:00
parent c142102de1
commit 47d4af94ed
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/newMap/display/simulationMenu/simulationMenu.vue
View File

@ -115,7 +115,9 @@ export default {
const mapClientList = mapClientMap ? mapClientMap[this.$route.query.simType] : [];
flag = false;
mapClientList.forEach(client => {
if (client.type === 'largePassengerView' && clientIdList.includes(client.id)) {
if (clientIdList.length && client.type === 'largePassengerView' && clientIdList.includes(client.id)) {
flag = true;
} else if (client.type === 'largePassengerView' && this.$store.state.training.roles === 'DISPATCHER') {
flag = true;
}
});

17
src/views/newMap/display/terminals/index.vue
View File

@ -19,7 +19,7 @@
<psl-terminal v-else-if="picture === 'psl'" ref="pslTerminal" :now-terminal="nowTerminal" />
<large-passenger-strategy v-else-if="picture === 'largePassengerStrategy'" ref="largePassengerStrategy" />
<large-passenger-view v-else-if="picture === 'largePassengerView'" ref="largePassengerView" />
<dispatcher-manage v-else-if="picture === 'dispatcherManage'" ref="dispatcherManage" @pictureChange="pictureChange" @loadingChange="loadingChange" />
<dispatcher-manage v-else-if="picture === 'dispatcherManage'" ref="dispatcherManage" @pictureChange="pictureChangeByType" @loadingChange="loadingChange" />
<big-screen v-else-if="picture === 'bigScreen'" ref="bigScreen" />
<schedule-work v-else-if="picture === 'scheduleWork'" ref="scheduleWork" />
<emergency-dispatch-work v-else-if="picture === 'emergency'" ref="emergencyDispatchWork" />
@ -29,9 +29,9 @@
<diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" />
<diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" :plan-id="loadPlanId" @pictureChange="pictureChangeAndPlan" />
<pis-terminal v-else-if="picture === 'pis'" ref="pisTerminal" />
<display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChange" />
<display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChangeByType" />
<tro-work v-else-if="picture === 'troWork'" ref="troWork" />
<tro-detail-work v-else-if="picture === 'troDetailWork'" ref="troDetailWork" :show-station-code="showStationCode" @pictureChange="pictureChange" />
<tro-detail-work v-else-if="picture === 'troDetailWork'" ref="troDetailWork" :show-station-code="showStationCode" @pictureChange="pictureChangeByType" />
<jl3d-maintainer-select v-else-if="picture === 'maintainerSelect'" ref="jl3dMaintainerSelect" />
<interlock-work v-if="picture=='interlockWork'" ref="interlockWork" :centralized-station-map="centralizedStationMap" />
@ -267,9 +267,18 @@ export default {
this.loading = true;
},
pictureChangeAndPlan(data) {
this.pictureChange(data.name);
const terminal = this.findTerminalFromMap(data.name);
if (terminal) {
this.pictureChange(terminal);
}
this.loadPlanId = data.planId;
},
pictureChangeByType(type) {
const terminal = this.findTerminalFromMap(type);
if (terminal) {
this.pictureChange(terminal);
}
},
pictureChange(terminal) {
this.picture = terminal.type;
this.nowTerminal = terminal;

4
src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
View File

@ -9,7 +9,7 @@
<client-show-list :client-list="clientRailwayList" :station-list="stationList" :terminals="getTerminals('RAILWAY')" />
</el-tab-pane>
<el-tab-pane class="view-control" label="应急调度" name="EMERGENCY">
<client-show-list :client-list="clientRailwayList" :station-list="stationList" :terminals="getTerminals('EMERGENCY')" />
<client-show-list :client-list="clientEmergencyList" :station-list="stationList" :terminals="getTerminals('EMERGENCY')" />
</el-tab-pane>
</el-tabs>
<div class="button_box">
@ -279,7 +279,7 @@ export default {
{
name: '大屏',
code: 'bigScreen',
isShow: () => type === 'METRO'
isShow: () => type === 'METRO' || type === 'EMERGENCY'
},
{