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

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

Browse Source
This commit is contained in:
fan 2023-01-06 09:41:56 +08:00
commit 3cdc7106f3
8 changed files with 177 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jmapNew/theme/ningbo_03/menus/menuDialog/cancleSignalGuide.vue
View File

@ -61,6 +61,7 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
changeIgnore: false,
operate: '',
selectSignalCode: ''
};
@ -115,6 +116,7 @@ export default {
this.operate = operate;
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = true;
this.selectSignalCode = selected.code;
let index = 0;
this.$refs.table.setCurrentRow(this.signalList.find((el, i) => { index = i; return el.code == selected.code; }));
@ -127,6 +129,7 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
@ -170,10 +173,14 @@ export default {
},
handleCurrentChange(val) {
if (!val) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: `${val.code}`,
operation: OperationEvent.Command.common.choose.operation,
val: val.code,
// val: val.code,
param: {
signalCode: val.code
}
@ -182,8 +189,8 @@ export default {
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
this.$store.dispatch('menuOperation/setSelected', {device: val});
}).catch(() => {
this.$refs.noticeInfo.doShow();
});

21
src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
View File

@ -31,7 +31,7 @@
<el-checkbox v-model="checked">显示复制路径</el-checkbox>
</el-col>
<el-col :span="14" style="padding-left: 8px;">
<el-tabs v-model="activeName" type="card">
<el-tabs :id="domIdRouteTabs" v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="设置进路" name="first">
<el-row>
<el-col :span="18">
@ -208,6 +208,7 @@ export default {
checked: false,
unlockType: 'auto',
forbidRoute: false,
changeIgnore: false,
route: null
};
},
@ -259,6 +260,9 @@ export default {
domIdUnlockType() {
return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_unlockType.domId : '';
},
domIdRouteTabs() {
return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.domId : '';
},
title() {
return '进路命令';
}
@ -271,6 +275,15 @@ export default {
}
},
methods: {
handleClick() {
const step = {
operation: OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.operation,
param: {
activeName: this.activeName
}
};
this.$store.dispatch('trainingNew/next', step);
},
changeUnlockType() {
const step = {
operation: OperationEvent.Command.commandNingBo3.Signal_command_unlockType.operation,
@ -291,6 +304,7 @@ export default {
this.operate = operate;
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = true;
let index = 0;
const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
this.$refs.table.setCurrentRow(signal);
@ -314,6 +328,7 @@ export default {
this.$refs.singleTable4.setCurrentRow();
this.activeName = 'first';
this.unlockType = 'auto';
this.changeIgnore = false;
this.$refs.table.bodyWrapper.scrollTop = 0;
},
// 始端信号机点击
@ -326,6 +341,10 @@ export default {
this.tempData.push(item);
}
});
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
operation: OperationEvent.Command.commandNingBo3.Signal_command_startSignal.operation,
param: {

19
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
View File

@ -161,7 +161,7 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.changeIgnore = true;
this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
this.$store.dispatch('training/emitTipFresh');
});
@ -178,7 +178,7 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.changeIgnore = true;
let index = 0;
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
setTimeout(()=> {
@ -191,8 +191,9 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.sure && (this.currentSelect = null);
this.sure && this.$refs.table.setCurrentRow();
this.changeIgnore = false;
this.currentSelect = null;
this.$refs.table.setCurrentRow();
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
);
@ -233,21 +234,25 @@ export default {
handleCurrentChange(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect);
this.$emit('updateDone');
if (this.changeIgnore) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
param: {
val: val.code
}
};
this.changeIgnore = false;
this.$emit('updateDone');
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

21
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
View File

@ -151,7 +151,7 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.changeIgnore = true;
this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
this.$store.dispatch('training/emitTipFresh');
});
@ -163,7 +163,7 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.changeIgnore = true;
let index = 0;
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
setTimeout(()=> {
@ -176,8 +176,9 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.sure && (this.currentSelect = null);
this.sure && this.$refs.table.setCurrentRow();
this.currentSelect = null;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
);
@ -190,7 +191,7 @@ export default {
const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
const operate = {
cmdType: this.sure && isOK ? this.cmdType : null,
operation: isClose ? OperationEvent.Signal.lock.confirm.operation : OperationEvent.Signal.unlock.confirm.operation,
operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
over: this.sure,
param: {signalCode: this.currentSelect.code}
};
@ -218,21 +219,25 @@ export default {
handleCurrentChange(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect);
this.$emit('updateDone');
if (this.changeIgnore) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
param: {
val: val.code
}
};
this.changeIgnore = false;
this.$emit('updateDone');
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(_ => {
this.$refs.noticeInfo.doShow();

12
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
View File

@ -156,7 +156,7 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.changeIgnore = true;
this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
this.$store.dispatch('training/emitTipFresh');
});
@ -168,7 +168,7 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
this.dialogShow = true;
this.$nextTick(function () {
// this.changeIgnore = sure;
this.changeIgnore = true;
let index = 0;
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
setTimeout(()=> {
@ -223,8 +223,12 @@ export default {
handleCurrentChange(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect);
this.$emit('updateDone');
if (this.changeIgnore) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
@ -234,12 +238,10 @@ export default {
}
};
this.changeIgnore = false;
this.$emit('updateDone');
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(_ => {
this.$refs.noticeInfo.doShow();

17
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
View File

@ -64,7 +64,8 @@ export default {
operate: null,
allChecked: false,
dialogShow: false,
loading: false
loading: false,
changeIgnore: false
};
},
computed: {
@ -121,17 +122,23 @@ export default {
methods: {
handleCurrentChange(val) {
if (!val) { return; }
this.$store.dispatch('menuOperation/setSelected', {device: val});
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
param: {
val: val.code
}
};
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.table.setCurrentRow(this.selected);
// this.$refs.table.setCurrentRow(this.selected);
}
}).catch(() => {
console.log();
@ -150,19 +157,21 @@ export default {
this.operate = operate;
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = true;
let index = 0;
const signal = this.filterSignalList.find((el, i) => { index = i; return el.code == selected.code; });
this.$refs.table.setCurrentRow(signal);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
}, 200);
this.handleCurrentChange(signal);
// this.handleCurrentChange(signal);
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},

126
src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
View File

@ -86,14 +86,17 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Signal.guide.initMenu,
handler: this.handlerInitGuide
},
{
label: '确定/取消',
operate: OperationEvent.Signal.guide.menu,
handler: this.handlerGuide
},
{
label: '清除',
operate: OperationEvent.Signal.cancelGuide.menu,
handler: this.handlerCancelGuide
}
]
@ -104,10 +107,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Signal.lock.initMenu,
handler: this.handlerInitAllowLock
},
{
label: '确定/取消',
operate: OperationEvent.Signal.lock.menu,
handler: this.handlerAllowLock
}
]
@ -117,6 +122,7 @@ export default {
children: [
{
label: '命令',
operate: OperationEvent.Signal.arrangementRoute.menu,
handler: this.handlerRouteCommand
},
{
@ -136,6 +142,7 @@ export default {
},
{
label: '信号指示模式',
operate: OperationEvent.Signal.reopenSignal.menu,
handler: this.handlerSignalModel,
cmdType: ''
},
@ -144,10 +151,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_signal_block_init,
handler: this.handlerInitBlock
},
{
label: '确认/取消',
operate: OperationEvent.Command.commandNingBo3.line_signal_block_sure,
handler: this.handlerBlock
}
]
@ -157,16 +166,19 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_init,
handler: this.handlerInitUnblock
},
{
label: '确认/取消',
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_sure,
handler: this.handlerUnblock
}
]
},
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
handler: this.handlerDetail
}
],
@ -199,12 +211,6 @@ export default {
watch: {
'$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
const operate = {
code: `${this.selected.code}`,
userOperationType: 'rightClick',
operation: OperationEvent.Command.commandRight.right.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.doShow(this.$store.state.menuOperation.menuPosition);
} else {
this.doClose();
@ -266,41 +272,101 @@ export default {
undeveloped() {
},
handlerInitGuide() {
this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.initMenu, false, this.selected);
handlerInitGuide(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalGuide.rightClickShow(item.operate, false, this.selected);
},
handlerGuide() {
this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.menu, true, this.selected);
handlerGuide(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalGuide.rightClickShow(item.operate, true, this.selected);
},
handlerCancelGuide() {
this.$refs.cancelSignal.rightClickShow(OperationEvent.Signal.cancelGuide.menu, this.selected);
handlerCancelGuide(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.cancelSignal.rightClickShow(item.operate, this.selected);
},
handlerInitAllowLock() {
this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.initMenu, false, this.selected);
handlerInitAllowLock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalCanBlock.rightClickShow(item.operate, false, this.selected);
},
handlerAllowLock() {
this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.menu, true, this.selected);
handlerAllowLock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalCanBlock.rightClickShow(item.operate, true, this.selected);
},
handlerRouteCommand() {
this.$refs.routeCommand.rightClickShow(OperationEvent.Signal.arrangementRoute.menu, this.selected);
handlerRouteCommand(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.routeCommand.rightClickShow(item.operate, this.selected);
},
handlerSignalModel() {
this.$refs.signalModel.rightClickShow('', this.selected);
handlerSignalModel(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalModel.rightClickShow(item.operate, this.selected);
},
handlerInitBlock() {
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_init, false, this.selected);
handlerInitBlock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalBlock.rightClickShow(item.operate, false, this.selected);
},
handlerBlock() {
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_sure, true, this.selected);
handlerBlock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalBlock.rightClickShow(item.operate, true, this.selected);
},
handlerInitUnblock() {
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_init, false, this.selected);
handlerInitUnblock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalBlock.rightClickShow(item.operate, false, this.selected);
},
handlerUnblock() {
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_sure, true, this.selected);
handlerUnblock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalBlock.rightClickShow(item.operate, true, this.selected);
},
handlerDetail() {
this.$refs.signalDetail.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_detail, this.selected);
handlerDetail(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalDetail.rightClickShow(item.operate, this.selected);
}
}
};

4
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -723,6 +723,10 @@ export const OperationEvent = {
Signal_command_unlockType: {
operation: '00c058',
domId: '_Tips-ningBo-Signal_command_unlockType{BOTTOM}'
},
Signal_command_routeTabs: {
operation: '00c059',
domId: '_Tips-ningBo-Signal_command_routeTabs{BOTTOM}'
}
},
commandRight: {