diff --git a/src/jmapNew/theme/aus_00/utils.js b/src/jmapNew/theme/aus_00/util.js similarity index 90% rename from src/jmapNew/theme/aus_00/utils.js rename to src/jmapNew/theme/aus_00/util.js index 8fe94ad9e..d0f966c7a 100644 --- a/src/jmapNew/theme/aus_00/utils.js +++ b/src/jmapNew/theme/aus_00/util.js @@ -20,6 +20,27 @@ export function createMartPoint(opt) { }; } + +/** 创建一个车次数据点*/ +export function createMartPointReverse(opt) { + const rotate = opt.directionCode == '1' ? 45 : (opt.directionCode == '2' ? -45 : 0); + const position = opt.type ? 'insideBottomLeft' : 'insideTopLeft'; + return { + coord: opt.coord, + name: opt.name, + label: { + normal: { + rotate: rotate, + formatter: '{b}', + backgroundColor: 'rgb(242,242,242,0.1)', + color: 'black', + // color: opt.color, + position: position + } + } + }; +} + /** 创建一个服务数据序列*/ export function createSeriesModel(opt, lineStyle={}, itemStyle={}) { return { diff --git a/src/jmapNew/theme/chengdu_01/planConfig.js b/src/jmapNew/theme/chengdu_01/planConfig.js index 7a1f26988..90e051259 100644 --- a/src/jmapNew/theme/chengdu_01/planConfig.js +++ b/src/jmapNew/theme/chengdu_01/planConfig.js @@ -13,6 +13,9 @@ export default { /** 偏移时间*/ translation: 60 * 60 * 2, + /** 标签方向 */ + reverse: true, + /** excel解析配置*/ excelConfig: { beginRow: 1, diff --git a/src/jmapNew/theme/foshan_01/planConfig.js b/src/jmapNew/theme/foshan_01/planConfig.js index 2dd2e25ba..1766c878a 100644 --- a/src/jmapNew/theme/foshan_01/planConfig.js +++ b/src/jmapNew/theme/foshan_01/planConfig.js @@ -13,6 +13,9 @@ export default { /** 偏移时间*/ translation: 60 * 60 * 2, + /** 标签方向 */ + reverse: true, + /** excel解析配置*/ excelConfig: { beginRow: 1, diff --git a/src/jmapNew/theme/parser/AUSToolParser.js b/src/jmapNew/theme/parser/AUSToolParser.js index 0eb7408ae..63a1d6e35 100644 --- a/src/jmapNew/theme/parser/AUSToolParser.js +++ b/src/jmapNew/theme/parser/AUSToolParser.js @@ -1,4 +1,4 @@ -import { createSeriesModel, createMarkLineModels, createRectArea, createMartPoint } from '../aus_00/utils'; +import { createSeriesModel, createMarkLineModels, createRectArea, createMartPoint, createMartPointReverse } from '../aus_00/util'; import { toTimeStamp } from '@/utils/date'; class AUSToolParser { @@ -195,11 +195,12 @@ class AUSToolParser { /** 根据方向计算y折返偏移量*/ getOffsetY(isSpecial, direction) { + const sign = this.getReverse() ? -1 : 1; if (isSpecial) { if (direction === '1') { - return -this.getEdge() / 2; + return - sign * this.getEdge() / 2; } else if (direction === '2') { - return +this.getEdge() / 2; + return + sign * this.getEdge() / 2; } } @@ -306,6 +307,10 @@ class AUSToolParser { return this.config.edge; } + getReverse() { + return this.config.reverse; + } + __createMartPoint(...args) { return this.config.reverse ? createMartPointReverse(...args): createMartPoint(...args); } diff --git a/src/jmapNew/theme/parser/EqualDistanceParser.js b/src/jmapNew/theme/parser/EqualDistanceParser.js index c751cd3d2..108484b94 100644 --- a/src/jmapNew/theme/parser/EqualDistanceParser.js +++ b/src/jmapNew/theme/parser/EqualDistanceParser.js @@ -1,4 +1,4 @@ -import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor } from './util'; +import { createMartPoint, createMartPointReverse, createSeriesModel, createMarkLineModels, hexColor } from './util'; import store from '@/store/index'; const defaultConfig = { @@ -232,10 +232,11 @@ class EqualDistanceParser { /** 根据方向计算y折返偏移量*/ getValueYByDirectionCode(defaultValue, directionCode) { + const sign = this.getReverse() ? -1 : 1; if (directionCode === '1') { - defaultValue -= this.getEdge() / 2; + defaultValue -= sign*this.getEdge() / 2; } else if (directionCode === '2') { - defaultValue += this.getEdge() / 2; + defaultValue += sign*this.getEdge() / 2; } return defaultValue; @@ -267,6 +268,10 @@ class EqualDistanceParser { return this.config.edge; } + getReverse() { + return this.config.reverse; + } + __createMartPoint(...args) { return this.config.reverse ? createMartPointReverse(...args): createMartPoint(...args); } diff --git a/src/jmapNew/theme/parser/EqualRatioParser.js b/src/jmapNew/theme/parser/EqualRatioParser.js index 8f6c1b9f9..662a6b7ff 100644 --- a/src/jmapNew/theme/parser/EqualRatioParser.js +++ b/src/jmapNew/theme/parser/EqualRatioParser.js @@ -246,10 +246,11 @@ class EqualRatioParser { /** 根据方向计算y折返偏移量*/ getValueYByDirectionCode(defaultValue, directionCode, num) { + const sign = this.getReverse() ? -1 : 1; if (directionCode === '1') { - defaultValue -= this.getEdge() / 2 * num; + defaultValue -= sign * this.getEdge() / 2 * num; } else if (directionCode === '2') { - defaultValue += this.getEdge() / 2 * num; + defaultValue += sign * this.getEdge() / 2 * num; } return defaultValue; @@ -281,6 +282,10 @@ class EqualRatioParser { return this.config.edge; } + getReverse() { + return this.config.reverse; + } + __createMartPoint(...args) { return this.config.reverse ? createMartPointReverse(...args): createMartPoint(...args); } diff --git a/src/views/iscs/iscsSystem/stationConfig/schedule.vue b/src/views/iscs/iscsSystem/stationConfig/schedule.vue index b8b624ad5..689ba6095 100644 --- a/src/views/iscs/iscsSystem/stationConfig/schedule.vue +++ b/src/views/iscs/iscsSystem/stationConfig/schedule.vue @@ -37,7 +37,6 @@ export default { DataTable }, data() { - return { return { top: 0, height: 0, diff --git a/src/views/newMap/displayNew/demoTraining/index.vue b/src/views/newMap/displayNew/demoTraining/index.vue index 228fba1d9..e92ce2594 100644 --- a/src/views/newMap/displayNew/demoTraining/index.vue +++ b/src/views/newMap/displayNew/demoTraining/index.vue @@ -1,13 +1,7 @@