diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index 8314649b8..785d6ef6e 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -218,7 +218,7 @@ class Signal extends Group { create() { const model = this.model; const style = this.style; - const drict = this.model.right ? 1 : -1; // 朝向 左:右 + const drict = this.model.showRight ? 1 : -1; // 朝向 左:右 const posit = this.model.positionType == '01' ? -1 : 1; // 位置 上:下 // 信号机高柱矮柱 (信号机底座) @@ -292,8 +292,8 @@ class Signal extends Group { this.tText.hide(); } if (style.Signal.insideTriangle) { - const right = model.right ? 1 : -1; - const angle = Math.PI / 6 * right; + const showRight = model.showRight ? 1 : -1; + const angle = Math.PI / 6 * showRight; this.insideTriangle = new Isogon({ zlevel: this.zlevel, z: this.z + 1, @@ -344,7 +344,7 @@ class Signal extends Group { // 信号机名称 const sigNameX = model.position.x + model.positionPoint.x - drict * (style.Signal.post.standardVerticalWidth) + model.namePosition.x; const sigNameY = model.position.y + model.positionPoint.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR * 2 + model.namePosition.y + style.Signal.text.distance); - const textAlign = style.Signal.text.isAlignCenter ? 'middle' : this.model.right ? 'left' : 'right'; + const textAlign = style.Signal.text.isAlignCenter ? 'middle' : this.model.showRight ? 'left' : 'right'; const textVerticalAlign = posit == 1 ? 'top' : 'bottom'; this.sigName = new ESigName({ zlevel: this.zlevel, @@ -480,13 +480,13 @@ class Signal extends Group { createTransmission() { const model = this.model; const style = this.style; - const drict = this.model.right ? 1 : -1; // 朝向 左:右 + const drict = this.model.showRight ? 1 : -1; // 朝向 左:右 const posit = this.model.positionType == '01' ? -1 : 1; // 位置 上:下 // 信号机名称 const actual = this.mapDevice[model.linkSignalCode]; const sigNameX = model.position.x + model.positionPoint.x + drict * 0.433 * style.Signal.transmission.sideLength + model.namePosition.x; const sigNameY = model.position.y + model.positionPoint.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR * 2 + model.namePosition.y + style.Signal.text.distance); - const textAlign = style.Signal.text.isAlignCenter ? 'middle' : this.model.right ? 'left' : 'right'; + const textAlign = style.Signal.text.isAlignCenter ? 'middle' : this.model.showRight ? 'left' : 'right'; const textVerticalAlign = posit == 1 ? 'top' : 'bottom'; const fillColor = actual.virtual ? style.Signal.transmission.fillColorVirtual : style.Signal.transmission.fillColor; this.sigName = new ESigName({ @@ -1128,7 +1128,7 @@ class Signal extends Group { rect = this.ciConfirm.getBoundingRect(); break; default: - var drict = this.model.right ? 1 : -1; // 朝向 右:左 + var drict = this.model.showRight ? 1 : -1; // 朝向 右:左 var offsetY = this.model.positionType == '01' ? this.style.Signal.text.fontSize : 0; // 位置 上:下 var shape = this.model.type == 'TRANSMISSION' ? this.transmission : this.sigPost; rect = shape.getBoundingRect().clone(); @@ -1168,7 +1168,7 @@ class Signal extends Group { /* 始端信号机选择后信号机变为三角形 */ setLampToTriangle() { const endPoint = this.sigPost.getLampPosition(this.model.lampPostType); - const drict = this.model.right ? 1 : -1; // 朝向 右:左 + const drict = this.model.showRight ? 1 : -1; // 朝向 右:左 this.lampTriangle = new Polygon({ zelvel: this.zlevel, z: this.z, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 148e2349a..64f99c6df 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,10 +2,10 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.177:9000'; // 旭强 - BASE_API = 'http://192.168.8.109:9000'; // 张赛 + // BASE_API = 'http://192.168.8.109:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 diff --git a/src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue b/src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue index fccb1b1d3..3cf14c10b 100644 --- a/src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue +++ b/src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue @@ -35,6 +35,12 @@ 清空 + +
+ 批量反向 + 清空 +
+
{{ item.name }}
@@ -56,224 +62,242 @@