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:
joylink_cuiweidong 2020-08-13 16:45:27 +08:00
parent 64a335cc05
commit 0ed57e5488
8 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/map.js
View File

@ -435,10 +435,10 @@ class Jlmap {
}
} else if (elem.deviceType === 'STATION') {
// 如果是控制权转移消息
if (elem.hasOwnProperty('applicantIdOfControlTransfer')) {
if (elem.hasOwnProperty('applicantId')) {
controlTransferList.push(elem);
}
if (!elem.applicantIdOfControlTransfer) {
if (!elem.applicantId) {
const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
const guideLock = this.mapDevice[oDevice.guideLockCode];
const guideLockStatus = {totalGuideLock: elem.totalGuideLock};

12
src/jmapNew/theme/components/menus/passiveDialog/control.vue
View File

@ -186,12 +186,12 @@ export default {
},
doShow(controlTransferList) {
const controlTransfer = controlTransferList[0];
if (controlTransfer.applicantIdOfControlTransfer) {
const member = this.$store.state.training.memberData[controlTransfer.applicantIdOfControlTransfer];
if (controlTransfer.applicantId) {
const member = this.$store.state.training.memberData[controlTransfer.applicantId];
const simulationUserList = this.$store.state.training.simulationUserList;
if (member.type == 'DISPATCHER' && controlTransferList.length > 1) {
controlTransferList.forEach(each=>{
this.showDialog(this.$store.state.training.memberData[each.applicantIdOfControlTransfer], each, simulationUserList, [each]);
this.showDialog(this.$store.state.training.memberData[each.applicantId], each, simulationUserList, [each]);
});
} else {
this.showDialog(member, controlTransfer, simulationUserList, controlTransferList);
@ -221,8 +221,8 @@ export default {
});
}
// 后端倒计时
if (controlTransfer.validDurationOfControlTransferApplication) {
this.count = controlTransfer.validDurationOfControlTransferApplication;
if (controlTransfer.validDuration) {
this.count = controlTransfer.validDuration;
this.dialogShow = true;
this.requestInfo = info;
this.disabledAgree = true;
@ -240,7 +240,7 @@ export default {
}
} else {
// 后端倒计时
this.count = controlTransfer.validDurationOfControlTransferApplication;
this.count = controlTransfer.validDuration;
}
}
},

2
src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
View File

@ -154,7 +154,7 @@ export default {
updateTableValue(controlTransfer) {
this.centralizedStationList.forEach((row, index) => {
if (row.code == controlTransfer.code) {
if (controlTransfer.applicantIdOfControlTransfer) {
if (controlTransfer.applicantId) {
this.disabledCommit = true;
} else {
this.disabledCommit = false;

4
src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
View File

@ -173,8 +173,8 @@ export default {
updateTableValue(controlTransfer) {
this.tableData.forEach((row, index) => {
if (row.code == controlTransfer.code) {
if (controlTransfer.applicantIdOfControlTransfer) {
row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDurationOfControlTransferApplication + this.$t('menu.menuDialog.senedMessageTwo');
if (controlTransfer.applicantId) {
row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDuration + this.$t('menu.menuDialog.senedMessageTwo');
row.disabled = true;
row.check = false;
} else {

6
src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
View File

@ -152,7 +152,7 @@ export default {
updateTableValue(controlTransfer) {
this.stationLists.forEach((row, index) => {
if (row.code == controlTransfer.code) {
if (controlTransfer.applicantIdOfControlTransfer) {
if (controlTransfer.applicantId) {
this.commitDisabled = true;
} else {
this.commitDisabled = false;
@ -161,8 +161,8 @@ export default {
});
// this.tableData.forEach((row, index) => {
// if (row.code == controlTransfer.code) {
// if (controlTransfer.applicantIdOfControlTransfer) {
// row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDurationOfControlTransferApplication + this.$t('menu.menuDialog.senedMessageTwo');
// if (controlTransfer.applicantId) {
// row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDuration + this.$t('menu.menuDialog.senedMessageTwo');
// row.disabled = true;
// row.check = false;
// } else {

2
src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
View File

@ -150,7 +150,7 @@ export default {
updateTableValue(controlTransfer) {
this.concertrateStationList.forEach((row, index) => {
if (row.code == controlTransfer.code) {
if (controlTransfer.applicantIdOfControlTransfer) {
if (controlTransfer.applicantId) {
this.disabledCommit = true;
} else {
this.disabledCommit = false;

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

@ -173,8 +173,8 @@ export default {
updateTableValue(controlTransfer) {
this.tableData.forEach((row, index) => {
if (row.code == controlTransfer.code) {
if (controlTransfer.applicantIdOfControlTransfer) {
row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDurationOfControlTransferApplication + this.$t('menu.menuDialog.senedMessageTwo');
if (controlTransfer.applicantId) {
row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDuration + this.$t('menu.menuDialog.senedMessageTwo');
row.disabled = true;
row.check = false;
} else {

8
src/views/scriptManage/tipScriptRecord.vue
View File

@ -77,7 +77,8 @@ export default {
size: {
width: 300,
height: 300
}
},
openWindow:null
};
},
watch:{
@ -168,6 +169,9 @@ export default {
return member.id == role;
});
if (memberInfo) {
if (this.openWindow) {
this.openWindow.close();
}
if (memberInfo.type == '行值') {
prdType = '01';
this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
@ -189,7 +193,7 @@ export default {
noPreLogout: true
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
this.openWindow = window.open(routeData.href);
} else {
prdType = '';
}