From 285b40091fdb50a12f6389cd8d91ff0f44185202 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 2 Nov 2023 16:59:37 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=B9=98=E5=AE=A2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=B3=BB=E7=BB=9F=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 4c67af284cff1ae5d97ce47090710e201db8115d) --- src/scripts/ConstDic.js | 3 +- src/views/newMap/display/terminals/index.vue | 5 +- .../newMap/display/terminals/pisScreen.vue | 284 ++++++++++++++++++ .../newMap/display/terminals/terminalMenu.vue | 2 +- src/views/newMap/newMapdraft/clientConfig.vue | 3 +- .../mapoperate/terminals/terminals.vue | 5 + 6 files changed, 298 insertions(+), 4 deletions(-) create mode 100644 src/views/newMap/display/terminals/pisScreen.vue diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js index 19eb00178..9794cd7c4 100644 --- a/src/scripts/ConstDic.js +++ b/src/scripts/ConstDic.js @@ -405,7 +405,8 @@ export const ClientList = [ { label: '应急调度', value: 'emergency' }, { label: '运行图加载', value: 'diagramLoad' }, { label: '运行图预览', value: 'diagramPreview' }, - { label: '运行图编制', value: 'diagramEdit' } + { label: '运行图编制', value: 'diagramEdit' }, + { label: '乘客信息发布系统', value: 'pisScreen' } ]; /** 实训类型list */ export const TrainingTypeList = [ diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index 695fc4ee4..1aab1d513 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -37,6 +37,7 @@ + +
+
+
+
+
+
+
+
+
+
+
+
{{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
控制中心
+
停车场
+
车辆段
+
+
+
+
+
+
+
+
+
主所1
+
主所2
+
+
+
+
+ +
+ + + + + diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue index 1e83dee6c..7d8ecd3ff 100644 --- a/src/views/newMap/display/terminals/terminalMenu.vue +++ b/src/views/newMap/display/terminals/terminalMenu.vue @@ -121,7 +121,7 @@ export default { troDetailWork: ['DISPATCHER'], maintainerSelect: ['MAINTAINER'] }; - if (client && client.type) { + if (client && client.type && map[client.type]) { const role = this.$store.state.training.roles; const roleDevice = this.$store.state.training.roleDeviceCode; if (client.deviceCode) { diff --git a/src/views/newMap/newMapdraft/clientConfig.vue b/src/views/newMap/newMapdraft/clientConfig.vue index 94525c5df..dcf4a9156 100644 --- a/src/views/newMap/newMapdraft/clientConfig.vue +++ b/src/views/newMap/newMapdraft/clientConfig.vue @@ -63,7 +63,8 @@ export default { { label: 'BaSiDi', key: 'baSiDi' }, { label: '轨道总览', key: 'troWork' }, { label: '轨道详览', key: 'troDetailWork' }, - { label: '通号端', key: 'maintainerSelect' } + { label: '通号端', key: 'maintainerSelect' }, + { label: '乘客信息发布系统', key: 'pisScreen' } ] }; }, diff --git a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue index 3d1395be2..9c21ec3de 100644 --- a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue +++ b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue @@ -282,6 +282,11 @@ export default { isShow: () => type === 'METRO' }, + { + name: '乘客信息发布系统', + code: 'pisScreen', + isShow: () => type === 'METRO' + }, { name: '大屏', code: 'bigScreen', From ae9748a6495ec1dacbd9611eb34d3098fc0f31b6 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 3 Nov 2023 17:37:52 +0800 Subject: [PATCH 02/11] =?UTF-8?q?tms=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 9 +- src/views/jlmap3d/drive/sceneview/tmsPage.vue | 229 ++++++++++++++++++ 2 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 src/views/jlmap3d/drive/sceneview/tmsPage.vue diff --git a/src/router/index.js b/src/router/index.js index a6e00967c..c8b11cf8b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -220,6 +220,7 @@ const UserRulesManage = () => import('@/views/userRulesManage/index'); const AuthorityTransfer = () => import('@/views/authorityTransfer/index'); const CreateDistribute = () => import('@/views/authorityTransfer/create/index'); const ThirdJumpSim = () => import('@/views/newMap/display/thirdJump'); +const TmsPage = () => import('@/views/jlmap3d/drive/sceneview/tmsPage') // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig'; // import { getSessionStorage } from '@/utils/auth'; @@ -323,7 +324,13 @@ export const constantRoutes = [ path: '/jlmap3d/lcjy', component: LcJy, hidden: true - }, + }, + + { + path: '/tmsPage', + component: TmsPage, + hidden: true + }, { path: '/data2json', diff --git a/src/views/jlmap3d/drive/sceneview/tmsPage.vue b/src/views/jlmap3d/drive/sceneview/tmsPage.vue new file mode 100644 index 000000000..d242b0b3b --- /dev/null +++ b/src/views/jlmap3d/drive/sceneview/tmsPage.vue @@ -0,0 +1,229 @@ + + + + + From 2bfdb557d1dadb0a2bdc4888ee20c1079014daa0 Mon Sep 17 00:00:00 2001 From: Yuan Date: Tue, 7 Nov 2023 17:24:15 +0800 Subject: [PATCH 03/11] =?UTF-8?q?tms=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jlmap3d/drive/sceneview/tmsPage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/jlmap3d/drive/sceneview/tmsPage.vue b/src/views/jlmap3d/drive/sceneview/tmsPage.vue index d242b0b3b..606a52ec7 100644 --- a/src/views/jlmap3d/drive/sceneview/tmsPage.vue +++ b/src/views/jlmap3d/drive/sceneview/tmsPage.vue @@ -40,7 +40,7 @@ {{ item ? '' : '-- --' }} {{ item ? '' : '-- --' }} From 0b688dea64f8444e5c1a377b4dad3efb58620912 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 8 Nov 2023 09:57:34 +0800 Subject: [PATCH 04/11] =?UTF-8?q?tms=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/ConstDic.js | 3 ++- src/views/newMap/display/terminals/index.vue | 7 ++++++- src/views/newMap/newMapdraft/clientConfig.vue | 3 ++- .../newMap/newMapdraft/mapoperate/terminals/terminals.vue | 7 +++++-- src/views/planMonitor/components/menus/modifyingTask.vue | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js index 9794cd7c4..06a8f210d 100644 --- a/src/scripts/ConstDic.js +++ b/src/scripts/ConstDic.js @@ -406,7 +406,8 @@ export const ClientList = [ { label: '运行图加载', value: 'diagramLoad' }, { label: '运行图预览', value: 'diagramPreview' }, { label: '运行图编制', value: 'diagramEdit' }, - { label: '乘客信息发布系统', value: 'pisScreen' } + { label: '乘客信息发布系统', value: 'pisScreen' }, + { label: 'TMS', value: 'tms' } ]; /** 实训类型list */ export const TrainingTypeList = [ diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index 1aab1d513..c3ff6aa7f 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -5,6 +5,7 @@ + @@ -90,6 +91,7 @@ import DriverAtsWork from './driverAtsWork'; import NccWork from './nccWork'; import LineMonitor from './lineMonitor'; import PisScreen from './pisScreen'; +import TmsPage from '@/views/jlmap3d/drive/sceneview/tmsPage'; export default { name: 'Index', @@ -129,7 +131,8 @@ export default { DriverAtsWork, NccWork, LineMonitor, - PisScreen + PisScreen, + TmsPage }, data() { return { @@ -326,6 +329,8 @@ export default { this.$nextTick(() => { this.subscribe('CTC'); }); } else if (this.picture === 'nccWork') { this.$nextTick(() => { this.subscribe('NCC'); }); + } else if (this.picture === 'tms') { + this.mapViewLoaded(true); } this.$nextTick(() => { this.loading = false; }); }, diff --git a/src/views/newMap/newMapdraft/clientConfig.vue b/src/views/newMap/newMapdraft/clientConfig.vue index dcf4a9156..b0c52fae0 100644 --- a/src/views/newMap/newMapdraft/clientConfig.vue +++ b/src/views/newMap/newMapdraft/clientConfig.vue @@ -64,7 +64,8 @@ export default { { label: '轨道总览', key: 'troWork' }, { label: '轨道详览', key: 'troDetailWork' }, { label: '通号端', key: 'maintainerSelect' }, - { label: '乘客信息发布系统', key: 'pisScreen' } + { label: '乘客信息发布系统', key: 'pisScreen' }, + { label: 'TMS', key: 'tms' } ] }; }, diff --git a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue index 9c21ec3de..2beca8b83 100644 --- a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue +++ b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue @@ -291,13 +291,16 @@ export default { name: '大屏', code: 'bigScreen', isShow: () => type === 'METRO' || type === 'EMERGENCY' - }, { name: '司机视角', code: 'drivingPlan', isShow: () => type === 'METRO' || type === 'RAILWAY' - + }, + { + name: 'TMS', + code: 'tms', + isShow: () => type === 'METRO' || type === 'RAILWAY' }, { name: 'IBP盘', diff --git a/src/views/planMonitor/components/menus/modifyingTask.vue b/src/views/planMonitor/components/menus/modifyingTask.vue index 1e44067af..c4d01678a 100644 --- a/src/views/planMonitor/components/menus/modifyingTask.vue +++ b/src/views/planMonitor/components/menus/modifyingTask.vue @@ -349,7 +349,7 @@ export default { current.sectionCode = stationTime.sectionCode; current.arriveTime = stationTime.secondTime; } else { - current.departureTime = stationTime.secondTime; + current.departureTime = stationTime.secondTcime; newstationTimeList.push(current); } }); From 907a88c6ea293e9ddd78bc3d4e35914ca3377347 Mon Sep 17 00:00:00 2001 From: Yuan Date: Thu, 9 Nov 2023 14:57:31 +0800 Subject: [PATCH 05/11] =?UTF-8?q?tms=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/stomp.js | 5 +- src/utils/subscribeCallback.js | 2 +- src/views/jlmap3d/drive/sceneview/tmsPage.vue | 99 +++++++++++++------ .../newMap/display/terminals/terminalMenu.vue | 2 +- 4 files changed, 74 insertions(+), 34 deletions(-) diff --git a/src/utils/stomp.js b/src/utils/stomp.js index 7c2e61ca2..b4ad3f919 100644 --- a/src/utils/stomp.js +++ b/src/utils/stomp.js @@ -33,7 +33,10 @@ export function getTopic(type, group, param) { break; case 'ISCSGATE': topic = `/queue/simulation/${group}/iscs/gate/${param.stationCode}`; - break; + break; + case 'TMS': + topic = `/queue/simulation/${group}/train/001/tms` + break; case 'PIS_STAND': topic = `/queue/simulation/${group}/standPis/${param.standCode}`; break; diff --git a/src/utils/subscribeCallback.js b/src/utils/subscribeCallback.js index 677d1f867..8dac96947 100644 --- a/src/utils/subscribeCallback.js +++ b/src/utils/subscribeCallback.js @@ -37,7 +37,7 @@ export function defaultCallback(Response) { handle(JSON.parse(Response.body)); } function handle(data) { - const msg = data.body; + const msg = data.body; switch (data.type) { case 'Order_Pay_Result': // 订单支付结果消息 store.dispatch('socket/setPayOrder', msg); diff --git a/src/views/jlmap3d/drive/sceneview/tmsPage.vue b/src/views/jlmap3d/drive/sceneview/tmsPage.vue index 606a52ec7..8918c1a8f 100644 --- a/src/views/jlmap3d/drive/sceneview/tmsPage.vue +++ b/src/views/jlmap3d/drive/sceneview/tmsPage.vue @@ -18,7 +18,7 @@ {{ trainInfo.voltage }}V {{ trainInfo.current }}A {{ trainInfo.speed }} km/h - {{ trainInfo.traction }}% + {{ trainInfo.traction }}% {{ trainInfo.mileage || '--' }} {{ trainInfo.nextStation }} {{ trainInfo.destination }} @@ -46,8 +46,8 @@ @@ -60,22 +60,22 @@ @@ -109,6 +109,11 @@ diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue index 7d8ecd3ff..b395f5da4 100644 --- a/src/views/newMap/display/terminals/terminalMenu.vue +++ b/src/views/newMap/display/terminals/terminalMenu.vue @@ -145,7 +145,7 @@ export default { const mapClientList = mapClientMap ? mapClientMap[this.$route.query.simType] : []; if (!mapClientList.length) { this.$store.dispatch('app/animationsClose'); - this.$messageBox('为获取到客户端数据，请查验地图数据！'); + this.$messageBox('未获取到客户端数据，请查验地图数据！'); } mapClientList.forEach(client => { if (clientIdList && clientIdList.length) { From dd4bbab000f37200e6791531d68478fd09d19535 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 10 Nov 2023 10:55:42 +0800 Subject: [PATCH 06/11] tms --- src/views/jlmap3d/drive/sceneview/tmsPage.vue | 84 +++++++++++++------ 1 file changed, 58 insertions(+), 26 deletions(-) diff --git a/src/views/jlmap3d/drive/sceneview/tmsPage.vue b/src/views/jlmap3d/drive/sceneview/tmsPage.vue index 8918c1a8f..9dab01707 100644 --- a/src/views/jlmap3d/drive/sceneview/tmsPage.vue +++ b/src/views/jlmap3d/drive/sceneview/tmsPage.vue @@ -18,7 +18,9 @@ {{ trainInfo.voltage }}V {{ trainInfo.current }}A {{ trainInfo.speed }} km/h - {{ trainInfo.traction }}% + + {{ Math.abs(trainInfo.tractionPercent) }}% + {{ trainInfo.mileage || '--' }} {{ trainInfo.nextStation }} {{ trainInfo.destination }} @@ -97,7 +99,17 @@ {{ item ? '' : '-- --' }} - +
+
+
+
+
{{ trainInfo.speed }} km/h
@@ -111,7 +123,6 @@ import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js'; import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp'; import { getToken } from '@/utils/auth'; -import { defaultCallback, stateCallback, diagramSimCallback } from '@/utils/subscribeCallback'; let timer = null; @@ -123,11 +134,11 @@ export default { trainInfo: { voltage: 1600, current: 317, - speed: 102, - traction: 3, + speed: 0, + tractionPercent: 0, mileage: '--', - nextStation: 'XX站', - destination: 'YY站', + nextStation: '', + destination: '', }, carInfo: { 辅助状态: ['ON', '--', 'OFF', '--', '--', 'ON'], @@ -159,18 +170,22 @@ export default { subscribe() { const header = { group: this.group || '', 'X-Token': getToken() }; creatSubscribe(getTopic('TMS', this.group), header, msg => { - const res = JSON.parse(msg.body); - this.trainInfo.current = res.current; - this.trainInfo.voltage = res.voltage; - this.trainInfo.speed = res.speed; - this.trainInfo.traction = res.tbLevelPercent; - this.trainInfo.mileage = res.mileage; - this.trainInfo.nextStation = res.nextStation; - this.trainInfo.destination = res.destination; - this.carInfo.制动缸压力 = Array(6).fill(res.pressureOfBrakeCylinder); - this.carInfo['1侧门'] = res.oneSideDoorOpened; - this.carInfo['2侧门'] = res.twoSideDoorOpened; - this.carInfo.停放制动施加状态 = Array(6).fill(res.parkingBreakPressure); + let res = JSON.parse(msg.body); + console.log(res); + if (!res) return; + + if (res.current) this.trainInfo.current = res.current; + if (res.voltage) this.trainInfo.voltage = res.voltage; + if (res.speed) this.trainInfo.speed = res.speed.toFixed(2); + if (res.tbLevelPercent) this.trainInfo.tractionPercent = res.tbLevelPercent; + if (res.mileage) this.trainInfo.mileage = res.mileage; + if (res.nextStation) this.trainInfo.nextStation = res.nextStation; + if (res.destination) this.trainInfo.destination = res.destination; + if (res.pressureOfBrakeCylinder) + this.carInfo.制动缸压力 = Array(6).fill(res.pressureOfBrakeCylinder.toFixed(2)); + if (res.oneSideDoorOpened) this.carInfo['1侧门'] = res.oneSideDoorOpened; + if (res.twoSideDoorOpened) this.carInfo['2侧门'] = res.twoSideDoorOpened; + if (res.parkingBreakPressure) this.carInfo.停放制动施加状态 = Array(6).fill(res.parkingBreakPressure); this.setTractionWave(res.traction); }); }, @@ -200,6 +215,13 @@ export default { display: flex; justify-content: center; align-items: center; + .bg_g { + background: #0f0; + color: #000; + } + .bg_r { + background: #f00; + } #content { width: 60%; height: 60%; @@ -250,15 +272,25 @@ export default { } } } - .bg_g { - background: #0f0; - color: #000; - } - .bg_r { - background: #f00; - } .speedBg { height: 90%; + padding: 2px; + background-repeat: no-repeat; + background-size: contain; + background-position: center; + display: flex; + justify-content: center; + div { + width: 20px; + transform-origin: bottom; + transform: scaleY(0.5); + } + #accBar { + background: #0f0; + } + #speedBar { + background: #0ff; + } } } } From 8020075b98c405d669eb129534786a91128f95a3 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 10 Nov 2023 17:22:37 +0800 Subject: [PATCH 07/11] =?UTF-8?q?tms=E9=A1=B5=E9=9D=A2=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jlmap3d/drive/sceneview/tmsPage.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/views/jlmap3d/drive/sceneview/tmsPage.vue b/src/views/jlmap3d/drive/sceneview/tmsPage.vue index 9dab01707..41f907287 100644 --- a/src/views/jlmap3d/drive/sceneview/tmsPage.vue +++ b/src/views/jlmap3d/drive/sceneview/tmsPage.vue @@ -104,8 +104,8 @@ id="accBar" :style="{ transform: `scaleY(${Math.abs(trainInfo.tractionPercent) / 100})`, - background: trainInfo.tractionPercent > 0 ? '#0f0' : '#f00', }" + :class="{ bg_g: trainInfo.tractionPercent > 0, bg_r: trainInfo.tractionPercent < 0 }" >
@@ -285,9 +285,6 @@ export default { transform-origin: bottom; transform: scaleY(0.5); } - #accBar { - background: #0f0; - } #speedBar { background: #0ff; } From ad6d96890c78b1c1b0a76edc33dfe1410b5f1b05 Mon Sep 17 00:00:00 2001 From: Yuan Date: Mon, 13 Nov 2023 10:38:30 +0800 Subject: [PATCH 08/11] =?UTF-8?q?tms=E9=A1=B5=E9=9D=A2=E6=94=BE=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jlmap3d/drive/sceneview/tmsPage.vue | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/views/jlmap3d/drive/sceneview/tmsPage.vue b/src/views/jlmap3d/drive/sceneview/tmsPage.vue index 41f907287..72e3d9d87 100644 --- a/src/views/jlmap3d/drive/sceneview/tmsPage.vue +++ b/src/views/jlmap3d/drive/sceneview/tmsPage.vue @@ -99,7 +99,8 @@ {{ item ? '' : '-- --' }} -
+
+
-
+
{{ trainInfo.speed }} km/h
@@ -223,8 +224,8 @@ export default { background: #f00; } #content { - width: 60%; - height: 60%; + width: 80%; + height: 90%; padding: 5px; display: flex; color: #fff; @@ -234,7 +235,7 @@ export default { align-items: center; table { width: 100%; - font-size: 1rem; + font-size: 1.4rem; text-align: center; border-collapse: collapse; td { @@ -275,13 +276,21 @@ export default { .speedBg { height: 90%; padding: 2px; - background-repeat: no-repeat; - background-size: contain; - background-position: center; display: flex; justify-content: center; + position: relative; + img { + position: absolute; + top: 0; + left: 10%; + width: 80%; + height: 100%; + } + .gap { + width: 4%; + } div { - width: 20px; + width: 23%; transform-origin: bottom; transform: scaleY(0.5); } From af3b4b1d976a76d01037bdb7557b1da04085f95b Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 13 Nov 2023 17:24:31 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=85=8D=E7=BD=AENCC,OCC=E8=A7=92=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/deviceManage/editConfig.vue | 8 +++++++- src/views/system/deviceManage/editConfigScreen.vue | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue index 144457dec..634660635 100644 --- a/src/views/system/deviceManage/editConfig.vue +++ b/src/views/system/deviceManage/editConfig.vue @@ -484,6 +484,7 @@ export default { handleMember(member, stationList) { const data = { value: member.id, label: '', memberType: member.type }; const device = stationList.find(station => station.code === member.deviceCode) || {}; + console.log(member, '===='); switch (member.type) { case 'DISPATCHER': data.label = '行调' + (member.name ? `-${member.name }` : ''); @@ -548,7 +549,12 @@ export default { case 'STATION_ELECTRIC_WORKER': data.label = '电力工务 ' + (member.name ? `-${member.name}` : ''); break; - + case 'NCC_DISPATCHER': + data.label = 'NCC调度' + (member.name ? `-${member.name }` : ''); + break; + case 'OCC_DISPATCHER': + data.label = '信息调度' + (member.name ? `-${member.name }` : ''); + break; } return data; } diff --git a/src/views/system/deviceManage/editConfigScreen.vue b/src/views/system/deviceManage/editConfigScreen.vue index da4647037..221aef105 100644 --- a/src/views/system/deviceManage/editConfigScreen.vue +++ b/src/views/system/deviceManage/editConfigScreen.vue @@ -293,6 +293,9 @@ export default { case 'STATION_ELECTRIC_WORKER': data.label = '电力工务 ' + (member.name ? `-${member.name}` : ''); break; + case 'NCC_DISPATCHER': + data.label = 'NCC调度' + (member.name ? `-${member.name }` : ''); + break; } return data; }, From 8a3670f51dd34f94cb8294b6e0ce436d64c6a02d Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 15 Nov 2023 15:04:35 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=9B=BD=E8=B5=9B=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/race_01/menus/menuTrain.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue index 74a0e6caa..21f57cc2e 100644 --- a/src/jmapNew/theme/race_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue @@ -57,6 +57,12 @@ export default { default() { return null; } + }, + work: { + type: String, + default() { + return ''; + } } }, data() { From 19fde5c7fc6285d1b200d12dcb48ecdc1ed19e23 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 16 Nov 2023 15:07:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E5=AD=A6?= =?UTF-8?q?=E9=99=A2=E6=B7=BB=E5=8A=A0=E5=8F=8Cicon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon/icon_zonghe.png | Bin 0 -> 4945 bytes src/views/login/index.vue | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/assets/icon/icon_zonghe.png diff --git a/src/assets/icon/icon_zonghe.png b/src/assets/icon/icon_zonghe.png new file mode 100644 index 0000000000000000000000000000000000000000..ae9a7cb32f9e1056c954ea5c91ef5d195470cd0c GIT binary patch literal 4945 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 {{ loginOrgTitle }} +
{{ loginProtitle }}
@@ -56,6 +57,7 @@ import bgIscsImg from '@/assets/bg_iscs.jpg'; import bgCctvImg from '@/assets/bg_cctv.jpg'; import bgLswImg from '@/assets/bg_lsw.jpg'; import bgPsdImg from '@/assets/bg_psd.png'; +import ZongheIcon from '@/assets/icon/icon_zonghe.png'; import { getLoginWmurl, checkLoginStatus, getLoginInfo } from '@/api/login'; import { getToken} from '@/utils/auth'; import { assignUsersPlayRoles } from '@/api/jointSimulation'; @@ -72,7 +74,8 @@ export default { loadingText:'', deviceImg:'', checkLogin: null, - sessionId:'' + sessionId:'', + zhIcon: ZongheIcon }; }, computed: {