From 5e55daf3a4f8f28bcb222576af215d9fe784d59f Mon Sep 17 00:00:00 2001 From: fan Date: Sun, 21 May 2023 13:39:42 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=BD=9B=E5=B1=B1?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E7=8E=B0=E5=9C=B0=E5=B7=A5=E4=BD=9C=E7=AB=99?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6=E5=99=A8?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/menuButton.vue | 19 ++++++++++++++++++- .../theme/foshan_01/menus/menuSection.vue | 14 ++++++++++---- .../theme/foshan_01/menus/menuSignal.vue | 10 ++++++++-- .../theme/foshan_01/menus/menuSwitch.vue | 10 ++++++++-- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/menuButton.vue b/src/jmapNew/theme/beijing_01/menus/menuButton.vue index 7427ce98e..982376410 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuButton.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuButton.vue @@ -348,9 +348,26 @@ export default { this.$refs.noticeInfo.doShow(); }); }, + checkStationControl(device) { + let cenStationCode = ''; + if (['Section', 'Signal', 'Switch', 'GuideLock', 'AutoTurnBack'].includes(device._type)) { + cenStationCode = device.stationCode; + } else if (device._type === 'Stand') { + cenStationCode = device.deviceStationCode; + } + if (!cenStationCode) { + return false; + } + const cenStation = this.$store.getters['map/getDeviceByCode'](cenStationCode); + const flag = cenStation.controlMode === 'Emergency' || cenStation.controlMode === 'Local'; + if (!flag) { + this.$message.info('请先切换到站控或紧急站控'); + } + return flag; + }, selectedChange() { const model = this.$store.state.menuOperation.selected; - if (model && model._type) { + if (model && model._type && this.checkStationControl(model)) { switch (this.$store.state.menuOperation.buttonOperation) { case OperationEvent.Station.guideLock.button.operation : { if (model && model._type == 'GuideLock') { diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index 36a70c3db..b42c1d169 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -135,8 +135,14 @@ export default { } }, '$store.state.menuOperation.selectedCount': function(val) { - if (this.buttonOperation && this.$store.state.menuOperation.selected._type == 'Section') { - this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected); + const device = this.$store.state.menuOperation.selected; + if (this.buttonOperation && device._type == 'Section') { + const cenStation = this.$store.getters['map/getDeviceByCode'](device.stationCode); + if (cenStation.controlMode !== 'Emergency' && cenStation.controlMode !== 'Local') { + this.$message.info('请先切换到站控或紧急站控'); + return; + } + this.operationHandler(this.buttonOperation, device); } } }, @@ -200,7 +206,7 @@ export default { // this.$refs.sectionUnLock.doShow(operate, this.selected); this.$store.dispatch('menuOperation/setButtonOperation', null); } - }).catch(error=>{ + }).catch(()=>{ this.$refs.noticeInfo.doShow(); }); break; @@ -213,7 +219,7 @@ export default { // this.$refs.sectionUnLock.doShow(operate, this.selected); this.$store.dispatch('menuOperation/setButtonOperation', null); } - }).catch(error=>{ + }).catch(()=>{ this.$refs.noticeInfo.doShow(); }); break; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index 753a358da..f2c75cf24 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -202,8 +202,14 @@ export default { } }, '$store.state.menuOperation.selectedCount': function(val) { - if (this.buttonOperation && this.$store.state.menuOperation.selected._type == 'Signal') { - this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected); + const device = this.$store.state.menuOperation.selected; + if (this.buttonOperation && device._type == 'Signal') { + const cenStation = this.$store.getters['map/getDeviceByCode'](device.stationCode); + if (cenStation.controlMode !== 'Emergency' && cenStation.controlMode !== 'Local') { + this.$message.info('请先切换到站控或紧急站控'); + return; + } + this.operationHandler(this.buttonOperation, device); } } }, diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue index 20304e6b2..302f2f675 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue @@ -175,8 +175,14 @@ export default { } }, '$store.state.menuOperation.selectedCount': function(val) { - if (this.buttonOperation && this.$store.state.menuOperation.selected._type == 'Switch') { - this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected); + const device = this.$store.state.menuOperation.selected; + if (this.buttonOperation && device._type == 'Switch') { + const cenStation = this.$store.getters['map/getDeviceByCode'](device.stationCode); + if (cenStation.controlMode !== 'Emergency' && cenStation.controlMode !== 'Local') { + this.$message.info('请先切换到站控或紧急站控'); + return; + } + this.operationHandler(this.buttonOperation, device); } } }, From c23bf6ba727e5e2da8c52a021c9f59287e9ea187 Mon Sep 17 00:00:00 2001 From: fan Date: Sun, 21 May 2023 13:54:49 +0800 Subject: [PATCH 02/42] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E5=80=8D=E9=80=9F?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/stomp.js | 8 +++++++- src/utils/subscribeCallback.js | 8 +++++++- .../newMap/display/simulationMenu/simulationControl.vue | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/utils/stomp.js b/src/utils/stomp.js index 7bbcdb562..b21568f82 100644 --- a/src/utils/stomp.js +++ b/src/utils/stomp.js @@ -102,7 +102,13 @@ function callback(Response) { } else if (Response.headers.destination.includes('sysTime')) { store.dispatch('socket/setSimulationTimeSync', Number.parseInt(Response.body)); } else if (Response.headers.destination.includes('state')) { - store.dispatch('socket/handleSimulationState', Number.parseInt(Response.body)); + const msg = JSON.parse(Response.body); + if (msg.state) { + store.dispatch('socket/handleSimulationState', Number.parseInt(msg.state)); + } + if (msg.speed) { + store.dispatch('socket/setSimulationSpeed', Number.parseInt(msg.speed)); + } } else if (Response.headers.destination.includes('iscs/psd') || Response.headers.destination.includes('iscs/gate')) { store.dispatch('socket/handleIscsState', JSON.parse(Response.body)); } else if (Response.headers.destination.includes('iscs/pa')) { diff --git a/src/utils/subscribeCallback.js b/src/utils/subscribeCallback.js index d7b3254fa..f46dcf47c 100644 --- a/src/utils/subscribeCallback.js +++ b/src/utils/subscribeCallback.js @@ -8,7 +8,13 @@ export function sysTimeCallback(Response) { store.dispatch('socket/setSimulationTimeSync', Number.parseInt(Response.body)); } export function stateCallback(Response) { - store.dispatch('socket/handleSimulationState', Number.parseInt(Response.body)); + const msg = JSON.parse(Response.body); + if (msg.state) { + store.dispatch('socket/handleSimulationState', Number.parseInt(msg.state)); + } + if (msg.speed) { + store.dispatch('socket/setSimulationSpeed', Number.parseInt(msg.speed)); + } } export function iscsPsdCallback(Response) { store.dispatch('socket/handleIscsState', JSON.parse(Response.body)); diff --git a/src/views/newMap/display/simulationMenu/simulationControl.vue b/src/views/newMap/display/simulationMenu/simulationControl.vue index d5926cadc..29373f13b 100644 --- a/src/views/newMap/display/simulationMenu/simulationControl.vue +++ b/src/views/newMap/display/simulationMenu/simulationControl.vue @@ -94,6 +94,9 @@ export default { watch: { '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新 this.initDate(time); + }, + '$store.state.socket.simulationSpeed': function(speed) { + this.speed = speed; } }, mounted() { From 240f779afbc1fe90c526cceedd33914b819d30d6 Mon Sep 17 00:00:00 2001 From: fan Date: Sun, 21 May 2023 16:30:43 +0800 Subject: [PATCH 03/42] =?UTF-8?q?=E7=AB=99=E9=81=A5=E6=8E=A7=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=80=BC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/menuDialog/stationControl.vue | 3 ++- .../theme/foshan_01/menus/menuDialog/stationControl.vue | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue index fe239a56d..77a26ddd1 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue @@ -58,7 +58,7 @@ export default { dialogShow: false, disabledClose: false, disabledCommit: false, - stationType: '01', + stationType: '', station:{}, stationCode: '', stationName: '', @@ -113,6 +113,7 @@ export default { this.operate = operate || {}; this.operation = operate.operation; } + this.stationType = ''; this.dialogShow = true; this.$store.dispatch('training/emitTipFresh'); }, diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue index 173d2c8be..c3f422807 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue @@ -165,6 +165,7 @@ export default { if (!this.dialogShow) { this.operate = operate || {}; this.operation = operate.operation; + this.formModel.stationType = ''; } this.initControlModeList(); // this.$store.state.training.prdType From 144fecf31a7596c24fa1cba2369d089c7c36d2e1 Mon Sep 17 00:00:00 2001 From: fan Date: Sun, 21 May 2023 16:31:04 +0800 Subject: [PATCH 04/42] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue | 5 ++--- src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue | 3 --- src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue | 2 +- .../theme/ningbo_03/menus/menuDialog/arrangeRoute.vue | 3 --- src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue | 3 --- src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue | 5 ++--- src/views/newMap/display/terminals/abnormalTrain/index.vue | 2 +- .../diagramEdit/components/menus/gernaratePlanTrain.vue | 1 - src/views/newMap/display/terminals/diagramEdit/statusBar.vue | 1 - src/views/newMap/display/terminals/dispatchCmd.vue | 3 --- 10 files changed, 6 insertions(+), 22 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue index 3ad110c38..a62e6c42c 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue @@ -130,9 +130,8 @@ export default { } return name; }, - expandPath() { - console.log('展开进路预览'); - }, + // expandPath() { + // }, doShow(operate, selected, tempData) { this.selected = selected; // 如果不是断点激活，而是第一次显示，则需要设置初始值 diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue index 730625ceb..cabe2d810 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue @@ -86,9 +86,6 @@ export default { } }, methods: { - expandPath() { - console.log('展开进路预览'); - }, doShow(operate, selected, tempData) { this.selected = selected; // 如果不是断点激活，而是第一次显示，则需要设置初始值 diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue index 7732855bf..8b8a01d0a 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue @@ -126,7 +126,7 @@ export default { try { this.setMap(this.mapData, this.mapDevice); } catch (error) { - console.log('[ERROR] ', error); + console.error('[ERROR] ', error); } }, // 设置地图 diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue index 71930e720..7c571123b 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue @@ -153,9 +153,6 @@ export default { } }, methods: { - expandPath() { - console.log('展开进路预览'); - }, doShow(operate) { // 如果不是断点激活，而是第一次显示，则需要设置初始值 this.dialogShow = true; diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue index 36a5c0b9f..b43988a22 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue @@ -113,9 +113,6 @@ export default { } }, methods: { - expandPath() { - console.log('展开进路预览'); - }, doShow(data) { this.activeName = data.active; // 如果不是断点激活，而是第一次显示，则需要设置初始值 diff --git a/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue index 096ddacb9..509c508b4 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue @@ -98,9 +98,8 @@ export default { } }, methods: { - expandPath() { - console.log('展开进路预览'); - }, + // expandPath() { + // }, doShow(operate, selected, tempData) { this.selected = selected; // 如果不是断点激活，而是第一次显示，则需要设置初始值 diff --git a/src/views/newMap/display/terminals/abnormalTrain/index.vue b/src/views/newMap/display/terminals/abnormalTrain/index.vue index c520c4da1..de99f4399 100644 --- a/src/views/newMap/display/terminals/abnormalTrain/index.vue +++ b/src/views/newMap/display/terminals/abnormalTrain/index.vue @@ -82,7 +82,7 @@ export default { sendCommandNew(this.group, 'KEY_LINK_CONTROL_INFO_QUERY', params).then((res) => { this.searchList = res.data; }).catch(error => { - console.log('查询失败！', error); + console.error('查询失败！', error); }); } } diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue index 33de5fd55..b55992e7a 100644 --- a/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue +++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue @@ -145,7 +145,6 @@ export default { this.onRunningRouteChange(); this.dataLoading = false; }).catch(_ => { - console.log(_); this.dataLoading = false; this.$messageBox(`获取交路列表失败`); }); diff --git a/src/views/newMap/display/terminals/diagramEdit/statusBar.vue b/src/views/newMap/display/terminals/diagramEdit/statusBar.vue index 508b7df05..ad5f1fc67 100644 --- a/src/views/newMap/display/terminals/diagramEdit/statusBar.vue +++ b/src/views/newMap/display/terminals/diagramEdit/statusBar.vue @@ -147,7 +147,6 @@ export default { center: true }).then(() => { clearPlaningData(this.loadRunPlanId).then(resp => { - console.log('清除数据成功！'); this.$emit('refresh'); }).catch(() => { this.$message.error('清除数据失败！'); diff --git a/src/views/newMap/display/terminals/dispatchCmd.vue b/src/views/newMap/display/terminals/dispatchCmd.vue index a2ba14c92..5c4eabdd5 100644 --- a/src/views/newMap/display/terminals/dispatchCmd.vue +++ b/src/views/newMap/display/terminals/dispatchCmd.vue @@ -772,7 +772,6 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - console.log('无线受令代签'); const rcId = this.getRcId(this.trainRow.code); const params = {cmdId: this.command.cmdId, rcId: rcId, proxySign: true}; const operate = { @@ -1368,7 +1367,6 @@ export default { }); }, cacheCmd(showMsg) { - console.log('缓存', this.command); return new Promise(async(resolve, reject) => { const data = JSON.parse(JSON.stringify(this.command)); const idList = await this.getCompanyIdList(data.rcvCompanies.length + 1); @@ -1410,7 +1408,6 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - console.log('代签'); const rcId = this.getRcId(this.allographRow.code); const params = {cmdId: this.command.cmdId, rcId: rcId, proxySign: true}; const operate = { From e6b1d2777aa97317607cf5cec38c8f95ff4e2ce1 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Mon, 22 May 2023 09:43:36 +0800 Subject: [PATCH 05/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=81=E8=81=8A?= =?UTF-8?q?=E5=8F=8A=E6=88=90=E5=91=98=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/newChat.js | 32 ++ src/scripts/cmdPlugin/CommandEnum.js | 4 +- src/views/newMap/display/index.vue | 4 +- .../newMap/display/newChat/addressBook.vue | 138 ++++++ .../newMap/display/newChat/chatContent.vue | 19 +- .../newMap/display/newChat/chatDialog.vue | 450 ++++++++++++++++-- .../newMap/display/newChat/dialogMember.vue | 87 ++++ .../newMap/display/newChat/editGroup.vue | 323 +++---------- 8 files changed, 754 insertions(+), 303 deletions(-) create mode 100644 src/views/newMap/display/newChat/addressBook.vue create mode 100644 src/views/newMap/display/newChat/dialogMember.vue diff --git a/src/api/newChat.js b/src/api/newChat.js index bdcc96501..6ded7fe84 100644 --- a/src/api/newChat.js +++ b/src/api/newChat.js @@ -187,3 +187,35 @@ export function setGroupReadMessage(groupId, data) { data }); } + +/** + * 发送私聊文字信息 + * @param {String} groupId 房间号 + * @param {Object} data + * @param {Number} data.memberId 角色id + * @param {String} data.content 文字内容 + * @returns + */ +export function sendPrivateText(groupId, data) { + return request({ + url: `/simulation/${groupId}/operate/Conversation_Group_Private_Text_Chat`, + method: 'post', + data + }); +} + +/** + * 发送私聊BASE64信息 + * @param {String} groupId 房间号 + * @param {Object} data + * @param {Number} data.memberId 角色id + * @param {String} data.fileBase64Str 文件base64码 + * @returns + */ +export function sendPrivateBase64(groupId, data) { + return request({ + url: `/simulation/${groupId}/operate/Conversation_Group_Private_Audio_Base64`, + method: 'post', + data + }); +} diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index f3a89f7b7..ceca49be2 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -514,7 +514,9 @@ export default { CMD_Conversation_Chat_Text: {value: 'Conversation_Chat_Text', label: '发送文本消息'}, CMD_Conversation_Chat_Audio_Base64: {value: 'Conversation_Chat_Audio_Base64', label: '发送语音消息'}, CMD_Conversation_Group_Text_Chat: {value: 'Conversation_Group_Text_Chat', label: '发送会话群文字消息'}, - CMD_Conversation_Group_Audio_Base64: {value: 'Conversation_Group_Audio_Base64', label: '发送会话群语音消息'} + CMD_Conversation_Group_Audio_Base64: {value: 'Conversation_Group_Audio_Base64', label: '发送会话群语音消息'}, + CMD_Conversation_Group_Private_Text_Chat: {value: 'Conversation_Group_Private_Text_Chat', label: '发送私聊文字消息'}, + CMD_Conversation_Group_Private_Audio_Base64: {value: 'Conversation_Group_Private_Audio_Base64', label: '发送私聊语音消息'} }, PSL: { CMD_PSL_PRESS_BUTTON: {value: 'PSL_PRESS_BUTTON', label: 'PSL按钮操作'} diff --git a/src/views/newMap/display/index.vue b/src/views/newMap/display/index.vue index 7c632e682..93fbdc7b6 100644 --- a/src/views/newMap/display/index.vue +++ b/src/views/newMap/display/index.vue @@ -30,8 +30,8 @@ import TrainingTip from './trainingList/trainingTip'; import TrainingPositionTip from './trainingList/trainingPositionTip.vue'; import TrainingMenu from './trainingList/trainingMenu'; import TrainingDesign from './trainingDesign/designPane.vue'; -// import ChatBox from './newChat/index.vue'; -import ChatBox from './chatBox'; +import ChatBox from './newChat/index.vue'; +// import ChatBox from './chatBox'; import TrainingLeftSlider from './trainingList/trainingLeftSlider'; import LineBoard from './lineBoard'; import BottomTable from './bottomTable'; diff --git a/src/views/newMap/display/newChat/addressBook.vue b/src/views/newMap/display/newChat/addressBook.vue new file mode 100644 index 000000000..919e08620 --- /dev/null +++ b/src/views/newMap/display/newChat/addressBook.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/newMap/display/newChat/chatContent.vue b/src/views/newMap/display/newChat/chatContent.vue index ec5b057de..1ab489559 100644 --- a/src/views/newMap/display/newChat/chatContent.vue +++ b/src/views/newMap/display/newChat/chatContent.vue @@ -27,7 +27,7 @@
- T + T @@ -58,6 +58,10 @@ export default { groupName: { type: String, required:true + }, + privateChatId: { + type: String, + required: true } }, data() { @@ -130,6 +134,7 @@ export default { }, beforeDestroy() { this.contentDom.onscroll = null; + this.contentDom = ''; }, methods: { setIsBottomFn() { @@ -189,7 +194,7 @@ export default { return name; }, sendText() { - if (!this.id || !this.textContent) { return; } + if ((!this.id && !this.privateChatId) || !this.textContent) { return; } const operate = { over: true, cmdType: CMD.Conversation.CMD_Conversation_Group_Text_Chat, @@ -201,6 +206,11 @@ export default { content: this.textContent } }; + if (this.privateChatId) { + operate.cmdType = CMD.Conversation.CMD_Conversation_Group_Private_Text_Chat; + delete operate.param.id; + operate.param.memberId = this.privateChatId; + } this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { this.textContent = ''; @@ -237,6 +247,11 @@ export default { fileBase64Str: BaseURL } }; + if (that.privateChatId) { + operate.cmdType = CMD.Conversation.CMD_Conversation_Group_Private_Audio_Base64; + delete operate.param.id; + operate.param.memberId = that.privateChatId; + } that.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { that.textContent = ''; diff --git a/src/views/newMap/display/newChat/chatDialog.vue b/src/views/newMap/display/newChat/chatDialog.vue index 24b32838b..970d72d3b 100644 --- a/src/views/newMap/display/newChat/chatDialog.vue +++ b/src/views/newMap/display/newChat/chatDialog.vue @@ -16,7 +16,7 @@
-
+
@@ -25,7 +25,7 @@
{{ item.label }}
-
+
@@ -39,7 +39,7 @@
-
+
@@ -56,28 +56,36 @@
- +
-
文档
-
工作台
-
通讯录
+
+ +
- + + + + + diff --git a/src/views/newMap/display/newChat/editGroup.vue b/src/views/newMap/display/newChat/editGroup.vue index ccf6c815b..c75931693 100644 --- a/src/views/newMap/display/newChat/editGroup.vue +++ b/src/views/newMap/display/newChat/editGroup.vue @@ -2,7 +2,7 @@ {{ selectTreeNode.length }} ）
- + {{ tag.labelName }}
- + - + 取消 确定 @@ -77,102 +77,56 @@ export default { }, props: { - + memberTreeData: { + type: Array, + default: () => { + return []; + } + } }, data() { return { + title: '创建会话群', dialogVisible: false, queryMember: '', defaultProps: { children: 'children', - label: 'labelName' + label: 'labelName', + disabled: (node) => { + if (node.disabled || this.treeDisabled) { + return true; + } else { + return false; + } + } }, activeTrains: [], + defaultCheckedKeys: [], selectTreeNode: [], - treeData: [{ - labelName: '行调', - children: [] - }, { - labelName: 'NCC调度', - children: [] - }, { - labelName: '车站值班员', - children: [] - }, { - labelName: '司机', - children: [] - }, { - labelName: '通号', - children: [] - }, { - labelName: '车辆段', - children: [] - }, { - labelName: 'CTC操作员', - children: [] - }, { - labelName: '车站助理', - children: [] - }, - { - labelName: '车站站长', - children: [] - }, - { - labelName: '车站信号员', - children: [] - }, - { - labelName: '车站客运员', - children: [] - }, - { - labelName: '车站扳道员', - children: [] - }, - { - labelName: '车站引导员', - children: [] - }, - { - labelName: '车站工务工', - children: [] - }, - { - labelName: '设备管理员', - children: [] - } - ], form: { name: '', imageUrl: '' - } + }, + treeDisabled: false, + nameDisabled: false, + showSubmitBtn: true }; }, computed: { groupId() { return this.$route.query.group; }, - memberList() { - return this.$store.state.training.memberList; - }, memberData() { return this.$store.state.training.memberData; }, myMemberId() { return this.$store.state.training.myMemberId; - }, - defaultCheckedKeys() { - return [this.myMemberId]; } }, watch: { queryMember(val) { this.$refs.tree.filter(val); }, - memberList () { - this.getTreeData(); - }, myMemberId(val) { this.initData(); if (!val) { @@ -181,13 +135,23 @@ export default { }, '$store.state.map.activeTrainListChange': function () { this.getActiveTrains(); + }, + title() { + if (this.title == '创建会话群') { + this.showSubmitBtn = true; + this.treeDisabled = false; + this.nameDisabled = false; + } else { + this.showSubmitBtn = false; + this.treeDisabled = true; + this.nameDisabled = true; + } } }, mounted() { this.initData(); }, created() { - this.getTreeData(); this.getActiveTrains(); }, beforeDestroy() { @@ -215,200 +179,6 @@ export default { } this.$refs.tree && this.$refs.tree.filter(this.queryMember); }, - getTreeData() { - const val = this.memberList; - if (val && val.length) { - // this.memberData = this.$store.state.training.memberData; - const dispatcherList = []; - const nccDispatcherList = []; - const electricDispatcherList = []; - const depotDispatcherList = []; - const stationSupervisorList = []; - const driverList = []; - const maintainerList = []; - const ctcOperatorList = []; - const stationAssistantList = []; - const stationMasterList = []; - const stationSignalerList = []; - const stationPassengerList = []; - const stationSwitchManList = []; - const stationFacilitatorList = []; - const stationWorkerList = []; - const deviceManagerList = []; - const trainMasterList = []; - const stationElectricWorkerList = []; - val.forEach(item => { - const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode); - switch (item.type) { - case 'DISPATCHER': - this.memberData[item.id].labelName = '行调' + (item.name || ''); - dispatcherList.push(this.memberData[item.id]); - break; - case 'NCC_DISPATCHER': - this.memberData[item.id].labelName = 'NCC调度' + (item.name || ''); - nccDispatcherList.push(this.memberData[item.id]); - break; - case 'ELECTRIC_DISPATCHER': - this.memberData[item.id].labelName = '电力调度' + (item.name || ''); - electricDispatcherList.push(this.memberData[item.id]); - break; - case 'DEPOT_DISPATCHER': - this.memberData[item.id].labelName = '信号楼-' + device.name + (item.name || ''); - depotDispatcherList.push(this.memberData[item.id]); - break; - case 'STATION_SUPERVISOR': - this.memberData[item.id].labelName = '值班员-' + device.name + (item.name ? `-${item.name }` : ''); - stationSupervisorList.push(this.memberData[item.id]); - break; - case 'DRIVER': - this.memberData[item.id].labelName = '司机-列车' + item.deviceCode; - driverList.push(this.memberData[item.id]); - break; - case 'MAINTAINER': - this.memberData[item.id].labelName = '通号' + (item.name || ''); - maintainerList.push(this.memberData[item.id]); - break; - case 'RAIL_CTC': - this.memberData[item.id].labelName = 'CTC操作员' + device.name; - ctcOperatorList.push(this.memberData[item.id]); - break; - case 'STATION_ASSISTANT': - this.memberData[item.id].labelName = '车站助理-' + device.name + (item.name ? `-${item.name }` : ''); - stationAssistantList.push(this.memberData[item.id]); - break; - case 'STATION_MASTER': - this.memberData[item.id].labelName = '车站站长-' + device.name + (item.name ? `-${item.name }` : ''); - stationMasterList.push(this.memberData[item.id]); - break; - case 'STATION_SIGNALER': - this.memberData[item.id].labelName = '车站信号员-' + device.name + (item.name ? `-${item.name }` : ''); - stationSignalerList.push(this.memberData[item.id]); - break; - case 'STATION_PASSENGER': - this.memberData[item.id].labelName = '车站客运员-' + device.name + (item.name ? `-${item.name }` : ''); - stationPassengerList.push(this.memberData[item.id]); - break; - case 'STATION_SWITCH_MAN': - this.memberData[item.id].labelName = '车站扳道员-' + device.name + (item.name ? `-${item.name }` : ''); - stationSwitchManList.push(this.memberData[item.id]); - break; - case 'STATION_FACILITATOR': - this.memberData[item.id].labelName = '车站引导员-' + device.name + (item.name ? `-${item.name }` : ''); - stationFacilitatorList.push(this.memberData[item.id]); - break; - case 'STATION_WORKER': - this.memberData[item.id].labelName = '车站工务工-' + device.name + (item.name ? `-${item.name }` : ''); - stationWorkerList.push(this.memberData[item.id]); - break; - case 'DEVICE_MANAGER': - this.memberData[item.id].labelName = '设备管理员-' + device.name + (item.name ? `-${item.name }` : ''); - deviceManagerList.push(this.memberData[item.id]); - break; - case 'TRAIN_MASTER': - // device.name; - this.memberData[item.id].labelName = '车务段段长-' + (item.name ? `-${item.name }` : ''); - trainMasterList.push(this.memberData[item.id]); - break; - case 'PARENT_DEPARTMENT': - this.memberData[item.id].labelName = '上级部门' + (item.name ? `-${item.name }` : ''); - break; - case 'STATION_ELECTRIC_WORKER': - this.memberData[item.id].labelName = '电力工务' + (item.name || ''); - stationElectricWorkerList.push(this.memberData[item.id]); - break; - // DEVICE_MANAGER:'设备管理员' deviceManager - } - }); - this.treeData = [{ - labelName: '行调', - id: 'dispatcher', - children: dispatcherList - }, { - labelName: 'NCC调度', - id: 'nccDispatcher', - children: nccDispatcherList - }, { - labelName: '车站值班员', - id: 'stationSupervisor', - children: stationSupervisorList - }, { - labelName: '司机', - id: 'driver', - children: driverList - }, { - labelName: '通号', - id: 'maintainer', - children: maintainerList - }, { - labelName: '车辆段信号楼', - id: 'depotDispatcher', - children: depotDispatcherList - }, { - labelName: '电力调度', - id: 'electricDispatcher', - children: electricDispatcherList - }, { - labelName: 'CTC操作员', - id: 'ctcOperator', - children: ctcOperatorList - }, { - labelName: '车站助理', - id: 'stationAssistant', - children: stationAssistantList - }, - { - labelName: '车站站长', - id: 'stationMaster', - children: stationMasterList - }, - { - labelName: '车站信号员', - id: 'stationSignaler', - children: stationSignalerList - }, - { - labelName: '车站客运员', - id: 'stationPassenger', - children: stationPassengerList - }, - { - labelName: '车站扳道员', - id: 'stationSwitchMan', - children: stationSwitchManList - }, - { - labelName: '车站引导员', - id: 'stationFacilitator', - children: stationFacilitatorList - }, - { - labelName: '车站工务工', - id: 'stationWorker', - children: stationWorkerList - }, - { - labelName: '设备管理员', - id: 'deviceManager', - children: deviceManagerList - }, - { - labelName: '车务段段长 ', - id: 'trainMaster', - children: trainMasterList - }, - { - labelName: '电力工务 ', - id: 'stationElectricWorker', - children: stationElectricWorkerList - } - ]; - this.$nextTick(() => { - if (this.$refs.tree) { - this.$refs.tree.filter(this.queryMember); - } - }); - } - }, checkChange(data, node, val) { const filter = node.checkedNodes.filter(ii => { return !ii.children; @@ -446,6 +216,7 @@ export default { }, initData() { this.$refs.form && this.$refs.form.resetFields(); + this.defaultCheckedKeys = [this.myMemberId]; this.selectTreeNode = []; const node = this.memberData[this.myMemberId]; node && this.selectTreeNode.push(node); @@ -499,7 +270,9 @@ export default { // fileName：存储文件名 // method：生成链接的请求方式 }, - doShow() { + doShow(info, title) { + this.title = title || '创建会话群'; + this.setInfo(info); this.dialogVisible = true; this.$nextTick(() => { if (this.$refs.tree) { @@ -507,6 +280,21 @@ export default { } }); }, + setInfo(info) { + if (info) { + this.form.name = info.name || ''; + this.form.imageUrl = info.imageUrl || ''; + this.defaultCheckedKeys = []; + this.selectTreeNode = []; + info.memberList.forEach(item => { + this.defaultCheckedKeys.push(item.memberId); + const node = this.memberData[item.memberId]; + node && this.selectTreeNode.push(node); + }); + } else { + this.initData(); + } + }, handleClose() { this.dialogVisible = false; } @@ -549,6 +337,7 @@ $imgHeight: 70px; .disableClose { /deep/ .el-icon-close { cursor: not-allowed; + display: none !important; } } } From 2635ea8c576f173d92494c9fca99f12364d2ea3c Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Mon, 22 May 2023 10:08:13 +0800 Subject: [PATCH 06/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=A4=E4=B8=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/display/newChat/chatDialog.vue | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/src/views/newMap/display/newChat/chatDialog.vue b/src/views/newMap/display/newChat/chatDialog.vue index 970d72d3b..3cb45fae7 100644 --- a/src/views/newMap/display/newChat/chatDialog.vue +++ b/src/views/newMap/display/newChat/chatDialog.vue @@ -184,6 +184,24 @@ export default { } this.getGroupList(); }, + '$store.state.socket.conversationGroup.UPDATE_NAME': function(val) { + if (val.messageTips) { + this.$message.success(`${val.messageTips}`); + } + this.getGroupList(); + }, + '$store.state.socket.conversationGroup.UPDATE_MEMBER': function(val) { + if (val.messageTips) { + this.$message.success(`${val.messageTips}`); + } + this.getGroupList(); + }, + '$store.state.socket.conversationGroup.EXIT': function(val) { + if (val.messageTips) { + this.$message.success(`${val.messageTips}`); + } + this.getGroupList(); + }, myMemberId() { this.getGroupList(); }, @@ -269,16 +287,16 @@ export default { return item.leaderId != this.myMemberId; }, isShow: (item) => item.type === 'GROUP_CHAT' + }, + { + label: '修改群主', + handler: this.editGroupLeader, + groupInfo: item, + isDisabled: (item) => { + return item.leaderId != this.myMemberId; + }, + isShow: (item) => item.type === 'GROUP_CHAT' } - // { - // label: '修改群主', - // handler: this.editGroupLeader, - // groupInfo: item, - // isDisabled: (item) => { - // return item.leaderId != this.myMemberId; - // }, - // isShow: (item) => item.type === 'GROUP_CHAT' - // } ]; this.menu = []; const list = menuNormal(item); From 77a80c2b2d8b92d8e30113c6c5c42eb26440be1a Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Mon, 22 May 2023 11:02:36 +0800 Subject: [PATCH 07/42] =?UTF-8?q?=E7=BE=A4=E9=82=80=E8=AF=B7=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/display/newChat/chatDialog.vue | 9 ++ .../newMap/display/newChat/editGroup.vue | 84 ++++++++++++++----- 2 files changed, 70 insertions(+), 23 deletions(-) diff --git a/src/views/newMap/display/newChat/chatDialog.vue b/src/views/newMap/display/newChat/chatDialog.vue index 3cb45fae7..821073570 100644 --- a/src/views/newMap/display/newChat/chatDialog.vue +++ b/src/views/newMap/display/newChat/chatDialog.vue @@ -296,6 +296,15 @@ export default { return item.leaderId != this.myMemberId; }, isShow: (item) => item.type === 'GROUP_CHAT' + }, + { + label: '邀请成员', + handler: this.groupSet, + groupInfo: item, + isDisabled: (item) => { + return item.leaderId != this.myMemberId; + }, + isShow: (item) => item.type === 'GROUP_CHAT' } ]; this.menu = []; diff --git a/src/views/newMap/display/newChat/editGroup.vue b/src/views/newMap/display/newChat/editGroup.vue index c75931693..0b4a3a466 100644 --- a/src/views/newMap/display/newChat/editGroup.vue +++ b/src/views/newMap/display/newChat/editGroup.vue @@ -41,13 +41,13 @@ {{ selectTreeNode.length }} ）
- + {{ tag.labelName }}
- + - -
- - - - -
-
+
+
{{ '统计信息' }}
+ 返回 + + + +
+ + + + + + + + + + + 查询 + + +
+
From ac1ef8e5a847ff8d2c4ac950a09c9f9eed3e8b01 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Tue, 23 May 2023 15:54:33 +0800 Subject: [PATCH 22/42] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=94=9F=E6=88=90=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jmap/map.js | 8 ++++++++ src/views/publish/publishMap/index.vue | 24 +++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js index 96d2d73d8..3f2f65321 100644 --- a/src/api/jmap/map.js +++ b/src/api/jmap/map.js @@ -314,3 +314,11 @@ export function getClientDataById(mapId) { method: 'get' }); } +/** 发布地图根据id生成实训 */ +export function generateTrainingData(data) { + return request({ + url: `/api/v2/training/rule/generate/mapId`, + method: 'post', + data: data + }); +} diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue index f17c6f5a3..9c720b859 100644 --- a/src/views/publish/publishMap/index.vue +++ b/src/views/publish/publishMap/index.vue @@ -27,7 +27,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b44134285..67b70a0d3 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -111,7 +111,6 @@ import { mapGetters } from 'vuex'; import SystemTitle from './Title'; import {getSessionStorage } from '@/utils/auth'; -import { ThirdLoginList } from '@/scripts/ProjectConfig'; export default { components: { @@ -131,7 +130,7 @@ export default { 'routers' ]), thirdLogin() { - return ThirdLoginList.includes(getSessionStorage('project')); + return this.$store.state.user.thirdLogin; }, username() { return this.$store.state.user.nickname; diff --git a/src/layout/index.vue b/src/layout/index.vue index 13e84969c..94de39444 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -8,9 +8,9 @@ -
{{ $t('global.companyInfo') }}  {{ $t('global.companyTel') }}
-
{{ bottomColumnOnlyConInfo.includes(project)? companyInfo : $t('global.companyICP') }}
- +
{{ bottomCompanyInfo }}
+
{{ bottomRecordNumber }}
+
@@ -33,7 +33,8 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/designPlatform/bigSplitScreen.vue b/src/views/designPlatform/bigSplitScreen.vue index 8d8e1f29c..a4d753200 100644 --- a/src/views/designPlatform/bigSplitScreen.vue +++ b/src/views/designPlatform/bigSplitScreen.vue @@ -1,221 +1,221 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue index b25a48574..cd7b36d91 100644 --- a/src/views/designPlatform/demonList.vue +++ b/src/views/designPlatform/demonList.vue @@ -1,304 +1,304 @@ - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/views/designPlatform/home.vue b/src/views/designPlatform/home.vue index cc849145d..7496e8e4c 100644 --- a/src/views/designPlatform/home.vue +++ b/src/views/designPlatform/home.vue @@ -1,83 +1,83 @@ - + + + + + + + + + + + + + + + + + - - + + + + + + + + + diff --git a/src/views/designPlatform/index.vue b/src/views/designPlatform/index.vue index b0c6ff1fb..154af9971 100644 --- a/src/views/designPlatform/index.vue +++ b/src/views/designPlatform/index.vue @@ -1,82 +1,82 @@ - + + + + + + + + + + + - - + + + + + + + diff --git a/src/views/designPlatform/mapPreviewNew.vue b/src/views/designPlatform/mapPreviewNew.vue index a565cf9df..308a85559 100644 --- a/src/views/designPlatform/mapPreviewNew.vue +++ b/src/views/designPlatform/mapPreviewNew.vue @@ -1,177 +1,177 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue b/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue index c6b396424..3fec13003 100644 --- a/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue +++ b/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue @@ -37,7 +37,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/messageBoard/manage.vue b/src/views/messageBoard/manage.vue index f61b39b65..d3547ed59 100644 --- a/src/views/messageBoard/manage.vue +++ b/src/views/messageBoard/manage.vue @@ -1,121 +1,121 @@ - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/views/newMap/display/messageBoard.vue b/src/views/newMap/display/messageBoard.vue index 27978cbca..3dee44fa3 100644 --- a/src/views/newMap/display/messageBoard.vue +++ b/src/views/newMap/display/messageBoard.vue @@ -1,451 +1,451 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/newMap/display/simulationMenu/contectUs.vue b/src/views/newMap/display/simulationMenu/contectUs.vue index d24838220..4ff8cfed7 100644 --- a/src/views/newMap/display/simulationMenu/contectUs.vue +++ b/src/views/newMap/display/simulationMenu/contectUs.vue @@ -5,7 +5,7 @@ width="400px" :before-close="handleClose" > -
+
联系人：欧阳炜椿
电    话：4000500081
邮    箱：zhrc@richortech.com
@@ -29,8 +29,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/serverManage/index.vue b/src/views/system/serverManage/index.vue index 6c55534d9..8d1267f31 100644 --- a/src/views/system/serverManage/index.vue +++ b/src/views/system/serverManage/index.vue @@ -1,166 +1,166 @@ - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/systemGenerate/create.vue b/src/views/system/systemGenerate/create.vue index 5ba8ddf7d..68aa5b88f 100644 --- a/src/views/system/systemGenerate/create.vue +++ b/src/views/system/systemGenerate/create.vue @@ -1,201 +1,201 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/systemGenerate/index.vue b/src/views/system/systemGenerate/index.vue index be0cc8e9a..58dfa3a9d 100644 --- a/src/views/system/systemGenerate/index.vue +++ b/src/views/system/systemGenerate/index.vue @@ -1,176 +1,176 @@ - + + + + + + - + + + + + + + + + + + + + diff --git a/src/views/thirdLogin/index.vue b/src/views/thirdLogin/index.vue index e6343cea4..517323995 100644 --- a/src/views/thirdLogin/index.vue +++ b/src/views/thirdLogin/index.vue @@ -14,7 +14,6 @@ import md5 from 'js-md5'; import { setToken, getToken } from '@/utils/auth'; import OrgSelect from '../login/orgSelect'; // , ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList -// import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig'; export default { name:'ThirdLogin', From bab7cd6c4089e656b5a6cc64d846b7832aef2a16 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 24 May 2023 11:12:59 +0800 Subject: [PATCH 29/42] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 10 +- src/views/designPlatform/bigScreen.vue | 448 ++++++++++---------- src/views/designPlatform/bigSplitScreen.vue | 438 +++++++++---------- src/views/designPlatform/home.vue | 154 +++---- src/views/designPlatform/index.vue | 156 +++---- src/views/designPlatform/mapPreviewNew.vue | 350 +++++++-------- 6 files changed, 778 insertions(+), 778 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 5ed170883..bd26053c5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -116,11 +116,11 @@ const PlanMonitorEditAUSTool = () => import('@/views/planMonitor/editToolAUS/too const PlanMonitorEditAUSLine = () => import('@/views/planMonitor/editToolAUS/line/index'); const PlanMonitorDetail = () => import('@/views/planMonitor/detail'); -// const DesignPlatformHome = () => import('@/views/designPlatform/home'); -// const DesignPlatform = () => import('@/views/designPlatform/index'); -// const MapPreviewNew = () => import('@/views/designPlatform/mapPreviewNew'); -// const BigScreen = () => import('@/views/designPlatform/bigScreen'); -// const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen'); +const DesignPlatformHome = () => import('@/views/designPlatform/home'); +const DesignPlatform = () => import('@/views/designPlatform/index'); +const MapPreviewNew = () => import('@/views/designPlatform/mapPreviewNew'); +const BigScreen = () => import('@/views/designPlatform/bigScreen'); +const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen'); const SimulationPlatform = () => import('@/views/trainingPlatform/simulation'); diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue index 4b6763285..7df15f81d 100644 --- a/src/views/designPlatform/bigScreen.vue +++ b/src/views/designPlatform/bigScreen.vue @@ -1,226 +1,226 @@ - - - - - - - - - - - - - - - - - - - + +--> - - - - - - - - - - - - - - - - - - - - - - - - + } + }, + async beforeDestroy() { + await this.$store.dispatch('map/mapClear'); + this.$store.dispatch('training/setPrdType', ''); + }, + async mounted() { + this.$store.dispatch('training/setPrdType', this.$route.query.prdType || '07'); + await this.setWindowSize(); + await this.initLoadData(); + this.disPlay = true; + if (this.$route.path.includes('design/bigScreen') || this.$route.query.noPreLogout || this.$route.query.projectDevice) { + this.disPlay = false; + } + }, + methods: { + initLoadData() { // 加载地图数据 + if (this.$route.query.group) { + loadMapDataById(this.$route.query.mapId, 'simulation'); + } else { + this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL }); + loadMapDataById(this.$route.params.mapId, 'preview'); + } + }, + async statusMessage(list) { + await this.$store.dispatch('training/updateMapState', list); + await this.$store.dispatch('socket/setEquipmentStatus'); + }, + setWindowSize() { + this.$nextTick(() => { + if (this.widthLeft) { + const width = this.$store.state.app.width - (this.widthLeft) - 2; + const height = this.height; + this.$store.dispatch('config/resize', { width, height }); + } else { + const width = this.$store.state.app.width - 2; + const height = this.$store.state.app.height; + this.$store.dispatch('config/resize', { width, height }); + } + this.handleUpdateScreen(); + }); + }, + handleUpdateScreen() { + this.maskOpen = false; + let picture; + if (this.$store.state.map.map && this.$store.state.map.map.pictureList) { + picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); + } + if (picture) { + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + const deviceList = []; + const mapDevice = this.$store.state.map.mapDevice; + for (const deviceCode in mapDevice) { + deviceList.push(deviceCode); + } + this.$jlmap.updatePicture(deviceList); + this.$jlmap.updateTransform(picture.scaling, picture.origin); + } else if (this.bigScreenConfig.bigScreenSplitConfig && this.bigScreenConfig.bigScreenSplitConfig.length) { + const offsetList = this.bigScreenConfig.offsetList; + const width = this.bigScreenConfig.width; + const height = this.bigScreenConfig.height; + if (this.widthLeft) { + const size = { + width: (this.$store.state.app.width - (this.widthLeft || 450) - 2) * width, + height: this.height * height, + list: this.bigScreenConfig.bigScreenSplitConfig.map(ele => ele.position), + offsetList: offsetList + }; + this.$jlmap.setUpdateScreen(size); + } else { + const size = { + width: (this.$store.state.app.width - 2) * width, + height: this.$store.state.app.height * height, + list: this.bigScreenConfig.bigScreenSplitConfig.map(ele => ele.position), + offsetList: offsetList + }; + this.$jlmap.setUpdateScreen(size); + } + this.$refs.jlmapVisual.handleStateLoaded(); + } else { + this.maskOpen = true; + // this.$messageBox('该线路没有大屏切割位置信息, 请前往地图绘制编辑'); + } + }, + async back() { + if (this.$route.query.group) { + await clearSimulation(this.$route.query.group); + this.clearSubscribe(); + } + this.$store.dispatch('training/over').then(() => { + history.go(-1); + }); + }, + backOut() { + if (this.$route.query.projectDevice) { + this.$store.dispatch('LogOut').then(() => { + location.reload(); + }); + } + }, + async subscribe() { + this.clearSubscribe(); + const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; + creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); + if (this.prdType === '10') { + creatSubscribe(`/topic/yjddzh/trainPosition/simulation/${this.$route.query.group}`, header); + } + // await this.$store.dispatch('training/setHasSubscribed'); + }, + clearSubscribe() { + clearSubscribe(`${displayTopic}\/${this.$route.query.group}`); + if (this.prdType === '10') { + clearSubscribe(`/topic/yjddzh/trainPosition/simulation/${this.$route.query.group}`); + } + } + } +}; + + diff --git a/src/views/designPlatform/bigSplitScreen.vue b/src/views/designPlatform/bigSplitScreen.vue index a4d753200..8d8e1f29c 100644 --- a/src/views/designPlatform/bigSplitScreen.vue +++ b/src/views/designPlatform/bigSplitScreen.vue @@ -1,221 +1,221 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +--> - - - - - - - - - - - - - - - - - - - - - - - - - - + }, + data() { + return { + maskOpen: false, + disPlay: false, + value: 1, + optionsList: [] + }; + }, + computed: { + mapId() { + return this.$route.params.mapId; + }, + ...mapGetters('map', [ + 'bigScreenConfig' + ]), + ...mapGetters('config', [ + 'canvasId' + ]) + }, + watch: { + $route() { + this.$nextTick(() => { + this.initLoadData(); + }); + }, + '$store.state.app.windowSizeCount': function() { + this.setWindowSize(); + }, + '$store.state.map.mapViewLoadedCount':function() { + this.$store.dispatch('map/setTrainWindowShow', false); + this.$jlmap.off('zoom'); + this.$jlmap.off('pan'); + this.handleUpdateScreen(); + if (this.$route.query.group) { + this.subscribe(); + } + }, + '$store.state.socket.equipmentStatus': function (val) { + if (val.length && this.$route.query.group) { + this.statusMessage(val); + } + }, + '$store.state.socket.simulationOver':function(val) { + this.backOut(); + } + }, + async beforeDestroy() { + await this.$store.dispatch('map/mapClear'); + this.$store.dispatch('training/setPrdType', ''); + }, + async mounted() { + this.$store.dispatch('training/setPrdType', '03'); + await this.setWindowSize(); + await this.initLoadData(); + this.disPlay = true; + if (this.$route.path.includes('design/bigScreen')) { + this.disPlay = false; + } + if (this.$route.query.projectDevice) { + this.disPlay = false; + const data = JSON.parse(JSON.parse(getSessionStorage('projectDevice')).config); + this.changeSplit(data.quadrant); + } + }, + methods: { + async initLoadData() { // 加载地图数据 + if (this.$route.query.group) { + await loadMapDataById(this.$route.query.mapId, 'simulation'); + } else { + this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL }); + loadMapDataById(this.$route.params.mapId, 'preview'); + } + }, + async statusMessage(list) { + await this.$store.dispatch('training/updateMapState', list); + await this.$store.dispatch('socket/setEquipmentStatus'); + }, + setWindowSize() { + this.$nextTick(() => { + const width = this.$store.state.app.width; + const height = this.$store.state.app.height; + this.$store.dispatch('config/resize', { width, height }); + this.handleUpdateScreen(); + }); + }, + changeSplit(data) { + const width = this.bigScreenConfig.width; + const height = this.bigScreenConfig.height; + const num = width * height; + const size = { + width: this.$store.state.app.width * width, + height: this.$store.state.app.height * height + }; + const obj = { + width: width, + height: height + }; + this.$refs.jlmapVisual.setOffset(size, data, num, obj); + }, + handleUpdateScreen() { + this.maskOpen = false; + if (this.bigScreenConfig.bigScreenSplitConfig && this.bigScreenConfig.bigScreenSplitConfig.length) { + const offsetList = this.bigScreenConfig.offsetList; + const width = this.bigScreenConfig.width; + const height = this.bigScreenConfig.height; + const num = width * height; + this.optionsList = []; + for (let index = 0; index < num; index++) { + const param = { value: index + 1, label: `第${index + 1}屏` }; + this.optionsList.push(param); + } + const size = { + width: this.$store.state.app.width * width, + height: this.$store.state.app.height * height, + list: this.bigScreenConfig.bigScreenSplitConfig.map(ele => ele.position), + offsetList: offsetList + }; + this.$jlmap.setUpdateScreen(size); + this.$refs.jlmapVisual.handleStateLoaded(); + if (this.$route.query.projectDevice) { + this.disPlay = false; + const data = JSON.parse(JSON.parse(getSessionStorage('projectDevice')).config); + this.changeSplit(data.quadrant); + } + } else { + this.maskOpen = true; + } + }, + async back() { + if (this.$route.query.group) { + await clearSimulation(this.$route.query.group); + this.clearSubscribe(); + } + this.$store.dispatch('training/over').then(() => { + history.go(-1); + }); + }, + backOut() { + if (this.$route.query.projectDevice) { + this.$store.dispatch('LogOut').then(() => { + location.reload(); + }); + } + }, + async subscribe() { + this.clearSubscribe(); + const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; + creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); + // await this.$store.dispatch('training/setHasSubscribed'); + }, + clearSubscribe() { + clearSubscribe(`${displayTopic}\/${this.$route.query.group}`); + } + } +}; + + diff --git a/src/views/designPlatform/home.vue b/src/views/designPlatform/home.vue index 7496e8e4c..cc849145d 100644 --- a/src/views/designPlatform/home.vue +++ b/src/views/designPlatform/home.vue @@ -1,83 +1,83 @@ - - - - - - - - - - - - - - - - - + - - - - +--> - - +export default { + name: 'Home', + data() { + return { + listImg: [ + { src: home1 }, + { src: home2 }, + { src: home3 } + ] + }; + } +}; + +--> + .brief-box { + font-size: 18px; + text-indent: 2em; + line-height: 32px; + padding: 40px 20px 0; + font-family: unset; + } + } + diff --git a/src/views/designPlatform/index.vue b/src/views/designPlatform/index.vue index 154af9971..2e8ff9a8b 100644 --- a/src/views/designPlatform/index.vue +++ b/src/views/designPlatform/index.vue @@ -1,82 +1,82 @@ - - - - - - - - - - - + - - - - - +--> - - - - - - - + } +}; + +--> + .designPubMapList { + position:absolute; + left:0; + top:0; + height: 100%; + } + diff --git a/src/views/designPlatform/mapPreviewNew.vue b/src/views/designPlatform/mapPreviewNew.vue index 308a85559..a565cf9df 100644 --- a/src/views/designPlatform/mapPreviewNew.vue +++ b/src/views/designPlatform/mapPreviewNew.vue @@ -1,177 +1,177 @@ - - - - - - - - - - - - - - + +--> - - - - - - - - - - - - - + this.$nextTick(() => { + EventBus.$emit('viewLoading', false); + }); + }, + setWindowSize() { + this.$nextTick(() => { + const width = this.$store.state.app.width - (this.widthLeft || 450) - 2; + const height = this.height; + this.$store.dispatch('config/resize', { width, height }); + }); + } + } +}; + + + From 01471bba125f31875a0447aaf7ca379bf16050dc Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 24 May 2023 11:25:54 +0800 Subject: [PATCH 30/42] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E5=88=9D=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/errrorMessageBox.vue | 278 ++++++++++-------- 1 file changed, 160 insertions(+), 118 deletions(-) diff --git a/src/views/newMap/display/errrorMessageBox.vue b/src/views/newMap/display/errrorMessageBox.vue index 54ec0f869..33d46b62b 100644 --- a/src/views/newMap/display/errrorMessageBox.vue +++ b/src/views/newMap/display/errrorMessageBox.vue @@ -4,52 +4,111 @@
-
- -
- -
- 故障信息 - 详情 + +
+ +
+ 故障信息 + 详情 +
+
+ 时间：{{ showAlarmImportantMessage.time }} +
+
+ 级别：{{ showAlarmImportantMessage.levelNew }} +
+
+ 设备：{{ showAlarmImportantMessage.deviceCodeNew }} +
+
+ 类型：{{ showAlarmImportantMessage.typeNew }} +
+
+ 信息：{{ showAlarmImportantMessage.descriptionNew }} +
+
+ 原因：{{ showAlarmImportantMessage.reason }} +
+ + +
+ 辅助决策信息 +
+
+ （1）信息报送人员/群组：{{ showAlarmImportantMessage.showDecisionMessage.personGroup }} +
+
+ （2）电话通报：{{ showAlarmImportantMessage.showDecisionMessage.telephoneNotified }} +
+
+ （3）PIS信息模版：{{ showAlarmImportantMessage.pisTemplate }} +
+ +
+
+ + +
+ + + + + + + + + + +
-
- 时间：{{ item.time }} -
-
- 级别：{{ item.levelNew }} -
-
- 设备：{{ item.deviceCodeNew }} -
-
- 类型：{{ item.typeNew }} -
-
- 信息：{{ item.descriptionNew }} -
- - -
- 辅助决策信息 -
-
- （1）信息报送人员/群组：{{ item.showDecisionMessage.personGroup }} -
-
- （2）电话通报：{{ item.showDecisionMessage.telephoneNotified }} -
-
- -
+ +
+
@@ -61,22 +120,8 @@ export default { name: 'ErrrorMessageBox', data() { return { - dialogVisible: false, - dealAlarmMessage:[true, false], + activeName: '0', showAlarmMessageList:false, - tableData: [{ - date: '2023-04-17', - name: '车厢编号10', - id: '001', - message:'电路信号故障,车辆二次设备无法运行', - tag: '一般故障' - }, { - date: '2023-04-21', - name: '车厢编号8', - id: '005', - message:'新的故障信息', - tag: '重大故障' - }], decisionMessage:[{ personGroup:'主要领导、应急管理部负责人、应急管理室负责人报送，并发党群信息群；故障群/应急群发布。', telephoneNotified:'如故障属于I类信息，分公司值班领导、主要领导、党群工作部、线网管控中心负责人、分管领导、应急管理部负责人、应急管理室负责人。' @@ -93,7 +138,11 @@ export default { ]), showDecisionMessage:{}, alarmDetailMessageList:[], - itemsstyle: ['item0', 'item1', 'item2', 'item3', 'item4', 'item5', 'item6', 'item7', 'item8', 'item9'] + alarmDetailMessageGroup:[], + showAlarmImportantMessage:{}, + dealAlarmMessage:[true, false], + alarmReasonMap:[], + oldShowAlarmMessage:{} }; }, computed: { @@ -102,9 +151,6 @@ export default { ]), alarmDetailMessage() { return this.$store.state.socket.simulationAlarmInfo; - }, - finishDealAlarmMessage() { - return this.dealAlarmMessage.reduce((prev, curr)=> curr === false ? prev + 1 : prev, 0); } }, watch: { @@ -112,16 +158,9 @@ export default { if (newValue.length > 0) { const clone = JSON.parse(JSON.stringify(this.alarmDetailMessage)); this.alarmDetailMessageList.push(...clone); - let index; this.alarmDetailMessageList.forEach((item, i)=>{ this.$set(item, 'show', true); - if (new Date(newValue[0].time).getTime() - new Date(item.time).getTime() > 90000) { - index = i; - } }); - if (index !== undefined) { - this.alarmDetailMessageList.splice(0, index + 1); - } if (newValue[0].handleMethod === 'NCC' && this.$store.getters['map/getDeviceByCode'](this.alarmDetailMessageList[0].deviceCode) !== undefined) { this.showAlarmPlayAlarmMusic(); } @@ -133,18 +172,18 @@ export default { }, methods: { - playAlarmMusic() { - let alarmMusic = new Audio(); - alarmMusic = require('@/assets/buzzer.mp3'); - this.$refs.audio.src = alarmMusic; - this.$refs.audio.play(); - }, showAlarmPlayAlarmMusic() { if (this.$refs.audio.paused) { this.playAlarmMusic(); } this.showAlarm(); }, + playAlarmMusic() { + let alarmMusic = new Audio(); + alarmMusic = require('@/assets/buzzer.mp3'); + this.$refs.audio.src = alarmMusic; + this.$refs.audio.play(); + }, showAlarm() { this.alarmDetailMessageList.forEach((showAlarmMessage)=>{ showAlarmMessage.show = true; @@ -162,10 +201,48 @@ export default { showAlarmMessage.showDecisionMessage = this.decisionMessage[1]; } }); + const newAlarmMessage = this.alarmDetailMessageList.at(-1); + if (this.oldShowAlarmMessage.level == undefined) { + this.oldShowAlarmMessage = newAlarmMessage; + this.showAlarmImportantMessage = newAlarmMessage; + } else if (newAlarmMessage.color == 'O') { + this.oldShowAlarmMessage = newAlarmMessage; + this.showAlarmImportantMessage = newAlarmMessage; + } else { + this.showAlarmImportantMessage = this.oldShowAlarmMessage; + } + if (this.alarmDetailMessageGroup.length == 0) { + this.alarmDetailMessageGroup.push([newAlarmMessage]); + this.alarmReasonMap.push(newAlarmMessage.reason); + } else if (this.alarmReasonMap.includes(newAlarmMessage.reason)) { + const index = this.alarmReasonMap.indexOf(newAlarmMessage.reason); + this.alarmDetailMessageGroup[index].push(newAlarmMessage); + } else { + this.alarmReasonMap.push(newAlarmMessage.reason); + this.alarmDetailMessageGroup.push([newAlarmMessage]); + } this.showAlarmMessageList = true; }, goToAlarmDetail() { } + /* handleAlarmMessage(index, row) { + this.$confirm('此操作将处理故障信息, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.dealAlarmMessage.splice(index, 1, !this.dealAlarmMessage[index]); + this.$message({ + type: 'success', + message: '处理成功!' + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消处理' + }); + }); + } */ } }; @@ -203,6 +280,12 @@ export default { } } } +.alarm-message-All{ + margin-top:10px; + .box-card{ + padding: 0 10px; + } +} .yellow{ /deep/ .el-dialog__body{ padding: 0 10px 10px; @@ -230,45 +313,4 @@ export default { background-color: red; } } -.item0 { - top: 0px; - z-index: 1501 !important; -} -.item1 { - top:50px; - z-index: 1502 !important; -} -.item2 { - top:100px; - z-index: 1503 !important; -} -.item3 { - top: 150px; - z-index: 1504 !important; -} -.item4 { - top:200px; - z-index: 1505 !important; -} -.item5 { - top:250px; - z-index: 1506 !important; -} -.item6 { - top:300px; - z-index: 1507 !important; -} -.item7 { - top:350px; - z-index: 1508 !important; -} -.item8 { - top:400px; - z-index: 1509 !important; -} -.item9 { - top:450px; - z-index: 1510 !important; -} - From 4e2a36bcb8bbec802c781725c8951504d168051b Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 24 May 2023 13:52:07 +0800 Subject: [PATCH 31/42] =?UTF-8?q?=E5=8E=BB=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/errrorMessageBox.vue | 120 ++++++------------ 1 file changed, 36 insertions(+), 84 deletions(-) diff --git a/src/views/newMap/display/errrorMessageBox.vue b/src/views/newMap/display/errrorMessageBox.vue index 33d46b62b..f4f2c01aa 100644 --- a/src/views/newMap/display/errrorMessageBox.vue +++ b/src/views/newMap/display/errrorMessageBox.vue @@ -56,58 +56,40 @@
- -
- - - - - - - - - - - -
- -
+ + + + + + + +
@@ -138,9 +120,7 @@ export default { ]), showDecisionMessage:{}, alarmDetailMessageList:[], - alarmDetailMessageGroup:[], showAlarmImportantMessage:{}, - dealAlarmMessage:[true, false], alarmReasonMap:[], oldShowAlarmMessage:{} }; @@ -157,7 +137,7 @@ export default { alarmDetailMessage(newValue, oldValue) { if (newValue.length > 0) { const clone = JSON.parse(JSON.stringify(this.alarmDetailMessage)); - this.alarmDetailMessageList.push(...clone); + this.alarmDetailMessageList.unshift(...clone); this.alarmDetailMessageList.forEach((item, i)=>{ this.$set(item, 'show', true); }); @@ -211,38 +191,10 @@ export default { } else { this.showAlarmImportantMessage = this.oldShowAlarmMessage; } - if (this.alarmDetailMessageGroup.length == 0) { - this.alarmDetailMessageGroup.push([newAlarmMessage]); - this.alarmReasonMap.push(newAlarmMessage.reason); - } else if (this.alarmReasonMap.includes(newAlarmMessage.reason)) { - const index = this.alarmReasonMap.indexOf(newAlarmMessage.reason); - this.alarmDetailMessageGroup[index].push(newAlarmMessage); - } else { - this.alarmReasonMap.push(newAlarmMessage.reason); - this.alarmDetailMessageGroup.push([newAlarmMessage]); - } this.showAlarmMessageList = true; }, goToAlarmDetail() { } - /* handleAlarmMessage(index, row) { - this.$confirm('此操作将处理故障信息, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.dealAlarmMessage.splice(index, 1, !this.dealAlarmMessage[index]); - this.$message({ - type: 'success', - message: '处理成功!' - }); - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消处理' - }); - }); - } */ } }; @@ -283,7 +235,7 @@ export default { .alarm-message-All{ margin-top:10px; .box-card{ - padding: 0 10px; + padding:10px; } } .yellow{ From aa1e6ca4c786d29086ac8ccaf56fc936abaf23eb Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 24 May 2023 13:56:43 +0800 Subject: [PATCH 32/42] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/errrorMessageBox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/display/errrorMessageBox.vue b/src/views/newMap/display/errrorMessageBox.vue index f4f2c01aa..b3f1f240f 100644 --- a/src/views/newMap/display/errrorMessageBox.vue +++ b/src/views/newMap/display/errrorMessageBox.vue @@ -181,7 +181,7 @@ export default { showAlarmMessage.showDecisionMessage = this.decisionMessage[1]; } }); - const newAlarmMessage = this.alarmDetailMessageList.at(-1); + const newAlarmMessage = this.alarmDetailMessageList[0]; if (this.oldShowAlarmMessage.level == undefined) { this.oldShowAlarmMessage = newAlarmMessage; this.showAlarmImportantMessage = newAlarmMessage; From 1c315175882931df4bdad030ee581d313f41884d Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 24 May 2023 14:00:51 +0800 Subject: [PATCH 33/42] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/errrorMessageBox.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/newMap/display/errrorMessageBox.vue b/src/views/newMap/display/errrorMessageBox.vue index b3f1f240f..9d03c26d9 100644 --- a/src/views/newMap/display/errrorMessageBox.vue +++ b/src/views/newMap/display/errrorMessageBox.vue @@ -88,6 +88,11 @@ prop="descriptionNew" label="信息" /> +
From e29700534a638033bc14d9b70c135c851ee7ee76 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 24 May 2023 14:25:22 +0800 Subject: [PATCH 34/42] =?UTF-8?q?=E6=B4=BE=E7=8F=AD=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=99=E8=8E=B7=E5=8F=96=E5=88=97=E8=BD=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jmap/map.js | 7 +++++++ .../newMap/display/terminals/schedulWork.vue | 15 +++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js index 3f2f65321..016852502 100644 --- a/src/api/jmap/map.js +++ b/src/api/jmap/map.js @@ -322,3 +322,10 @@ export function generateTrainingData(data) { data: data }); } +/** 根据mapId获取列车信息 */ +export function getTrainListByMapId(mapId) { + return request({ + url: `/api/map/${mapId}/trains`, + method: 'get' + }); +} diff --git a/src/views/newMap/display/terminals/schedulWork.vue b/src/views/newMap/display/terminals/schedulWork.vue index 760c4a875..98c60f853 100644 --- a/src/views/newMap/display/terminals/schedulWork.vue +++ b/src/views/newMap/display/terminals/schedulWork.vue @@ -33,7 +33,7 @@
- +
@@ -41,6 +41,7 @@