diff --git a/src/jmapNew/shape/Automactic/index.js b/src/jmapNew/shape/Automactic/index.js index f9f52758f..a7ecf924c 100644 --- a/src/jmapNew/shape/Automactic/index.js +++ b/src/jmapNew/shape/Automactic/index.js @@ -16,13 +16,16 @@ export default class Automactic extends Group { this.zlevel = model.zlevel; this.model = model; this.style = style; - const arr = window.location.href.split('?')[1].split('&'); this.prdType = ''; - arr.forEach(elem => { - if (elem.split('=')[0] === 'prdType') { - this.prdType = elem.split('=')[1]; - } - }); + const path = window.location.href; + if (path.includes('?')) { + const arr = window.location.href.split('?')[1].split('&'); + arr.forEach(elem => { + if (elem.split('=')[0] === 'prdType') { + this.prdType = elem.split('=')[1]; + } + }); + } if (!this.prdType || this.style.AutomaticRoute.displayCondition.indexOf(this.prdType) !== -1) { this.create(); this.createMouseEvent(); diff --git a/src/jmapNew/shape/Section/ESeparator.js b/src/jmapNew/shape/Section/ESeparator.js index ee5cc27ef..6087d0597 100644 --- a/src/jmapNew/shape/Section/ESeparator.js +++ b/src/jmapNew/shape/Section/ESeparator.js @@ -51,6 +51,26 @@ export default class ESeparator extends Group { this.add(this.circle); } + createCircleArc() { + const model = this.model; + this.circleArc = new Circle({ + zlevel: this.zlevel, + z: this.z, + progressive: model.progressive, + shape: { + cx: model.point.x, + cy: model.point.y, + r: this.style.Section.line.width + 2 + }, + style: { + stroke: 'red', + GBaseLineWidth: 0.5, + fill: this.style.transparentColor + } + }); + this.add(this.circleArc); + } + setType() { const type = this.model.sepType; const model = this.model; @@ -80,6 +100,8 @@ export default class ESeparator extends Group { this.createModel(points, lineWidth, stroke); } else if (type === '04') { // 侵限分隔符 this.createCircle(); + } else if (type === '05') { // 特色分隔符 + this.createCircleArc(); } } diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 0a29bb813..ae880e5e3 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,9 +3,9 @@ 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.3.5:9000'; // 袁琪 - BASE_API = 'http://192.168.3.6:9000'; // 旭强 + // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip';