From a6a91bfcff68df71346f0cd5940b3cc6a35a35f3 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 4 Nov 2020 18:27:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=89=A7=E6=9C=AC?=
=?UTF-8?q?=E5=86=85=E5=AE=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/scriptManage/getAction.vue | 57 ++++++-----
src/views/scriptManage/tipScriptRecord.vue | 104 ++++++++++-----------
2 files changed, 87 insertions(+), 74 deletions(-)
diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue
index f1864335a..f5916281a 100644
--- a/src/views/scriptManage/getAction.vue
+++ b/src/views/scriptManage/getAction.vue
@@ -159,29 +159,42 @@ export default {
// const command = CommandHandler.getScriptDefinition(element.operationType);
const commandName = element.operationType;
if (commandName != 'Set_Fault' && commandName != 'Cancel_Fault' ) {
- const list = ['Train_Update_Type',
- 'Train_Add_Train_Trace',
- 'Train_Remove_Train_Trace',
- 'Train_Move_Train_Trace',
- 'Train_Set_Plan',
- 'Train_Set_Head',
- 'Train_Set_Manual',
- 'Train_Set_Crew_Number',
- 'Train_Tag_Atp_Cut',
- 'Train_Tag_Atp_Recover',
- 'Train_Allow_Pass',
- 'Train_Info'];
- let operateType = commandName.split('_')[0];
- if (list.includes(commandName)) {
- operateType = 'TrainWindow';
+ // const list = ['Train_Update_Type',
+ // 'Train_Add_Train_Trace',
+ // 'Train_Remove_Train_Trace',
+ // 'Train_Move_Train_Trace',
+ // 'Train_Set_Plan',
+ // 'Train_Set_Head',
+ // 'Train_Set_Manual',
+ // 'Train_Set_Crew_Number',
+ // 'Train_Tag_Atp_Cut',
+ // 'Train_Tag_Atp_Recover',
+ // 'Train_Allow_Pass',
+ // 'Train_Info'];
+ // let operateType = commandName.split('_')[0];
+ // if (list.includes(commandName)) {
+ // operateType = 'TrainWindow';
+ // }
+ // if (operateType == 'CM') {
+ // operateType = 'ControlConvertMenu';
+ // }
+ let operateName = null;
+ let operateType = '';
+ Object.keys(CMD).forEach(key => {
+ Object.values(CMD[key]).forEach(el => {
+ if (el.value == commandName) {
+ operateType = key;
+ operateName = el;
+ return;
+ }
+ });
+ });
+ // const operateName = Object.values(CMD[operateType]).find(res=>{ return res.value == commandName; });
+ if (operateName) {
+ const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车'};
+ const operateTypeName = deviceTypeList[operateType];
+ this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false});
}
- if (operateType == 'CM') {
- operateType = 'ControlConvertMenu';
- }
- const operateName = Object.values(CMD[operateType]).find(res=>{ return res.value == commandName; });
- const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车'};
- const operateTypeName = deviceTypeList[operateType];
- this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false});
} else {
// deviceFaultType
// element.operationParamMap.faultType;
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 474ae7996..c46217fa7 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -24,28 +24,28 @@
-
- {{ $t('scriptRecord.drivingPause') }}
- 恢复
- {{ $t('scriptRecord.resetScript') }}
- {{ $t('scriptRecord.startReplaceBg') }}
- {{ $t('scriptRecord.saveBackground') }}
- {{ $t('scriptRecord.saveData') }}
-
+
+ {{ $t('scriptRecord.drivingPause') }}
+ 恢复
+ {{ $t('scriptRecord.resetScript') }}
+ {{ $t('scriptRecord.startReplaceBg') }}
+ {{ $t('scriptRecord.saveBackground') }}
+ {{ $t('scriptRecord.saveData') }}
+
-
-
-
- {{ $t('scriptRecord.drivingPause') }}
- 恢复
- {{ $t('scriptRecord.confirmReplaceBg') }}
- {{ $t('scriptRecord.cancelReplaceBg') }}
-
-
+
+
+
+ {{ $t('scriptRecord.drivingPause') }}
+ 恢复
+ {{ $t('scriptRecord.confirmReplaceBg') }}
+ {{ $t('scriptRecord.cancelReplaceBg') }}
+
+
@@ -60,10 +60,10 @@
-
-
- {{ $t('scriptRecord.scriptRecordTitle') }}
-
+
+
+ {{ $t('scriptRecord.scriptRecordTitle') }}
+
@@ -102,10 +102,10 @@ export default {
type: Number,
required: true
},
- isReplaceBg: {
- type: Boolean,
- default: false
- }
+ isReplaceBg: {
+ type: Boolean,
+ default: false
+ }
},
data() {
return {
@@ -140,7 +140,7 @@ export default {
},
orignalUserRoleId() {
return this.$store.state.training.orignalUserRoleId;
- }
+ }
},
watch:{
'$store.state.map.mapViewLoadedCount': function (val) {
@@ -535,32 +535,32 @@ export default {
);
this.oldMember = Object.assign({}, role);
this.$refs.allScriptRole.updateLoading();
- },
- startReplaceBg() {
- startReplaceBg(this.group).then(resp => {
- this.$emit('setReplace', true);
- }).catch(error => {
- this.$messageBox(error.message);
- })
- },
- confirmReplaceBg() {
- confirmReplaceBg(this.group).then(resp => {
- this.$message.success('替换成功');
- this.$emit('setReplace', false);
- }).catch(error => {
- this.$messageBox(error.message);
- })
- },
- cancelReplaceBg() {
- cancelReplaceBg(this.group).then(resp => {
- this.$emit('setReplace', false);
- }).catch(error => {
- this.$messageBox(error.message);
- })
- },
- showConditionManage(actionInfo) {
- this.$refs.conditionManage.doShow(actionInfo);
- }
+ },
+ startReplaceBg() {
+ startReplaceBg(this.group).then(resp => {
+ this.$emit('setReplace', true);
+ }).catch(error => {
+ this.$messageBox(error.message);
+ });
+ },
+ confirmReplaceBg() {
+ confirmReplaceBg(this.group).then(resp => {
+ this.$message.success('替换成功');
+ this.$emit('setReplace', false);
+ }).catch(error => {
+ this.$messageBox(error.message);
+ });
+ },
+ cancelReplaceBg() {
+ cancelReplaceBg(this.group).then(resp => {
+ this.$emit('setReplace', false);
+ }).catch(error => {
+ this.$messageBox(error.message);
+ });
+ },
+ showConditionManage(actionInfo) {
+ this.$refs.conditionManage.doShow(actionInfo);
+ }
}
};
From fc46f0b55ece866e6de410adae7c6ab8d72792c0 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 4 Nov 2020 18:35:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=20=E8=BD=A6?=
=?UTF-8?q?=E6=AC=A1=E5=8F=B7=E6=96=B9=E5=90=91=E4=BB=A3=E7=A0=81=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/theme/foshan_01/planConvert.js | 14 +++++++++++---
src/jmapNew/theme/fuzhou_01/planConvert.js | 14 +++++++++++---
src/jmapNew/theme/haerbin_01/planConvert.js | 14 +++++++++++---
src/jmapNew/theme/ningbo_01/planConvert.js | 14 +++++++++++---
src/jmapNew/theme/race_01/planConvert.js | 12 ++++++++++--
src/jmapNew/theme/xian_01/planConvert.js | 14 +++++++++++---
src/jmapNew/theme/xian_02/planConvert.js | 13 +++++++++++--
src/utils/runPlan.js | 1 +
.../scriptDisplay/component/scriptTip.vue | 3 ++-
9 files changed, 79 insertions(+), 20 deletions(-)
diff --git a/src/jmapNew/theme/foshan_01/planConvert.js b/src/jmapNew/theme/foshan_01/planConvert.js
index 2d381de1f..4362d2c07 100644
--- a/src/jmapNew/theme/foshan_01/planConvert.js
+++ b/src/jmapNew/theme/foshan_01/planConvert.js
@@ -1,5 +1,5 @@
import { createMartPointReverse, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan';
-
+import store from '@/store/index_APP_TARGET';
export default {
/** 边缘高度*/
EdgeHeight: 600,
@@ -110,7 +110,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)];
/** 给服务对象添加服务名称和标记点*/
@@ -203,8 +207,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/fuzhou_01/planConvert.js b/src/jmapNew/theme/fuzhou_01/planConvert.js
index 0163d7a31..b9e9580e6 100644
--- a/src/jmapNew/theme/fuzhou_01/planConvert.js
+++ b/src/jmapNew/theme/fuzhou_01/planConvert.js
@@ -1,5 +1,5 @@
import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, prefixTime, convertSheetToList } from '@/utils/runPlan';
-
+import store from '@/store/index_APP_TARGET';
export default {
/** 边缘高度*/
EdgeHeight: 3,
@@ -297,7 +297,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[0].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[0], train.directionCode, false)];
/** 给服务对象添加服务名称和标记点*/
@@ -388,8 +392,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)],
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 be09d33f1..40ea90ee9 100644
--- a/src/jmapNew/theme/haerbin_01/planConvert.js
+++ b/src/jmapNew/theme/haerbin_01/planConvert.js
@@ -1,5 +1,5 @@
import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, prefixTime, convertSheetToList } from '@/utils/runPlan';
-
+import store from '@/store/index_APP_TARGET';
export default {
/** 边缘高度*/
EdgeHeight: 3,
@@ -168,6 +168,7 @@ 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;
@@ -178,7 +179,10 @@ 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.coord = [train.stationTimeList[0].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[0], train.directionCode, false)];
/** 给服务对象添加服务名称和标记点*/
@@ -271,8 +275,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)],
name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`,
color: lineStyle.color || '#000'
diff --git a/src/jmapNew/theme/ningbo_01/planConvert.js b/src/jmapNew/theme/ningbo_01/planConvert.js
index 5e73b8dc2..0a10d4565 100644
--- a/src/jmapNew/theme/ningbo_01/planConvert.js
+++ b/src/jmapNew/theme/ningbo_01/planConvert.js
@@ -1,5 +1,5 @@
import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan';
-
+import store from '@/store/index_APP_TARGET';
export default {
/** 边缘高度*/
EdgeHeight: 600,
@@ -137,7 +137,11 @@ export default {
// pointdata.name = `${service.serviceNumber}${train.tripNumber}${train.destinationCode || ''}`;
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)];
/** 给服务对象添加服务名称和标记点*/
@@ -230,8 +234,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/race_01/planConvert.js b/src/jmapNew/theme/race_01/planConvert.js
index 636f13f68..12786dd2c 100644
--- a/src/jmapNew/theme/race_01/planConvert.js
+++ b/src/jmapNew/theme/race_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,
@@ -114,6 +114,9 @@ export default {
pointdata.name = `${service.serviceNumber}${train.tripNumber}`;
pointdata.color = '#000' || lineStyle.color;
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.right, false)];
/** 给服务对象添加服务名称和标记点*/
@@ -211,8 +214,13 @@ 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';
+ }
+ // console.log(elem.right, 'elem.right');
serie.markPoint.data.push(createMartPoint({
- directionCode: elem.right ? '2' : '1',
+ 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/xian_01/planConvert.js b/src/jmapNew/theme/xian_01/planConvert.js
index 1cf586631..c535838a3 100644
--- a/src/jmapNew/theme/xian_01/planConvert.js
+++ b/src/jmapNew/theme/xian_01/planConvert.js
@@ -1,5 +1,5 @@
import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan';
-
+import store from '@/store/index_APP_TARGET';
export default {
/** 边缘高度*/
EdgeHeight: 600,
@@ -123,7 +123,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)];
/** 给服务对象添加服务名称和标记点*/
@@ -221,8 +225,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/xian_02/planConvert.js b/src/jmapNew/theme/xian_02/planConvert.js
index 2bce84025..526870390 100644
--- a/src/jmapNew/theme/xian_02/planConvert.js
+++ b/src/jmapNew/theme/xian_02/planConvert.js
@@ -1,4 +1,5 @@
import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan';
+import store from '@/store/index_APP_TARGET';
const StationMap = {
YARD1: '潏河停车场',
YARD2: '潏河停车场',
@@ -176,7 +177,11 @@ export default {
/** 创建标记点名称和坐标*/
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)];
/** 给服务对象添加服务名称和标记点*/
@@ -275,8 +280,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(time), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`,
color: lineStyle.color || '#000'
diff --git a/src/utils/runPlan.js b/src/utils/runPlan.js
index 5fea77427..4626244e5 100644
--- a/src/utils/runPlan.js
+++ b/src/utils/runPlan.js
@@ -22,6 +22,7 @@ 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/displayNew/scriptDisplay/component/scriptTip.vue b/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue
index fa2dceb35..ace5b1c54 100644
--- a/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue
@@ -119,7 +119,8 @@ export default {
transform: translateX(-50%);
color: #000;
line-height: 180%;
- z-index: 1501;
+ // z-index: 1501;
+ z-index: 15;
font-size: 14px;
}