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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
fan 2020-05-22 13:05:36 +08:00
commit acfab51e85
33 changed files with 100 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/xian_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
View File

@ -32,8 +32,7 @@ export default {
data() {
return {
dialogShow: false,
messages: [this.$t('tip.commandFailed')],
operate: null
messages: [this.$t('tip.commandFailed')]
};
},
computed: {
@ -53,8 +52,7 @@ export default {
});
},
methods: {
doShow(operate, messages) {
this.operate = operate || {};
doShow(messages) {
this.dialogShow = true;
this.messages = [this.$t('tip.commandFailed')];
if (messages && messages != 'null') {

22
src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue
View File

@ -170,7 +170,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 信号关灯
@ -187,10 +187,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate, [error.message]);
this.$refs.noticeInfo.doShow();
});
},
// 信号重开
@ -207,10 +207,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate, [error.message]);
this.$refs.noticeInfo.doShow();
});
},
// 取消进路
@ -230,7 +230,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 进路交人工控
@ -250,7 +250,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 进路交ATS自动控
@ -270,7 +270,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 设置运行等级
@ -291,7 +291,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 停站时间
@ -312,7 +312,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 设置折返策略
@ -333,7 +333,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

2
src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
View File

@ -152,7 +152,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

14
src/jmapNew/theme/xian_01/menus/dialog/routeControl.vue
View File

@ -151,10 +151,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
},
// 信号关灯
@ -206,7 +206,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 取消联锁自动进路
@ -226,7 +226,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 设置联锁自动触发
@ -246,7 +246,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 取消联锁自动触发
@ -267,7 +267,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 取消
@ -281,7 +281,7 @@ export default {
}
}).catch(() => {
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
}
}

2
src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
View File

@ -143,7 +143,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

8
src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
View File

@ -297,10 +297,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
},
// 进路交自动控
@ -311,10 +311,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

6
src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue
View File

@ -138,10 +138,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
},
cancel() {
@ -154,7 +154,7 @@ export default {
}
}).catch(() => {
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
}
}

4
src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue
View File

@ -232,10 +232,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
}
},

4
src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue
View File

@ -129,10 +129,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

4
src/jmapNew/theme/xian_01/menus/dialog/setFault.vue
View File

@ -117,10 +117,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
},

2
src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue
View File

@ -214,7 +214,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
} else {
this.doClose();

4
src/jmapNew/theme/xian_01/menus/dialog/standControl.vue
View File

@ -153,10 +153,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

2
src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue
View File

@ -170,7 +170,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

5
src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue
View File

@ -79,6 +79,7 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { now } from '@/utils/date';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
name: 'StationCmdControl',
@ -311,11 +312,11 @@ export default {
if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
/** 上电解锁*/
operate.operation = OperationEvent.Station.powerUnLock.confirm2.operation;
// operate.cmdType = CMD.Station.powerUnLock;
operate.cmdType = CMD.Station.CMD_STATION_POWER_ON_UNLOCK;
} else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
/** 执行关键操作测试*/
operate.operation = OperationEvent.Station.execKeyOperationTest.confirm2.operation;
// operate.cmdType = CMD.Station.execKeyOperationTest;
operate.cmdType = CMD.Station.CMD_STATION_KEY_OPERATION_TEST;
}
this.setMessage('');

2
src/jmapNew/theme/xian_01/menus/dialog/stationHumanControlAll.vue
View File

@ -95,7 +95,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

2
src/jmapNew/theme/xian_01/menus/dialog/stationSetRouteControlAll.vue
View File

@ -117,7 +117,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

4
src/jmapNew/theme/xian_01/menus/dialog/switchControl.vue
View File

@ -144,10 +144,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
},

4
src/jmapNew/theme/xian_01/menus/dialog/trainAddPlan.vue
View File

@ -186,9 +186,9 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.$refs.noticeInfo.doShow(operate, error.message);
this.$refs.noticeInfo.doShow();
this.doClose();
});
} else {

8
src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
View File

@ -413,7 +413,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
} else {
return false;
@ -444,7 +444,7 @@ export default {
// }).catch(() => {
// this.loading = false;
// this.doClose();
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
// });
const params = {
groupNumber: this.formModel.groupNumber,
@ -466,10 +466,10 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow({}, error.message);
this.$refs.noticeInfo.doShow();
});
} else {
return false;

2
src/jmapNew/theme/xian_01/menus/dialog/trainCreate.vue
View File

@ -133,7 +133,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
cancel() {

2
src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue
View File

@ -143,7 +143,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
} else {
return false;

2
src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue
View File

@ -167,7 +167,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
});
} else {
return false;

2
src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue
View File

@ -172,7 +172,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
});
} else {
return false;

8
src/jmapNew/theme/xian_01/menus/menuCancel.vue
View File

@ -66,7 +66,13 @@ export default {
if (station.chargeStationCodeList && station.chargeStationCodeList.length) {
const node = {
label: station.name,
children: []
children: [
{
code: station.code,
label: station.name,
handler: this.mapLocation
}
]
};
station.chargeStationCodeList.forEach(item => {
const next = this.$store.getters['map/getDeviceByCode'](item);

4
src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/twoConfirmation.vue
View File

@ -121,8 +121,8 @@ export default {
this.doClose();
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch((error) => {
this.$refs.noticeInfo.doShow(operate, error.message);
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
}
}

2
src/jmapNew/theme/xian_01/menus/menuDialog/passwordBox.vue
View File

@ -164,7 +164,7 @@ export default {
});
});
} else {
this.$refs.noticeInfo.doShow(operate, [this.$t('menu.menuDialog.IncorrectPassword')]);
this.$refs.noticeInfo.doShow(this.$t('menu.menuDialog.IncorrectPassword'));
}
},

4
src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
View File

@ -136,12 +136,12 @@ export default {
if (valid) {
this.doClose();
} else {
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
});
} else {
return false;

4
src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue
View File

@ -118,12 +118,12 @@ export default {
if (valid) {
this.doClose();
} else {
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
});
} else {
return false;

4
src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
View File

@ -135,12 +135,12 @@ export default {
if (valid) {
this.doClose();
} else {
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
// this.$refs.noticeInfo.doShow();
});
} else {
return false;

49
src/jmapNew/theme/xian_01/menus/menuStation.vue
View File

@ -56,46 +56,30 @@ export default {
// {
// label: '上电解锁',
// handler: this.powerUnLock,
// cmdType: CMD.Station.active,
// cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
// },
// {
// label: '执行关键操作测试',
// handler: this.execKeyOperationTest,
// cmdType: CMD.Station.active,
// cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST,
// }
],
Center: [
{
label: '所有进路自排关',
label: '所有进路交人工控',
handler: this.humanControlALL,
cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
},
{
label: '所有进路自排开',
label: '所有进路交ATS自动控',
handler: this.atsAutoControlALL,
cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
},
{
label: '上电解锁',
handler: this.powerUnLock,
cmdType: CMD.Station.active
label: '执行关键操作测试',
handler: this.execKeyOperationTest,
cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
}
// {
// label: '所有进路交人工控',
// handler: this.humanControlALL,
// cmdType: ''
// },
// {
// label: '所有进路交ATS自动控',
// handler: this.atsAutoControlALL,
// cmdType: ''
// }
// {
// label: '执行关键操作测试',
// handler: this.execKeyOperationTest,
// cmdType: CMD.Station.active,
// auth: { station: false, center: true }
// }
]
},
menuForce: [
@ -140,9 +124,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
this.menu = MenuContextHandler.covert(this.menuNormal);
if (this.operatemode === OperateMode.ADMIN) {
this.menu = [...this.menu, ...this.menuForce];
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
@ -174,10 +155,10 @@ export default {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} else {
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 取消故障
@ -193,10 +174,10 @@ export default {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} else {
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 全站设置联锁自动触发
@ -212,7 +193,7 @@ export default {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 全站取消联锁自动触发
@ -228,7 +209,7 @@ export default {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
// 上电解锁
@ -259,7 +240,7 @@ export default {
}
});
},
// 所有进路自排关
// 所有进路交人工控
humanControlALL() {
const operate = {
start: true,
@ -273,7 +254,7 @@ export default {
}
});
},
// 所有进路自排开
// 所有进路交ATS自动控
atsAutoControlALL() {
const operate = {
start: true,

12
src/jmapNew/theme/xian_01/menus/menuTrain.vue
View File

@ -184,10 +184,10 @@ export default {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} else {
this.$refs.noticeInfo.doShow(step);
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.$refs.noticeInfo.doShow(step);
this.$refs.noticeInfo.doShow();
});
},
// 取消故障
@ -205,10 +205,10 @@ export default {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} else {
this.$refs.noticeInfo.doShow(step);
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.$refs.noticeInfo.doShow(step);
this.$refs.noticeInfo.doShow();
});
},
// 限速行驶
@ -226,10 +226,10 @@ export default {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} else {
this.$refs.noticeInfo.doShow(step);
this.$refs.noticeInfo.doShow();
}
}).catch(() => {
this.$refs.noticeInfo.doShow(step);
this.$refs.noticeInfo.doShow();
});
},
// 添加列车识别号

4
src/jmapNew/theme/xian_01/menus/passiveDialog/control.vue
View File

@ -268,7 +268,7 @@ export default {
this.doClose();
}
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
},
refuse() {
@ -292,7 +292,7 @@ export default {
this.doClose();
}
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow();
});
}
}

6
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -198,7 +198,11 @@ export default {
/** 取消引导总锁 */
CMD_STATION_CANCEL_MASTER_GUIDE_LOCK: {value: 'Station_Cancel_Master_Guide_Lock', label: '取消引导总锁'},
/** 封锁车站所有信号机 */
CMD_STATION_CANCEL_MASTER_GUIDE: {value: 'Station_Cancel_Master_Guide_Lock', label: '封锁集中站信号'}
CMD_STATION_CANCEL_MASTER_GUIDE: {value: 'Station_Cancel_Master_Guide_Lock', label: '封锁集中站信号'},
/** 上电解锁 */
CMD_STATION_POWER_ON_UNLOCK: {value: ' Station_Power_On_Unlock', label: '上电解锁'},
/** 执行关键操作测试 */
CMD_STATION_KEY_OPERATION_TEST: {value: 'Station_Key_Operation_Test', label: '执行关键操作测试'}
},
// 列车