From 9c341fed700b23e137e5180b1328ba8499bbba49 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 28 Jan 2021 10:29:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=80=80=E5=87=BA=E4=BB=BF=E7=9C=9F?= =?UTF-8?q?=E6=97=B6=E6=B8=85=E9=99=A4requestList=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=A0=88=E5=A0=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/menuoperation.js | 3 +++ src/views/newMap/displayNew/practiceDisplay.vue | 1 - src/views/newMap/jlmapNew/index.vue | 1 + src/views/newMap/jointTrainingNew/index.vue | 5 +++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/store/modules/menuoperation.js b/src/store/modules/menuoperation.js index 9c85a5e95..07b202143 100644 --- a/src/store/modules/menuoperation.js +++ b/src/store/modules/menuoperation.js @@ -232,6 +232,9 @@ const menuOperation = { spliceRequestList: ({ commit }, request) => { commit('spliceRequestList', request); }, + resetRequestList: ({ commit }) => { + commit('resetRequestList'); + }, /** 西安二号线排列进路保存信号机进路数据 */ setRouteSelectStartSignal: ({ commit }, param) => { commit('setRouteSelectStartSignal', param); diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue index 9477b0995..a52756ed2 100644 --- a/src/views/newMap/displayNew/practiceDisplay.vue +++ b/src/views/newMap/displayNew/practiceDisplay.vue @@ -198,7 +198,6 @@ export default { const trainNumList = this.$store.state.socket.trainPfiNum; trainNumList.forEach(stationNum=>{ stationNum.deviceType = 'TRAIN'; - console.log(stationNum.num, 'inital'); }); this.$store.dispatch('training/updateMapState', trainNumList); } diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index a85a8ea22..9cf11ae57 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -220,6 +220,7 @@ export default { EventBus.$off('viewLoading'); EventBus.$off('viewProgressAt'); this.$store.dispatch('socket/clearSimulationRoleList'); + this.$store.dispatch('menuOperation/resetRequestList'); this.$store.dispatch('map/mapClear'); if (this.$jlmap) { this.$jlmap.dispose(); diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 8d13e8196..fe59b5b85 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -232,6 +232,7 @@ export default { await this.$store.dispatch('training/end', null); await this.$store.dispatch('training/reset'); await this.$store.dispatch('map/mapClear'); + await this.$store.dispatch('menuOperation/resetRequestList'); Message.closeAll(); }, methods: { @@ -484,7 +485,7 @@ export default { if (this.$store.state.training.prdType == '04') { this.panelShow = false; this.drivingShow = true; - this.$refs.Jl3dDrive.show(this.mapId, this.group, 34,"isTraining"); + this.$refs.Jl3dDrive.show(this.mapId, this.group, 34, 'isTraining'); } else { const routeData = this.$router.resolve({ path:'/jlmap3d/sandbox', @@ -527,7 +528,7 @@ export default { this.setShowStation(this.showStation); }, setShowStation(stationCode) { - const showStation = this.centralizedStationMap[stationCode]; + const showStation = this.centralizedStationMap[stationCode]; const nameList = Object.keys(this.$store.state.map.map); let list = []; nameList.forEach(item => { From c9a8d09e6704cd90105a6f07ab8097de94d50439 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 28 Jan 2021 13:38:10 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BB=98=E5=9B=BE=20?= =?UTF-8?q?=E6=8A=98=E8=BF=94=E7=82=B9=E8=AE=A1=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/fuzhou_01/planConvert.js | 21 ++++++++++----------- src/jmapNew/theme/xian_01/planConvert.js | 17 +++++++++-------- src/store/modules/map.js | 12 ++++++------ src/views/planMonitor/editTool/index.vue | 20 +++++++++++++------- src/views/planMonitor/newEditTool/index.vue | 9 ++++----- 5 files changed, 42 insertions(+), 37 deletions(-) diff --git a/src/jmapNew/theme/fuzhou_01/planConvert.js b/src/jmapNew/theme/fuzhou_01/planConvert.js index 54a820896..8121b8f53 100644 --- a/src/jmapNew/theme/fuzhou_01/planConvert.js +++ b/src/jmapNew/theme/fuzhou_01/planConvert.js @@ -2,7 +2,7 @@ import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, pre import store from '@/store/index'; export default { /** 边缘高度*/ - EdgeHeight: 180, + EdgeHeight: 1800, /** 间隔高度*/ CoordMultiple: 2000, @@ -300,7 +300,7 @@ export default { if (!store.state.map.mapConfig.upRight) { pointdata.directionCode = train.right ? '1' : '2'; } - pointdata.coord = [train.stationTimeList[0].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[0], train.directionCode, false)]; + pointdata.coord = [train.stationTimeList[0].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[0], pointdata.directionCode, false)]; /** 给服务对象添加服务名称和标记点*/ opt.name = '' + service.serviceNumber; @@ -311,7 +311,7 @@ export default { idx = index; // ${train.directionCode} const aa = `${train.tripNumber}`; - opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]); + opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, pointdata.directionCode, false), elem.stationCode, aa]); }); /** 计算折返点车次坐标点集合*/ @@ -320,8 +320,8 @@ export default { nextPoint = service.tripNumberDataList[j + 1].stationTimeList[0]; // ${train.directionCode} const aa = `${train.tripNumber}`; - opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']); - opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']); + opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, pointdata.directionCode, true), lastPoint.stationCode, aa, '折返轨']); + opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, pointdata.directionCode, true), lastPoint.stationCode, aa, '折返轨']); } /** 如果是备用车，按车次添加线*/ @@ -385,15 +385,14 @@ export default { runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => { return parseInt(a.secondTime) - parseInt(b.secondTime); }); - + let directionCode = elem.right ? '2' : '1'; + if (!store.state.map.mapConfig.upRight) { + directionCode = elem.right ? '1' : '2'; + } /** 如果此记录车组号的数据为第一条时，则打上标签*/ if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) { const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`); if (!result) { - let directionCode = elem.right ? '2' : '1'; - if (!store.state.map.mapConfig.upRight) { - directionCode = elem.right ? '1' : '2'; - } serie.markPoint.data.push(createMartPoint({ directionCode: directionCode, coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem)], @@ -404,7 +403,7 @@ export default { } /** 计算折返点*/ - var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem), elem.directionCode]; + var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem), directionCode]; if (serie.data.length > 0) { var lastPoint = serie.data[serie.data.length - 1]; if (lastPoint[2] !== nextPoint[2]) { diff --git a/src/jmapNew/theme/xian_01/planConvert.js b/src/jmapNew/theme/xian_01/planConvert.js index 22be91024..28f9647a6 100644 --- a/src/jmapNew/theme/xian_01/planConvert.js +++ b/src/jmapNew/theme/xian_01/planConvert.js @@ -144,7 +144,7 @@ export default { index > 0 && index < train.stationTimeList.length - 1) { // ${train.directionCode} const aa = `${train.tripNumber}`; - opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]); + opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, pointdata.directionCode, false), elem.stationCode, aa]); } }); @@ -155,8 +155,8 @@ export default { num = this.computedReentryNumber(train.tripNumber); // ${train.directionCode} const aa = `${train.tripNumber}`; - opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]); - opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]); + opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, pointdata.directionCode, true, num), lastPoint.stationCode, aa]); + opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, pointdata.directionCode, true, num), nextPoint.stationCode, aa]); } /** 如果是备用车，按车次添加线*/ @@ -221,14 +221,15 @@ export default { return parseInt(a.secondTime) - parseInt(b.secondTime); }); + let directionCode = elem.right ? '2' : '1'; + if (!store.state.map.mapConfig.upRight) { + directionCode = elem.right ? '1' : '2'; + } /** 如果此记录车组号的数据为第一条时，则打上标签*/ if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) { const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`); if (!result) { - let directionCode = elem.right ? '2' : '1'; - if (!store.state.map.mapConfig.upRight) { - directionCode = elem.right ? '1' : '2'; - } + serie.markPoint.data.push(createMartPoint({ directionCode: directionCode, coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)], @@ -240,7 +241,7 @@ export default { /** 计算折返点*/ var num = this.computedReentryNumber(elem.tripNumber); - var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false, num), elem.directionCode]; + var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, false, num), directionCode]; if (serie.data.length > 0) { var lastPoint = serie.data[serie.data.length - 1]; if (lastPoint[2] !== nextPoint[2]) { diff --git a/src/store/modules/map.js b/src/store/modules/map.js index 109a70250..7a6fce4b3 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -221,8 +221,8 @@ const map = { mapViewLoadedCount: 0, // 地图视图加载完成标识 mapDataLoadedCount: 0, // 地图数据加载完成标识 mapStateLoadedCount: 0, // 地图状态变化完成标识 - mapDataLoadedScreenCount: 0, // 大屏加载完成 - mapStationStateUpdateCount: 0, // 车站状态刷新 + mapDataLoadedScreenCount: 0, // 大屏加载完成 + mapStationStateUpdateCount: 0, // 车站状态刷新 trainDetails: null, // 地图'列车详情'显示 deleteCount: 0, // 绘图快捷删除标识 updateCount: 0, // 绘图快捷修改标识 @@ -717,10 +717,10 @@ const map = { }, mapViewLoadedScreenCountIncrement: (state) => { state.mapDataLoadedScreenCount += 1; - }, - mapStationStateUpdate: (state) => { - state.mapStationStateUpdateCount += 1; - }, + }, + mapStationStateUpdate: (state) => { + state.mapStationStateUpdateCount += 1; + }, operateTrainModel: (state, { model, type }) => { if (state.map && model) { const list = state.map.trainModelList || []; diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue index 7b0e684f9..9ef1bf2d0 100644 --- a/src/views/planMonitor/editTool/index.vue +++ b/src/views/planMonitor/editTool/index.vue @@ -13,6 +13,7 @@ /> { checkLoginLine(); }, 5000 * 60); - this.loadRunPlanId = this.$route.query.planId; this.loadRunPlanName = this.$route.query.planName; if (this.$route.query.mapId) { this.refreshRunPlanList(true); @@ -149,10 +156,9 @@ export default { }); }, async loadMap() { - const res = await getPublishMapDetailById(this.$route.query.mapId); - if (res && res.code == 200) { - this.$store.dispatch('map/setMapData', res.data.graphDataNew); - } + this.runplanLoading = true; + // 加载地图数据 + loadMapDataById(this.$route.query.mapId, 'parse'); }, handleConfirm(params) { if (params.operate == 'AddPlanningTrain') { diff --git a/src/views/planMonitor/newEditTool/index.vue b/src/views/planMonitor/newEditTool/index.vue index cc3ac777f..d89113a81 100644 --- a/src/views/planMonitor/newEditTool/index.vue +++ b/src/views/planMonitor/newEditTool/index.vue @@ -84,7 +84,7 @@ import ModifyingStationIntervalTime from '../editTool/menus/modifyingStationInte import { deletePlanService } from '@/api/runplan'; import { checkLoginLine } from '@/api/login'; import { getRpListByMapId } from '@/api/runplan'; -import { getPublishMapDetailById } from '@/api/jmap/map'; +import { loadMapDataById } from '@/utils/loaddata'; export default { name: 'Menus', @@ -194,10 +194,9 @@ export default { this.$store.dispatch('runPlan/refresh'); }, async loadMap() { - const res = await getPublishMapDetailById(this.$route.query.mapId); - if (res && res.code == 200) { - this.$store.dispatch('map/setMapData', res.data.graphDataNew); - } + this.runplanLoading = true; + // 加载地图数据 + loadMapDataById(this.$route.query.mapId, 'parse'); }, refreshRunPlanList(planId) { getRpListByMapId(this.$route.query.mapId).then(resp => { From 3850bc6e345d63e919c5edf1dfb4fdef9d68397d Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 28 Jan 2021 14:28:43 +0800 Subject: [PATCH 3/8] =?UTF-8?q?BUG=20105:=20=E6=B5=99=E5=A4=A7=E7=BD=91?= =?UTF-8?q?=E6=96=B0=E7=BA=BF=E8=B7=AF=E5=9C=A8=E8=AE=BE=E8=AE=A1=E5=89=A7?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E9=87=8D=E5=8F=A0=E5=90=8E=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=B8=8B=E9=9D=A2=E7=9A=84=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/scriptManage/addScriptMember.vue | 1 + src/views/scriptManage/tipScriptRecord.vue | 174 ++++++++++++--------- 2 files changed, 98 insertions(+), 77 deletions(-) diff --git a/src/views/scriptManage/addScriptMember.vue b/src/views/scriptManage/addScriptMember.vue index 9bb9e2b74..a379025bc 100644 --- a/src/views/scriptManage/addScriptMember.vue +++ b/src/views/scriptManage/addScriptMember.vue @@ -3,6 +3,7 @@ v-dialogDrag :title="title" :visible.sync="dialogVisible" + append-to-body width="500px" :before-close="handleClose" center diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue index ee3818739..8b9efe21a 100644 --- a/src/views/scriptManage/tipScriptRecord.vue +++ b/src/views/scriptManage/tipScriptRecord.vue @@ -1,69 +1,82 @@