From 5aefda5ef0ea10130e8e4389397f5f435fe4bcf0 Mon Sep 17 00:00:00 2001 From: lVAL Date: Fri, 6 Nov 2020 09:26:41 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=EF=BC=8Ctable=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0padding:50px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/QueryListPage/QueryListPage.vue | 8 ++++++-- src/views/ibp/home.vue | 2 +- src/views/lesson/home.vue | 2 +- src/views/newMap/mapsystemNew/plugin/delayBox.vue | 2 +- src/views/newMap/mapsystemNew/plugin/delayInfo.vue | 2 +- src/views/planMonitor/detail.vue | 2 +- src/views/scriptManage/home.vue | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index c33a4af53..29d22845f 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -15,7 +15,7 @@ @disableQuery="disableQuery" @enableQuery="enableQuery" /> - + {{ $t('scriptRecord.scriptCreate') }} 发布数据创建 - + diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue index 5722f2deb..154d1a4ab 100644 --- a/src/views/lesson/home.vue +++ b/src/views/lesson/home.vue @@ -9,7 +9,7 @@ {{ $t('lesson.newConstruction') }} - + diff --git a/src/views/newMap/mapsystemNew/plugin/delayBox.vue b/src/views/newMap/mapsystemNew/plugin/delayBox.vue index ef36dd91b..c6bbe1fc0 100644 --- a/src/views/newMap/mapsystemNew/plugin/delayBox.vue +++ b/src/views/newMap/mapsystemNew/plugin/delayBox.vue @@ -1,6 +1,6 @@ -
+
- {{ conditionActionId === actionInfo.id? '关闭条件':'触发条件' }} + 触发条件 {{ $t('scriptRecord.modifyConversitionButton') }} 确定 取消 From 58e5635a7273169c00b85cf9895aa05e67387213 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 6 Nov 2020 11:04:38 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AE=9A=E4=B9=89=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E8=BF=90=E8=A1=8C=E5=9B=BE=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/beijing_01/planConvert.js | 14 +++++++++++--- src/jmapNew/theme/chengdu_01/planConvert.js | 14 +++++++++++--- src/jmapNew/theme/chengdu_03/planConvert.js | 14 +++++++++++--- src/jmapNew/theme/haerbin_01/planConvert.js | 1 - src/utils/runPlan.js | 1 - .../newMap/mapsystemNew/plugin/trainingtip.vue | 4 +++- 6 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/planConvert.js b/src/jmapNew/theme/beijing_01/planConvert.js index 08dadbb83..f84152532 100644 --- a/src/jmapNew/theme/beijing_01/planConvert.js +++ b/src/jmapNew/theme/beijing_01/planConvert.js @@ -1,5 +1,5 @@ import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan'; - +import store from '@/store/index_APP_TARGET'; export default { /** 边缘高度*/ EdgeHeight: 600, @@ -113,7 +113,11 @@ export default { // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`; pointdata.name = `${service.serviceNumber}${train.tripNumber}`; pointdata.color = '#000' || lineStyle.color; - pointdata.directionCode = train.directionCode; + pointdata.directionCode = train.right ? '2' : '1'; + if (!store.state.map.mapConfig.upRight) { + pointdata.directionCode = train.right ? '1' : '2'; + } + // pointdata.directionCode = train.directionCode; pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)]; /** 给服务对象添加服务名称和标记点*/ @@ -211,8 +215,12 @@ export default { 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: elem.directionCode, + directionCode: directionCode, coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)], name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`, color: lineStyle.color || '#000' diff --git a/src/jmapNew/theme/chengdu_01/planConvert.js b/src/jmapNew/theme/chengdu_01/planConvert.js index 9f9441ee4..5601b44c9 100644 --- a/src/jmapNew/theme/chengdu_01/planConvert.js +++ b/src/jmapNew/theme/chengdu_01/planConvert.js @@ -1,5 +1,5 @@ import { createMartPointReverse, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan'; - +import store from '@/store/index_APP_TARGET'; export default { /** 边缘高度*/ EdgeHeight: 600, @@ -113,7 +113,11 @@ export default { // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`; pointdata.name = `${service.serviceNumber}${train.tripNumber}`; pointdata.color = '#000' || lineStyle.color; - pointdata.directionCode = train.directionCode; + pointdata.directionCode = train.right ? '2' : '1'; + if (!store.state.map.mapConfig.upRight) { + pointdata.directionCode = train.right ? '1' : '2'; + } + // pointdata.directionCode = train.directionCode; pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)]; /** 给服务对象添加服务名称和标记点*/ @@ -211,8 +215,12 @@ export default { 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(createMartPointReverse({ - directionCode: elem.directionCode, + directionCode: directionCode, coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)], name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`, color: lineStyle.color || '#000' diff --git a/src/jmapNew/theme/chengdu_03/planConvert.js b/src/jmapNew/theme/chengdu_03/planConvert.js index 921c6f4da..8780b2871 100644 --- a/src/jmapNew/theme/chengdu_03/planConvert.js +++ b/src/jmapNew/theme/chengdu_03/planConvert.js @@ -1,5 +1,5 @@ import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan'; - +import store from '@/store/index_APP_TARGET'; export default { /** 边缘高度*/ EdgeHeight: 600, @@ -91,7 +91,11 @@ export default { // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`; pointdata.name = `${service.serviceNumber}${train.tripNumber}`; pointdata.color = '#000' || lineStyle.color; - pointdata.directionCode = train.directionCode; + // pointdata.directionCode = train.directionCode; + pointdata.directionCode = train.right ? '2' : '1'; + if (!store.state.map.mapConfig.upRight) { + pointdata.directionCode = train.right ? '1' : '2'; + } pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)]; /** 给服务对象添加服务名称和标记点*/ @@ -186,8 +190,12 @@ export default { 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: elem.directionCode, + directionCode: directionCode, coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)], name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`, color: lineStyle.color || '#000' diff --git a/src/jmapNew/theme/haerbin_01/planConvert.js b/src/jmapNew/theme/haerbin_01/planConvert.js index 40ea90ee9..3e2521f51 100644 --- a/src/jmapNew/theme/haerbin_01/planConvert.js +++ b/src/jmapNew/theme/haerbin_01/planConvert.js @@ -168,7 +168,6 @@ export default { var isBackup = true; var opt = { name: '', markPointData: [], data: [] }; if (service.tripNumberDataList && service.tripNumberDataList.length) { - debugger; service.tripNumberDataList.forEach((train, j) => { var pointdata = {}; var idx = 0; diff --git a/src/utils/runPlan.js b/src/utils/runPlan.js index 4626244e5..5fea77427 100644 --- a/src/utils/runPlan.js +++ b/src/utils/runPlan.js @@ -22,7 +22,6 @@ export function createMartPoint(opt) { /** 创建一个车次数据点*/ export function createMartPointReverse(opt) { - debugger; const rotate = opt.directionCode == '1' ? 45 : (opt.directionCode == '2' ? -45 : 0); const position = opt.type ? 'insideBottomLeft' : 'insideTopLeft'; return { diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue index 1d967ca0e..9a7359db2 100644 --- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue +++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue @@ -116,9 +116,11 @@ export default { }); } } + let subDeviceType = ''; + if (newStep.subType) { subDeviceType = newStep.subType; } else { subDeviceType = newStep.type; } position = this.$jlmap.getShapeTipPoint({ code: newStep.code, - subDeviceType: newStep.type + subDeviceType: subDeviceType }); if (position) { From 79d95a8cc09ce587f725900a81e592b557a07e7b Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 6 Nov 2020 11:25:42 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/drts/scene/index.vue | 2 +- src/views/publish/publishMap/exportMap.vue | 2 +- src/views/publish/publishMap/index.vue | 2 +- src/views/scriptManage/home.vue | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/drts/scene/index.vue b/src/views/drts/scene/index.vue index 7d61a66f2..ed1068eae 100644 --- a/src/views/drts/scene/index.vue +++ b/src/views/drts/scene/index.vue @@ -152,7 +152,7 @@ export default { const url = urlObject.createObjectURL(content); const el = document.createElement('a'); el.href = url; - el.download = `${resultData.name}.json`; + el.download = `场景-${resultData.name}.json`; el.click(); urlObject.revokeObjectURL(url); }); diff --git a/src/views/publish/publishMap/exportMap.vue b/src/views/publish/publishMap/exportMap.vue index 53782776a..df95d6207 100644 --- a/src/views/publish/publishMap/exportMap.vue +++ b/src/views/publish/publishMap/exportMap.vue @@ -65,7 +65,7 @@ export default { const url = urlObject.createObjectURL(content); const el = document.createElement('a'); el.href = url; - el.download = `${this.row.name}.json`; + el.download = `综合-${this.row.name}.json`; el.click(); urlObject.revokeObjectURL(url); this.$set(this.row, 'loading' + this.idx, false); diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue index 20b938b30..69d15c0ff 100644 --- a/src/views/publish/publishMap/index.vue +++ b/src/views/publish/publishMap/index.vue @@ -309,7 +309,7 @@ export default { const url = urlObject.createObjectURL(content); const el = document.createElement('a'); el.href = url; - el.download = `${resultData.name}.json`; + el.download = `地图-${resultData.name}.json`; el.click(); urlObject.revokeObjectURL(url); this.$set(row, 'loading' + idx, false); diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue index 8c4f079c2..7fbbc7bc6 100644 --- a/src/views/scriptManage/home.vue +++ b/src/views/scriptManage/home.vue @@ -7,7 +7,7 @@ 导入剧本
- + @@ -293,7 +293,7 @@ export default { const url = urlObject.createObjectURL(content); const el = document.createElement('a'); el.href = url; - el.download = `${resultData.name}.json`; + el.download = `剧本-${resultData.name}.json`; el.click(); urlObject.revokeObjectURL(url); }); From c746a97d3dfe832879fcb520a1c72c087fadc543 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 6 Nov 2020 13:15:18 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/script.js | 7 - src/views/scriptManage/conditionManage.vue | 215 +++++++++++---------- src/views/scriptManage/getAction.vue | 14 +- src/views/scriptManage/tipScriptRecord.vue | 4 +- 4 files changed, 132 insertions(+), 108 deletions(-) diff --git a/src/api/script.js b/src/api/script.js index 6ff230a70..326131774 100644 --- a/src/api/script.js +++ b/src/api/script.js @@ -134,10 +134,3 @@ export function updateActionCondition(group, actionId, data) { data }); } -/** 查询剧本活动条件 */ -export function getActionCondition(group, actionId) { - return request({ - url: `/api/scriptSimulation/${group}/${actionId}/condition`, - method: 'get' - }); -} diff --git a/src/views/scriptManage/conditionManage.vue b/src/views/scriptManage/conditionManage.vue index 552627619..113a18a40 100644 --- a/src/views/scriptManage/conditionManage.vue +++ b/src/views/scriptManage/conditionManage.vue @@ -1,96 +1,99 @@ -