Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
This commit is contained in:
commit
3cdc7106f3
@ -61,6 +61,7 @@ export default {
|
|||||||
allChecked: false,
|
allChecked: false,
|
||||||
dialogShow: false,
|
dialogShow: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
|
changeIgnore: false,
|
||||||
operate: '',
|
operate: '',
|
||||||
selectSignalCode: ''
|
selectSignalCode: ''
|
||||||
};
|
};
|
||||||
@ -115,6 +116,7 @@ export default {
|
|||||||
this.operate = operate;
|
this.operate = operate;
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
this.$nextTick(function () {
|
||||||
|
this.changeIgnore = true;
|
||||||
this.selectSignalCode = selected.code;
|
this.selectSignalCode = selected.code;
|
||||||
let index = 0;
|
let index = 0;
|
||||||
this.$refs.table.setCurrentRow(this.signalList.find((el, i) => { index = i; return el.code == selected.code; }));
|
this.$refs.table.setCurrentRow(this.signalList.find((el, i) => { index = i; return el.code == selected.code; }));
|
||||||
@ -127,6 +129,7 @@ export default {
|
|||||||
doClose() {
|
doClose() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
|
this.changeIgnore = false;
|
||||||
this.$refs.table.setCurrentRow();
|
this.$refs.table.setCurrentRow();
|
||||||
this.$store.dispatch('training/emitTipFresh');
|
this.$store.dispatch('training/emitTipFresh');
|
||||||
},
|
},
|
||||||
@ -170,10 +173,14 @@ export default {
|
|||||||
},
|
},
|
||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
if (!val) { return; }
|
if (!val) { return; }
|
||||||
|
if (this.changeIgnore) {
|
||||||
|
this.changeIgnore = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
const step = {
|
const step = {
|
||||||
// code: `${val.code}`,
|
// code: `${val.code}`,
|
||||||
operation: OperationEvent.Command.common.choose.operation,
|
operation: OperationEvent.Command.common.choose.operation,
|
||||||
val: val.code,
|
// val: val.code,
|
||||||
param: {
|
param: {
|
||||||
signalCode: val.code
|
signalCode: val.code
|
||||||
}
|
}
|
||||||
@ -182,8 +189,8 @@ export default {
|
|||||||
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||||
this.$store.dispatch('menuOperation/setSelected', {device: val});
|
|
||||||
}
|
}
|
||||||
|
this.$store.dispatch('menuOperation/setSelected', {device: val});
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.$refs.noticeInfo.doShow();
|
this.$refs.noticeInfo.doShow();
|
||||||
});
|
});
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
<el-checkbox v-model="checked">显示复制路径</el-checkbox>
|
<el-checkbox v-model="checked">显示复制路径</el-checkbox>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="14" style="padding-left: 8px;">
|
<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-tab-pane label="设置进路" name="first">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="18">
|
<el-col :span="18">
|
||||||
@ -208,6 +208,7 @@ export default {
|
|||||||
checked: false,
|
checked: false,
|
||||||
unlockType: 'auto',
|
unlockType: 'auto',
|
||||||
forbidRoute: false,
|
forbidRoute: false,
|
||||||
|
changeIgnore: false,
|
||||||
route: null
|
route: null
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -259,6 +260,9 @@ export default {
|
|||||||
domIdUnlockType() {
|
domIdUnlockType() {
|
||||||
return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_unlockType.domId : '';
|
return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_unlockType.domId : '';
|
||||||
},
|
},
|
||||||
|
domIdRouteTabs() {
|
||||||
|
return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.domId : '';
|
||||||
|
},
|
||||||
title() {
|
title() {
|
||||||
return '进路命令';
|
return '进路命令';
|
||||||
}
|
}
|
||||||
@ -271,6 +275,15 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
handleClick() {
|
||||||
|
const step = {
|
||||||
|
operation: OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.operation,
|
||||||
|
param: {
|
||||||
|
activeName: this.activeName
|
||||||
|
}
|
||||||
|
};
|
||||||
|
this.$store.dispatch('trainingNew/next', step);
|
||||||
|
},
|
||||||
changeUnlockType() {
|
changeUnlockType() {
|
||||||
const step = {
|
const step = {
|
||||||
operation: OperationEvent.Command.commandNingBo3.Signal_command_unlockType.operation,
|
operation: OperationEvent.Command.commandNingBo3.Signal_command_unlockType.operation,
|
||||||
@ -291,6 +304,7 @@ export default {
|
|||||||
this.operate = operate;
|
this.operate = operate;
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
this.$nextTick(function () {
|
||||||
|
this.changeIgnore = true;
|
||||||
let index = 0;
|
let index = 0;
|
||||||
const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
|
const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
|
||||||
this.$refs.table.setCurrentRow(signal);
|
this.$refs.table.setCurrentRow(signal);
|
||||||
@ -314,6 +328,7 @@ export default {
|
|||||||
this.$refs.singleTable4.setCurrentRow();
|
this.$refs.singleTable4.setCurrentRow();
|
||||||
this.activeName = 'first';
|
this.activeName = 'first';
|
||||||
this.unlockType = 'auto';
|
this.unlockType = 'auto';
|
||||||
|
this.changeIgnore = false;
|
||||||
this.$refs.table.bodyWrapper.scrollTop = 0;
|
this.$refs.table.bodyWrapper.scrollTop = 0;
|
||||||
},
|
},
|
||||||
// 始端信号机点击
|
// 始端信号机点击
|
||||||
@ -326,6 +341,10 @@ export default {
|
|||||||
this.tempData.push(item);
|
this.tempData.push(item);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if (this.changeIgnore) {
|
||||||
|
this.changeIgnore = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
const step = {
|
const step = {
|
||||||
operation: OperationEvent.Command.commandNingBo3.Signal_command_startSignal.operation,
|
operation: OperationEvent.Command.commandNingBo3.Signal_command_startSignal.operation,
|
||||||
param: {
|
param: {
|
||||||
|
@ -161,7 +161,7 @@ export default {
|
|||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
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.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
|
||||||
this.$store.dispatch('training/emitTipFresh');
|
this.$store.dispatch('training/emitTipFresh');
|
||||||
});
|
});
|
||||||
@ -178,7 +178,7 @@ export default {
|
|||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
this.$nextTick(function () {
|
||||||
this.changeIgnore = sure;
|
this.changeIgnore = true;
|
||||||
let index = 0;
|
let index = 0;
|
||||||
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
|
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
|
||||||
setTimeout(()=> {
|
setTimeout(()=> {
|
||||||
@ -191,8 +191,9 @@ export default {
|
|||||||
doClose() {
|
doClose() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
this.sure && (this.currentSelect = null);
|
this.changeIgnore = false;
|
||||||
this.sure && this.$refs.table.setCurrentRow();
|
this.currentSelect = null;
|
||||||
|
this.$refs.table.setCurrentRow();
|
||||||
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
|
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
|
||||||
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
|
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
|
||||||
);
|
);
|
||||||
@ -233,21 +234,25 @@ export default {
|
|||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
if (!val) { return; }
|
if (!val) { return; }
|
||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
|
||||||
|
this.sure || this.$emit('initSelect', this.currentSelect);
|
||||||
this.$emit('updateDone');
|
this.$emit('updateDone');
|
||||||
if (this.changeIgnore) { return; }
|
if (this.changeIgnore) {
|
||||||
|
this.changeIgnore = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const step = {
|
const step = {
|
||||||
// code: val.code,
|
// code: val.code,
|
||||||
operation: OperationEvent.Command.common.choose.operation,
|
operation: OperationEvent.Command.common.choose.operation,
|
||||||
val: val.code
|
param: {
|
||||||
|
val: val.code
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.changeIgnore = false;
|
|
||||||
this.$emit('updateDone');
|
this.$emit('updateDone');
|
||||||
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||||
this.sure || this.$emit('initSelect', this.currentSelect);
|
|
||||||
}
|
}
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.$refs.noticeInfo.doShow();
|
this.$refs.noticeInfo.doShow();
|
||||||
|
@ -151,7 +151,7 @@ export default {
|
|||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
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.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
|
||||||
this.$store.dispatch('training/emitTipFresh');
|
this.$store.dispatch('training/emitTipFresh');
|
||||||
});
|
});
|
||||||
@ -163,7 +163,7 @@ export default {
|
|||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
this.$nextTick(function () {
|
||||||
this.changeIgnore = sure;
|
this.changeIgnore = true;
|
||||||
let index = 0;
|
let index = 0;
|
||||||
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
|
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
|
||||||
setTimeout(()=> {
|
setTimeout(()=> {
|
||||||
@ -176,8 +176,9 @@ export default {
|
|||||||
doClose() {
|
doClose() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
this.sure && (this.currentSelect = null);
|
this.currentSelect = null;
|
||||||
this.sure && this.$refs.table.setCurrentRow();
|
this.changeIgnore = false;
|
||||||
|
this.$refs.table.setCurrentRow();
|
||||||
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
|
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
|
||||||
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
|
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 isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
|
||||||
const operate = {
|
const operate = {
|
||||||
cmdType: this.sure && isOK ? this.cmdType : null,
|
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,
|
over: this.sure,
|
||||||
param: {signalCode: this.currentSelect.code}
|
param: {signalCode: this.currentSelect.code}
|
||||||
};
|
};
|
||||||
@ -218,21 +219,25 @@ export default {
|
|||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
if (!val) { return; }
|
if (!val) { return; }
|
||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
|
||||||
|
this.sure || this.$emit('initSelect', this.currentSelect);
|
||||||
this.$emit('updateDone');
|
this.$emit('updateDone');
|
||||||
if (this.changeIgnore) { return; }
|
if (this.changeIgnore) {
|
||||||
|
this.changeIgnore = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const step = {
|
const step = {
|
||||||
// code: val.code,
|
// code: val.code,
|
||||||
operation: OperationEvent.Command.common.choose.operation,
|
operation: OperationEvent.Command.common.choose.operation,
|
||||||
val: val.code
|
param: {
|
||||||
|
val: val.code
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.changeIgnore = false;
|
|
||||||
this.$emit('updateDone');
|
this.$emit('updateDone');
|
||||||
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||||
this.sure || this.$emit('initSelect', this.currentSelect);
|
|
||||||
}
|
}
|
||||||
}).catch(_ => {
|
}).catch(_ => {
|
||||||
this.$refs.noticeInfo.doShow();
|
this.$refs.noticeInfo.doShow();
|
||||||
|
@ -156,7 +156,7 @@ export default {
|
|||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
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.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
|
||||||
this.$store.dispatch('training/emitTipFresh');
|
this.$store.dispatch('training/emitTipFresh');
|
||||||
});
|
});
|
||||||
@ -168,7 +168,7 @@ export default {
|
|||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
this.$nextTick(function () {
|
||||||
// this.changeIgnore = sure;
|
this.changeIgnore = true;
|
||||||
let index = 0;
|
let index = 0;
|
||||||
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
|
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
|
||||||
setTimeout(()=> {
|
setTimeout(()=> {
|
||||||
@ -223,8 +223,12 @@ export default {
|
|||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
if (!val) { return; }
|
if (!val) { return; }
|
||||||
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
|
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
|
||||||
|
this.sure || this.$emit('initSelect', this.currentSelect);
|
||||||
this.$emit('updateDone');
|
this.$emit('updateDone');
|
||||||
if (this.changeIgnore) { return; }
|
if (this.changeIgnore) {
|
||||||
|
this.changeIgnore = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const step = {
|
const step = {
|
||||||
// code: val.code,
|
// code: val.code,
|
||||||
@ -234,12 +238,10 @@ export default {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.changeIgnore = false;
|
|
||||||
this.$emit('updateDone');
|
this.$emit('updateDone');
|
||||||
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||||
this.sure || this.$emit('initSelect', this.currentSelect);
|
|
||||||
}
|
}
|
||||||
}).catch(_ => {
|
}).catch(_ => {
|
||||||
this.$refs.noticeInfo.doShow();
|
this.$refs.noticeInfo.doShow();
|
||||||
|
@ -64,7 +64,8 @@ export default {
|
|||||||
operate: null,
|
operate: null,
|
||||||
allChecked: false,
|
allChecked: false,
|
||||||
dialogShow: false,
|
dialogShow: false,
|
||||||
loading: false
|
loading: false,
|
||||||
|
changeIgnore: false
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -121,17 +122,23 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
handleCurrentChange(val) {
|
handleCurrentChange(val) {
|
||||||
if (!val) { return; }
|
if (!val) { return; }
|
||||||
|
this.$store.dispatch('menuOperation/setSelected', {device: val});
|
||||||
|
if (this.changeIgnore) {
|
||||||
|
this.changeIgnore = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
const step = {
|
const step = {
|
||||||
// code: val.code,
|
// code: val.code,
|
||||||
operation: OperationEvent.Command.common.choose.operation,
|
operation: OperationEvent.Command.common.choose.operation,
|
||||||
val: val.code
|
param: {
|
||||||
|
val: val.code
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
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(() => {
|
}).catch(() => {
|
||||||
console.log();
|
console.log();
|
||||||
@ -150,19 +157,21 @@ export default {
|
|||||||
this.operate = operate;
|
this.operate = operate;
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.$nextTick(function () {
|
this.$nextTick(function () {
|
||||||
|
this.changeIgnore = true;
|
||||||
let index = 0;
|
let index = 0;
|
||||||
const signal = this.filterSignalList.find((el, i) => { index = i; return el.code == selected.code; });
|
const signal = this.filterSignalList.find((el, i) => { index = i; return el.code == selected.code; });
|
||||||
this.$refs.table.setCurrentRow(signal);
|
this.$refs.table.setCurrentRow(signal);
|
||||||
setTimeout(()=> {
|
setTimeout(()=> {
|
||||||
this.$refs.table.bodyWrapper.scrollTop = index * 20;
|
this.$refs.table.bodyWrapper.scrollTop = index * 20;
|
||||||
}, 200);
|
}, 200);
|
||||||
this.handleCurrentChange(signal);
|
// this.handleCurrentChange(signal);
|
||||||
this.$store.dispatch('training/emitTipFresh');
|
this.$store.dispatch('training/emitTipFresh');
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
doClose() {
|
doClose() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
|
this.changeIgnore = false;
|
||||||
this.$refs.table.setCurrentRow();
|
this.$refs.table.setCurrentRow();
|
||||||
this.$store.dispatch('training/emitTipFresh');
|
this.$store.dispatch('training/emitTipFresh');
|
||||||
},
|
},
|
||||||
|
@ -86,14 +86,17 @@ export default {
|
|||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
label: '初始化',
|
label: '初始化',
|
||||||
|
operate: OperationEvent.Signal.guide.initMenu,
|
||||||
handler: this.handlerInitGuide
|
handler: this.handlerInitGuide
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '确定/取消',
|
label: '确定/取消',
|
||||||
|
operate: OperationEvent.Signal.guide.menu,
|
||||||
handler: this.handlerGuide
|
handler: this.handlerGuide
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '清除',
|
label: '清除',
|
||||||
|
operate: OperationEvent.Signal.cancelGuide.menu,
|
||||||
handler: this.handlerCancelGuide
|
handler: this.handlerCancelGuide
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -104,10 +107,12 @@ export default {
|
|||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
label: '初始化',
|
label: '初始化',
|
||||||
|
operate: OperationEvent.Signal.lock.initMenu,
|
||||||
handler: this.handlerInitAllowLock
|
handler: this.handlerInitAllowLock
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '确定/取消',
|
label: '确定/取消',
|
||||||
|
operate: OperationEvent.Signal.lock.menu,
|
||||||
handler: this.handlerAllowLock
|
handler: this.handlerAllowLock
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -117,6 +122,7 @@ export default {
|
|||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
label: '命令',
|
label: '命令',
|
||||||
|
operate: OperationEvent.Signal.arrangementRoute.menu,
|
||||||
handler: this.handlerRouteCommand
|
handler: this.handlerRouteCommand
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -136,6 +142,7 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '信号指示模式',
|
label: '信号指示模式',
|
||||||
|
operate: OperationEvent.Signal.reopenSignal.menu,
|
||||||
handler: this.handlerSignalModel,
|
handler: this.handlerSignalModel,
|
||||||
cmdType: ''
|
cmdType: ''
|
||||||
},
|
},
|
||||||
@ -144,10 +151,12 @@ export default {
|
|||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
label: '初始化',
|
label: '初始化',
|
||||||
|
operate: OperationEvent.Command.commandNingBo3.line_signal_block_init,
|
||||||
handler: this.handlerInitBlock
|
handler: this.handlerInitBlock
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '确认/取消',
|
label: '确认/取消',
|
||||||
|
operate: OperationEvent.Command.commandNingBo3.line_signal_block_sure,
|
||||||
handler: this.handlerBlock
|
handler: this.handlerBlock
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -157,16 +166,19 @@ export default {
|
|||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
label: '初始化',
|
label: '初始化',
|
||||||
|
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_init,
|
||||||
handler: this.handlerInitUnblock
|
handler: this.handlerInitUnblock
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '确认/取消',
|
label: '确认/取消',
|
||||||
|
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_sure,
|
||||||
handler: this.handlerUnblock
|
handler: this.handlerUnblock
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '显示',
|
label: '显示',
|
||||||
|
operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
|
||||||
handler: this.handlerDetail
|
handler: this.handlerDetail
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@ -199,12 +211,6 @@ export default {
|
|||||||
watch: {
|
watch: {
|
||||||
'$store.state.menuOperation.menuCount': function (val) {
|
'$store.state.menuOperation.menuCount': function (val) {
|
||||||
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
|
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);
|
this.doShow(this.$store.state.menuOperation.menuPosition);
|
||||||
} else {
|
} else {
|
||||||
this.doClose();
|
this.doClose();
|
||||||
@ -266,41 +272,101 @@ export default {
|
|||||||
undeveloped() {
|
undeveloped() {
|
||||||
|
|
||||||
},
|
},
|
||||||
handlerInitGuide() {
|
handlerInitGuide(item) {
|
||||||
this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.initMenu, false, this.selected);
|
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() {
|
handlerGuide(item) {
|
||||||
this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.menu, true, this.selected);
|
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() {
|
handlerCancelGuide(item) {
|
||||||
this.$refs.cancelSignal.rightClickShow(OperationEvent.Signal.cancelGuide.menu, this.selected);
|
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() {
|
handlerInitAllowLock(item) {
|
||||||
this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.initMenu, false, this.selected);
|
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() {
|
handlerAllowLock(item) {
|
||||||
this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.menu, true, this.selected);
|
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() {
|
handlerRouteCommand(item) {
|
||||||
this.$refs.routeCommand.rightClickShow(OperationEvent.Signal.arrangementRoute.menu, this.selected);
|
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() {
|
handlerSignalModel(item) {
|
||||||
this.$refs.signalModel.rightClickShow('', this.selected);
|
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() {
|
handlerInitBlock(item) {
|
||||||
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_init, false, this.selected);
|
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() {
|
handlerBlock(item) {
|
||||||
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_sure, true, this.selected);
|
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() {
|
handlerInitUnblock(item) {
|
||||||
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_init, false, this.selected);
|
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() {
|
handlerUnblock(item) {
|
||||||
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_sure, true, this.selected);
|
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() {
|
handlerDetail(item) {
|
||||||
this.$refs.signalDetail.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_detail, this.selected);
|
const operate = {
|
||||||
|
code: this.selected.code,
|
||||||
|
operation: item.operate.operation
|
||||||
|
};
|
||||||
|
this.$store.dispatch('trainingNew/next', operate);
|
||||||
|
this.$refs.signalDetail.rightClickShow(item.operate, this.selected);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -723,6 +723,10 @@ export const OperationEvent = {
|
|||||||
Signal_command_unlockType: {
|
Signal_command_unlockType: {
|
||||||
operation: '00c058',
|
operation: '00c058',
|
||||||
domId: '_Tips-ningBo-Signal_command_unlockType{BOTTOM}'
|
domId: '_Tips-ningBo-Signal_command_unlockType{BOTTOM}'
|
||||||
|
},
|
||||||
|
Signal_command_routeTabs: {
|
||||||
|
operation: '00c059',
|
||||||
|
domId: '_Tips-ningBo-Signal_command_routeTabs{BOTTOM}'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
commandRight: {
|
commandRight: {
|
||||||
|
Loading…
Reference in New Issue
Block a user