From b1fadb36716508f2610d4a7e3c0a3534be23eca4 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 11 Jan 2023 11:00:02 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=88=90=E5=91=98=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=A5=BC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/memberManage/membersManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/display/memberManage/membersManage.vue b/src/views/newMap/display/memberManage/membersManage.vue index a55fbe74c..dcb79cc85 100644 --- a/src/views/newMap/display/memberManage/membersManage.vue +++ b/src/views/newMap/display/memberManage/membersManage.vue @@ -201,7 +201,7 @@ export default { electricDispatcherList.push(this.memberData[item.id]); break; case 'DEPOT_DISPATCHER': - this.memberData[item.id].labelName = '车辆段信号楼' + (item.name || ''); + this.memberData[item.id].labelName = '信号楼-' + device.name + (item.name || ''); depotDispatcherList.push(this.memberData[item.id]); break; case 'STATION_SUPERVISOR': From f06a5c09eae9e56fb69fac4ded84ddaca081bb4d Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 11 Jan 2023 13:35:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/permissionManage/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/permissionManage/index.vue b/src/views/permissionManage/index.vue index 5dbe519fb..e3aa4f871 100644 --- a/src/views/permissionManage/index.vue +++ b/src/views/permissionManage/index.vue @@ -9,7 +9,7 @@ import { getPermissionPage } from '@/api/permissionManage'; import Create from './create'; import { getAllAbility } from '@/api/functionManage'; -import { queryMapListByUser } from '@/api/jmap/map'; +import { getPublishMapListOnline } from '@/api/jmap/map'; import { ProjectList } from '@/scripts/ProjectConfig'; export default { @@ -181,7 +181,7 @@ export default { this.queryForm.queryObject.permissionType.config.data = this.$ConstSelect.permissionTypeList; this.queryForm.queryObject.projectCode.config.data = ProjectList; // 获取地图 - queryMapListByUser().then(res => { + getPublishMapListOnline().then(res => { res.data.forEach(elem => { const obj = { value: elem.id, label: elem.name }; this.queryForm.queryObject.mapId.config.data.push(obj); From 082bf8cd654d52659c274f99e3847eeaf4852a73 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 11 Jan 2023 14:20:27 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=BA=94=E6=80=A5=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E6=8C=87=E6=8C=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/designPlatform/bigScreen.vue | 8 +------- .../display/terminals/emergencyDispatchWork.vue | 14 ++++++++++++-- .../display/yjddzh}/voiceCommand.vue | 0 .../display/yjddzh}/whTrainList.vue | 0 4 files changed, 13 insertions(+), 9 deletions(-) rename src/views/{designPlatform => newMap/display/yjddzh}/voiceCommand.vue (100%) rename src/views/{designPlatform => newMap/display/yjddzh}/whTrainList.vue (100%) diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue index b784bf194..7df15f81d 100644 --- a/src/views/designPlatform/bigScreen.vue +++ b/src/views/designPlatform/bigScreen.vue @@ -2,8 +2,6 @@
- -
返回 @@ -19,15 +17,11 @@ import { mapGetters } from 'vuex'; import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; import { getToken } from '@/utils/auth'; import { TrainingMode } from '@/scripts/ConstDic'; -import WhTrainList from './whTrainList'; -import VoiceCommand from './voiceCommand'; export default { name: 'BigScreen', components: { - JlmapVisual, - WhTrainList, - VoiceCommand + JlmapVisual }, props: { widthLeft: { diff --git a/src/views/newMap/display/terminals/emergencyDispatchWork.vue b/src/views/newMap/display/terminals/emergencyDispatchWork.vue index 2a1ee9075..93247734f 100644 --- a/src/views/newMap/display/terminals/emergencyDispatchWork.vue +++ b/src/views/newMap/display/terminals/emergencyDispatchWork.vue @@ -1,16 +1,23 @@ - diff --git a/src/views/newMap/display/modifyTime.vue b/src/views/newMap/display/modifyTime.vue deleted file mode 100644 index f05c11ff9..000000000 --- a/src/views/newMap/display/modifyTime.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - From fed3a0430ef3747c44b6ccb9c8237a133f4704d0 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 11 Jan 2023 17:45:33 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E9=80=80=E5=87=BA?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/simulationMenu/simulationMenu.vue | 4 ++-- src/views/newMap/display/thirdJump.vue | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue index 2fda148ef..37a29ba2c 100644 --- a/src/views/newMap/display/simulationMenu/simulationMenu.vue +++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue @@ -192,8 +192,8 @@ export default { destroySimulationByAdmin(this.group).then(() => { this.logout(); }); - } else if (this.$route.query.labels) { - window.close(); + } else if (this.$route.query.third) { + this.$router.push({ path: `/trainingPlatform/simulation/${this.$route.query.mapId}`, query: { lineCode: this.$route.query.lineCode } }); } else if (this.projectDevice) { this.logout(); } else { diff --git a/src/views/newMap/display/thirdJump.vue b/src/views/newMap/display/thirdJump.vue index d1460fff1..c5dfe559d 100644 --- a/src/views/newMap/display/thirdJump.vue +++ b/src/views/newMap/display/thirdJump.vue @@ -24,7 +24,8 @@ export default { mapId: this.$route.query.mapId, simType: this.$route.query.simType, project: this.$route.query.project, - labels: this.$route.query.labels + labels: this.$route.query.labels, + third: true }; this.$router.push({ path: `/display/demon`, query: query }); launchFullscreen();