-
{{ data.label + (data.userId? '(' + (simulationUsers[data.userId]||{}).nickName + ')': '') }}
-
{{ data.label + (data.userId? '(' + (simulationUsers[data.userId]||{}).nickName + ')': '') }}
-
-
-
呼叫中
+
+
+
{{ item.label }}
+
+
{{ data.label + (data.userId? '(' + (simulationUsers[data.userId]||{}).nickName + ')': '') }}
+
{{ data.label + (data.userId? '(' + (simulationUsers[data.userId]||{}).nickName + ')': '') }}
+
+
+ 呼叫中
+
+
+
@@ -167,6 +171,7 @@ export default {
commonConversation: false,
seconds:0,
inter:null,
+ connectSuccess:false,
recorders: null,
microphone:null,
createLoading:false,
@@ -193,7 +198,6 @@ export default {
commonMemberList: [],
messageList: [], // 消息列表
commonMessageList: [],
- temData: [],
conversitionStateMap:{},
myMemberId: ''
};
@@ -283,6 +287,20 @@ export default {
});
}
this.filterNode();
+ if (activeTrainList.length <= 0) {
+ this.resetCoversition();
+ this.treeData.forEach(item => {
+ if (item.children) {
+ const memberList = Object.values(item.children);
+ memberList.forEach(data =>{
+ data.active = false;
+ data.isConnect = false;
+ data.loading = false;
+ data.disabled = false;
+ });
+ }
+ });
+ }
// if (this.$refs.tree) {
// this.$refs.tree.filter(this.queryMember);
// }
@@ -318,23 +336,22 @@ export default {
// 有人退出会话更新人员列表
this.treeData.forEach(item => {
if (item.children && item.children.length) {
- item.children.forEach(data =>{
- if (data.id == val.memberId) {
- data.active = false;
- }
- });
+ const member = item.children[val.memberId];
+ member.active = false;
+ member.isConnect = false;
+ member.disabled = false;
}
});
},
'$store.state.training.memberList': function (val) {
if (val && val.length) {
this.memberData = this.$store.state.training.memberData;
- const dispatcherList = [];
- const electricDispatcherList = [];
- const depotDispatcherList = [];
- const stationSupervisorList = [];
- const driverList = [];
- const maintainerList = [];
+ const dispatcherList = {};
+ const electricDispatcherList = {};
+ const depotDispatcherList = {};
+ const stationSupervisorList = {};
+ const driverList = {};
+ const maintainerList = {};
val.forEach(item => {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
this.memberData[item.id]['active'] = false;
@@ -342,36 +359,40 @@ export default {
switch (item.type) {
case 'DISPATCHER':
this.memberData[item.id].label = '行调' + (item.name || '');
- dispatcherList.push(this.memberData[item.id]);
+ this.memberData[item.id].labelName = '行调' + (item.name || '');
+ dispatcherList[item.id] = this.memberData[item.id];
break;
case 'ELECTRIC_DISPATCHER':
- electricDispatcherList.push(this.memberData[item.id]);
+ electricDispatcherList[item.id] = this.memberData[item.id];
break;
case 'DEPOT_DISPATCHER':
this.memberData[item.id].label = '车辆段';
- depotDispatcherList.push(this.memberData[item.id]);
+ this.memberData[item.id].labelName = '车辆段' + (item.name || '');
+ depotDispatcherList[item.id] = this.memberData[item.id];
break;
case 'STATION_SUPERVISOR':
this.memberData[item.id].label = device.name;
+ this.memberData[item.id].labelName = '值班员-' + device.name;
// this.memberData[item.id].label = '值班员-' + device.name;
- stationSupervisorList.push(this.memberData[item.id]);
+ stationSupervisorList[item.id] = this.memberData[item.id];
break;
case 'DRIVER':
- // this.memberData[item.id].label = '司机-列车' + item.deviceCode;
this.memberData[item.id]['show'] = false;
this.memberData[item.id].label = item.deviceCode;
- driverList.push(this.memberData[item.id]);
+ this.memberData[item.id].labelName = '司机-' + item.deviceCode;
+ driverList[item.id] = this.memberData[item.id];
break;
case 'MAINTAINER':
this.memberData[item.id].label = '通号' + (item.name || '');
+ this.memberData[item.id].labelName = '通号' + (item.name || '');
// this.memberData[item.id].label = item.name || '';
- maintainerList.push(this.memberData[item.id]);
+ maintainerList[item.id] = this.memberData[item.id];
break;
}
});
// { label: '全部集中站', value: 'allConcentrateStation', active: false, sign: 'DEVICE_STATION' },
- stationSupervisorList.push({ label: '全部车站', value: 'allStation', active: false, sign: 'ALL_STATION' });
- driverList.push({ label: '所有列车', value: 'allTrain', show: false, active: false, sign: 'ALL_TRAIN' });
+ stationSupervisorList['ALL_STATION'] = { label: '全部车站', value: 'allStation', active: false, sign: 'ALL_STATION' };
+ driverList['ALL_TRAIN'] = { label: '所有司机', value: 'allTrain', show: false, active: false, sign: 'ALL_TRAIN' };
this.treeData = [{
label: '行调',
id: 'dispatcher',
@@ -398,7 +419,6 @@ export default {
type: 'role',
children: depotDispatcherList
}];
- this.temData = [...dispatcherList, ...stationSupervisorList, ...driverList, ...maintainerList, ...depotDispatcherList];
this.initCommonMemberList();
// this.$nextTick(() => {
// if (this.$refs.tree) {
@@ -413,15 +433,13 @@ export default {
'$store.state.socket.acceptConversionInvite':function(val) {
if (this.conversitionId == val.id) {
this.treeData.forEach(data => {
- data.children && data.children.forEach(item => {
- if (val.memberId == item.id && val.memberId != this.myMemberId) {
- if (item.active) {
- item.loading = false;
- } else {
- item.active = true;
- }
+ if (data.children && val.memberId != this.myMemberId) {
+ const member = data.children[val.memberId];
+ if (member) {
+ member.isConnect = true;
+ member.active ? member.loading = false : member.active = true;
}
- });
+ }
});
}
}
@@ -455,12 +473,15 @@ export default {
}
},
acceptUser(memberId) {
+ this.connectSuccess = true;
this.treeData.forEach(data => {
- data.children && data.children.forEach(item => {
- if (memberId == item.id) {
- item.active = true;
+ if (data.children) {
+ const member = data.children[memberId];
+ if (member) {
+ member.active = true;
+ member.isConnect = true;
}
- });
+ }
});
},
setSetting(data) {
@@ -468,16 +489,57 @@ export default {
},
// 创建会话 拨打电话
createCoversition() {
- if (this.memberIdList.length) {
+ if (this.memberIdList.length || this.memberObject) {
this.createLoading = true;
- this.treeData.forEach(data => {
- data.children && data.children.forEach(item => {
- if (item.active) {
- item.loading = true;
- }
+ if (this.memberIdList.length > 0) {
+ // this.memberObject
+ this.treeData.forEach(data => {
+ this.memberIdList.forEach(memberId=>{
+ const member = data.children[memberId];
+ if (member && member.active) { member.loading = true; }
+ });
});
- });
+ } else {
+ // allTrain
+ if (this.memberObject == 'ALL_STATION') {
+ const stationList = Object.values(this.treeData[1].children);
+ const length = stationList.length;
+ stationList.forEach((item, index) => {
+ if (index != length - 1) {
+ item.active = true;
+ item.loading = true;
+ } else {
+ item.active = false;
+ item.loading = false;
+ }
+ });
+ } else if (this.memberObject == 'ALL_TRAIN') {
+ const trainList = Object.values(this.treeData[2].children);
+ const length = trainList.length;
+ trainList.forEach((item, index) => {
+ if (index != length - 1) {
+ item.active = true;
+ item.loading = true;
+ } else {
+ item.active = false;
+ item.loading = false;
+ }
+ });
+ }
+ }
startConversition(this.group, this.memberIdList, this.memberObject).then(resp => {
+ this.connectSuccess = true;
+ if (this.memberObject == 'ALL_STATION') {
+ const stationList = this.treeData[1].children;
+ const member = stationList['ALL_STATION'];
+ member.active = false;
+ member.isConnect = true;
+ } else if (this.memberObject == 'ALL_TRAIN') {
+ const trainList = this.treeData[2].children;
+ const train = trainList['ALL_TRAIN'];
+ train.active = false;
+ train.isConnect = true;
+ }
this.messageList = [];
this.memberIdList = [];
this.memberObject = '';
@@ -606,10 +668,51 @@ export default {
},
// 点击按钮事件
handleCheckChange(data, jude = false) {
+ this.memberObject = '';
if (data.userId && data.userId == this.$store.state.user.id) {
return;
}
if (data.value == 'allConcentrateStation' || data.value == 'allStation' || data.value == 'allTrain') {
+ this.treeData.forEach(data => {
+ this.memberIdList.forEach(memberId=>{
+ const member = data.children[memberId];
+ if (member && member.active) { member.active = false; }
+ });
+ });
+ if (data.value == 'allStation') {
+ const stationList = Object.values(this.treeData[1].children);
+ const length = stationList.length;
+ if (!data.active) {
+ stationList.forEach((item, index) => {
+ if (index != length - 1) {
+ item.disabled = true;
+ }
+ });
+ } else {
+ stationList.forEach((item, index) => {
+ if (index != length - 1) {
+ item.disabled = false;
+ }
+ });
+ }
+ } else if (data.value == 'allTrain') {
+ const trainList = Object.values(this.treeData[2].children);
+ const length = trainList.length;
+ if (!data.active) {
+ trainList.forEach((item, index) => {
+ if (index != length - 1) {
+ item.disabled = true;
+ }
+ });
+ } else {
+ trainList.forEach((item, index) => {
+ if (index != length - 1) {
+ item.disabled = false;
+ }
+ });
+ }
+ }
+ this.memberIdList = [];
data.active = !data.active;
this.memberObject = data.sign;
} else {
@@ -637,20 +740,35 @@ export default {
},
// 过滤全部列车 显示正在运行的列车
filterNode() {
- this.treeData[2] && this.treeData[2]['children'].forEach(train => {
- train.show = false;
- if (this.activeTrains.includes(train.deviceCode)) {
- train.show = true;
+ if (this.treeData[2]) {
+ const trainList = Object.values(this.treeData[2]['children']);
+ trainList.forEach(train => {
+ train.show = false;
+ if (this.activeTrains.includes(train.deviceCode)) {
+ train.show = true;
+ }
+ });
+ const member = this.treeData[2]['children']['ALL_TRAIN'];
+ if (this.activeTrains.length > 0) {
+ member.show = true;
+ } else {
+ this.memberObject = '';
+ const trainList = Object.values(this.treeData[2].children);
+ trainList.forEach(train=>{
+ if (train.active) {
+ train.active = false;
+ const memberId = train.id;
+ this.memberIdList.splice(this.memberIdList.indexOf(memberId), 1);
+ }
+ });
}
- if (train.value == 'allTrain') {
- train.show = true;
- }
- });
+ }
},
// 退出会话
quitConversition() {
this.quitLoading = true;
overSimulationConversition(this.group, this.conversitionId).then(resp => {
+ this.connectSuccess = false;
this.conversitionMemberList = [];
this.messageList = [];
this.quitLoading = false;
@@ -658,10 +776,13 @@ export default {
// this.$refs.tree && this.$refs.tree.filter(this.queryMember);
// });
this.treeData.forEach(item => {
- if (item.children && item.children.length) {
- item.children.forEach(data =>{
+ if (item.children) {
+ const memberList = Object.values(item.children);
+ memberList.forEach(data =>{
data.active = false;
+ data.isConnect = false;
data.loading = false;
+ data.disabled = false;
});
}
});
@@ -787,6 +908,7 @@ export default {
resetCoversition() {
this.commonMessageList = [];
this.conversitionStateMap = {};
+ this.messageList = this.commonMessageList;
}
}
};
@@ -851,6 +973,20 @@ export default {
border-radius:4px;
font-size: 14px;
}
+ .content_connect{
+ position: absolute;
+ width: 73px;
+ height: 73px;
+ left: 5px;
+ top: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: rgba(0,0,0,0);
+ flex-direction: column;
+ border-radius:4px;
+ font-size: 14px;
+ }
}
.menuTrainListBtn {
background: #fff;
@@ -1027,5 +1163,13 @@ export default {
.chat-box-footer-send.disbled{
cursor: no-drop;
}
+.connectSuccess{
+ position:absolute;
+ width:100%;
+ height:100%;
+ left:0;
+ top:0;
+ z-index:2;
+}
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index 86664f7e5..b1aeb7bed 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -19,7 +19,7 @@
派班计划加载
派班计划预览
- 实操练习
+ 实操练习
理论考试
@@ -46,6 +46,7 @@ import ChangeMap from './dispatherContest/changeMap';
import { getSessionStorage } from '@/utils/auth';
import Scheduling from '@/views/newMap/displayNew/demon/scheduling';
import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView';
+import { EventBus } from '@/scripts/event-bus';
export default {
name:'DemonMenu',
components:{
@@ -102,6 +103,7 @@ export default {
group:'',
mapId:'',
lineCode:'',
+ practiceDisabled:false,
deviceShow: false,
drivingShow: false,
jl3dpassflow:this.$t('display.demon.passengerflow'),
@@ -124,6 +126,12 @@ export default {
this.group = this.$route.query.group;
this.mapId = this.$route.query.mapId;
this.lineCode = this.$route.query.lineCode;
+ EventBus.$on('loadScene', () => {
+ this.practiceDisabled = true;
+ });
+ EventBus.$on('quitScene', () => {
+ this.practiceDisabled = false;
+ });
},
methods:{
menuClick() {
diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index 81396b8db..6f7a94435 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -39,7 +39,7 @@
退出
- 退出剧本
+ 退出场景
结束
开始
@@ -72,6 +72,9 @@
+
+
+
@@ -93,14 +96,16 @@ import { PermissionType } from '@/scripts/ConstDic';
import { getCountTime } from '@/utils/index';
import { prefixIntrger } from '@/utils/date';
import { ScriptMode, TrainingMode } from '@/scripts/ConstDic';
-import { quitScriptNew } from '@/api/simulation';
+// import { quitScriptNew } from '@/api/simulation';
import SelectRole from '@/views/newMap/displayNew/scriptDisplay/component/selectRole';
import { setGoodsTryUse } from '@/api/management/goods';
// import {loadScriptNewMode } from '@/api/simulation';
-import {endScriptTraining } from '@/api/script';
-import {loadDraftScriptNewMode } from '@/api/designPlatform';
+
+import {competitionPracticalSceneStart, competitionPracticalSceneExit, competitionPracticalSceneFinish, getEmptyOperationalStatistics} from '@/api/competition';
import { launchFullscreen } from '@/utils/screen';
+import { EventBus } from '@/scripts/event-bus';
import { createSimulationNew } from '@/api/simulation';
+import OperationalStatistic from './operationalStatistic.vue';
import Vue from 'vue';
export default {
@@ -113,6 +118,7 @@ export default {
SceneList,
TheoryExamSelect,
TheoryExam,
+ OperationalStatistic,
// TheoryQuiz,
// ThroryResult,
SelectRole
@@ -203,6 +209,9 @@ export default {
}
});
},
+ '$store.state.socket.competitionPracticeFinish':function(val) {
+ this.getEmptyOperationalStatistics();
+ },
// '$store.state.socket.simulationOver':function(val) {
// !this.isGoback && this.back();
// },
@@ -379,8 +388,9 @@ export default {
});
},
handleQuitQuest() {
- quitScriptNew(this.group).then(resp => {
+ competitionPracticalSceneExit(this.group).then(resp => {
getSimulationInfoNew(this.group).then((res)=>{
+ EventBus.$emit('quitScene');
this.quitQuest();
// this.initLoadPage();
this.clearAllData();
@@ -451,7 +461,7 @@ export default {
this.runScriptMode(memberId);
},
endTraining() {
- endScriptTraining(this.group).then(res=>{
+ competitionPracticalSceneFinish(this.group).then(res=>{
this.isScriptRun = false;
if (this.scriptMode == ScriptMode.TEST) {
this.formatScore = res.data;
@@ -506,7 +516,7 @@ export default {
},
runScriptMode(memberId) {
// this.$store.dispatch('scriptRecord/updateBgSet', true);
- loadDraftScriptNewMode(memberId, this.group, this.scriptMode)
+ competitionPracticalSceneStart(this.group, memberId, this.scriptMode)
.then(res=>{
this.isScriptRun = true;
if (this.mapLocation) {
@@ -588,6 +598,11 @@ export default {
},
startTheoryExam(mode) {
this.$refs.theoryExam.doShow(mode);
+ },
+ getEmptyOperationalStatistics() {
+ getEmptyOperationalStatistics(this.group).then(res=>{
+ this.$refs.operationalStatistic.doShow(res.data);
+ });
}
// commitResult(result) {
// this.$refs.theoryResult.doShow(result);
diff --git a/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue b/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue
new file mode 100644
index 000000000..a79759c66
--- /dev/null
+++ b/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue
@@ -0,0 +1,77 @@
+
+
+
+ {{ item.description+':' }}
+
+
+
+
+
+
+
diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index 86c1bd376..a65387283 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -31,7 +31,8 @@
+
diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue
index 85b891688..cb94b7bf5 100644
--- a/src/views/newMap/newMapdraft/mapoperate/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/index.vue
@@ -65,6 +65,7 @@ import SplitStation from './splitStation';
import Arrow from './arrow';
import SplitScreen from './splitScreen';
import FloodGate from './floodGate';
+import DirectionRod from './directionRod';
import { EventBus } from '@/scripts/event-bus';
export default {
@@ -93,7 +94,8 @@ export default {
SplitStation,
Arrow,
SplitScreen,
- FloodGate
+ FloodGate,
+ DirectionRod
},
props: {
selected: {
@@ -132,7 +134,8 @@ export default {
{label: this.$t('map.boundingBox'), name:'CheckBox', menus:CheckboxDraft},
{label: '站间分隔', name:'SplitStation', menus:SplitStation},
{label: '箭头', name:'Arrow', menus:Arrow},
- {label: '防淹门', name: 'FloodGate', menus: FloodGate}
+ {label: '防淹门', name: 'FloodGate', menus: FloodGate},
+ {label: '方向杆', name: 'DirectionRod', menus: DirectionRod}
],
selectDevice:'',
enabledTab: 'Section',
diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue
index 7509c36be..2f86c8252 100644
--- a/src/views/newMap/newMapdraft/mapoperate/station.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/station.vue
@@ -26,9 +26,9 @@
-
+
-
+
+ 激活
@@ -128,6 +129,7 @@ export default {
modelList: [],
positionY: 0
},
+ rowData: {},
skins: [],
mergeRules: {
positionY: [
@@ -311,6 +313,8 @@ export default {
if (!this.editModel.routingStationList.includes(selected.code) && this.editModel.code != selected.code) {
this.editModel.routingStationList.push(selected.code);
}
+ } else if (selected && selected._type === 'Section' && this.field == 'standSection') {
+ this.$set(this.rowData, 'sectionCode', selected.code);
}
},
// 选择管理车站
@@ -389,7 +393,7 @@ export default {
if (item.control) {
model.controlModePoint = {
x: sectionModel.points[0].x + (sectionModel.points[last].x - sectionModel.points[0].x) / 2,
- y: sectionModel.points[0].y - this.addModel.positionY + 30
+ y: sectionModel.points[0].y - this.addModel.positionY + 45
};
}
models.push(model);
@@ -469,6 +473,16 @@ export default {
stationName: `车站 ${this.addModel.modelList.length + 1}`,
control: false
});
+ },
+ selectedSection(row) {
+ if (this.field !== 'standSection') {
+ this.hover('standSection');
+ this.rowData = row;
+ } else if (this.rowData !== row) {
+ this.rowData = row;
+ } else {
+ this.hover('standSection');
+ }
}
}
};
diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
index 005064467..423b823d1 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
@@ -310,11 +310,11 @@ export default {
const sectionc = this.findSectionData(sectionLists, elem.sectionCCode);
if (sectiona && sectionb && sectionc) {
let point = {
- x: sectiona.points[sectiona.points.length - 1].x,
+ x: sectiona.points[sectiona.points.length - 1].x - 15,
y: sectiona.points[sectiona.points.length - 1].y
};
if (JSON.stringify(sectiona.points[0]) === JSON.stringify(sectionb.points[sectionb.points.length - 1])) {
- point = { x: sectiona.points[0].x, y: sectiona.points[0].y };
+ point = { x: sectiona.points[0].x + 15, y: sectiona.points[0].y };
}
const sectionModel = getModel('Section');
const name = sectiona.name;
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index 74829baae..491a09db0 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -80,9 +80,9 @@ export default {
height: 800,
roadData: [],
focus: false,
- booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'guideNeedRouteSettingFirst'],
+ booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'guideNeedRouteSettingFirst', 'signalOpenAfterParking'],
selectList: ['runMode'],
- generalConfig: ['lockFirst', 'switchSingleHandle', 'upRight', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM', 'rmAtpSpeed', 'urmAtpSpeed', 'guideNeedRouteSettingFirst'],
+ generalConfig: ['lockFirst', 'switchSingleHandle', 'upRight', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM', 'rmAtpSpeed', 'urmAtpSpeed', 'guideNeedRouteSettingFirst', 'signalOpenAfterParking'],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
numberList: [],
@@ -104,7 +104,8 @@ export default {
switchLossChain: '道岔故障失表是否联动',
rmAtpSpeed: 'RM模式下ATP防护速度',
urmAtpSpeed: 'URM下ATP防护速度',
- guideNeedRouteSettingFirst: '引导办理是否需要先排列进路'
+ guideNeedRouteSettingFirst: '引导办理是否需要先排列进路',
+ signalOpenAfterParking: '是否列车停站开门后，才办理出站进路开放出站信号机'
}
};
},
diff --git a/vue.config.js b/vue.config.js
index f56070b32..73f199c82 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,8 +21,8 @@ module.exports = {
* In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
- publicPath: '/',
- outputDir: 'dist',
+ publicPath: '/cbtc',
+ outputDir: 'dist/cbtc',
assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录
lintOnSave: false,
productionSourceMap: false, // 项目打包后是否压缩