diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 1d9bf6c98..5c2773d40 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -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}; diff --git a/src/jmapNew/theme/components/menus/passiveDialog/control.vue b/src/jmapNew/theme/components/menus/passiveDialog/control.vue index f2e968f37..48b5331c8 100644 --- a/src/jmapNew/theme/components/menus/passiveDialog/control.vue +++ b/src/jmapNew/theme/components/menus/passiveDialog/control.vue @@ -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; } } }, diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue index c736675c7..fec6ae761 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue @@ -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; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue index 6a6b37fea..52087b189 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue @@ -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 { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue index ed6441c26..de5a2fb4d 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue @@ -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 { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue index b984a0b7c..219792dfc 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue @@ -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; diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue index fe5c50bdd..1a6610d0b 100644 --- a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue +++ b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue @@ -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 { diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 901de89f8..07cc664bf 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -62,7 +62,16 @@ @switchStationMode="switchStationMode" /> - +
-
+
+ - {{ $t('joinTraining.driverPerspective') }} {{ $t('scriptRecord.drivingByPlan') }} 初始化 {{ $t('scriptRecord.scriptBack') }}
+
+
菜单
+ + + + + + {{ $t('display.demon.threeDimensionalView') }} + + + + {{ $t('joinTraining.driverPerspective') }} + +
- +