joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

调整公共绘图元素显示条件

Browse Source
This commit is contained in:
fan 2020-03-10 10:21:33 +08:00
parent 91531c7521
commit 6980bb099f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/shape/Line/index.js
View File

@ -1,6 +1,6 @@
import Line from 'zrender/src/graphic/shape/Line';
import Group from 'zrender/src/container/Group';
import {getPrdType} from '../utils/handlePath';
import {getPrdType, isShowThePrdType} from '../utils/handlePath';
export default class Line2 extends Group {
constructor(model, style) {
@ -12,7 +12,7 @@ export default class Line2 extends Group {
this.model = model;
this.style = style;
this.prdType = getPrdType();
if (model.showConditions === '01' || (model.showConditions === '02' && this.prdType === '02') || (model.showConditions === '03' && this.prdType === '01') || !model.showConditions) {
if (isShowThePrdType(this.prdType, model.showConditions)) {
this.create();
this.setState(model);
}

4
src/jmapNew/shape/OutFrame/index.js
View File

@ -1,6 +1,6 @@
import Group from 'zrender/src/container/Group';
import Rect from 'zrender/src/graphic/shape/Rect';
import {getPrdType} from '../utils/handlePath';
import {getPrdType, isShowThePrdType} from '../utils/handlePath';
export default class OutFrame extends Group {
constructor(model, style) {
@ -12,7 +12,7 @@ export default class OutFrame extends Group {
this.zlevel = model.zlevel;
this.z = 0;
this.prdType = getPrdType();
if (model.showConditions === '01' || (model.showConditions === '02' && this.prdType === '02') || (model.showConditions === '03' && this.prdType === '01') || !model.showConditions) {
if (isShowThePrdType(this.prdType, model.showConditions)) {
this.create();
this.setState(model);
}

4
src/jmapNew/shape/Text/index.js
View File

@ -1,6 +1,6 @@
import Text from 'zrender/src/graphic/Text';
import Group from 'zrender/src/container/Group';
import {getPrdType} from '../utils/handlePath';
import {getPrdType, isShowThePrdType} from '../utils/handlePath';
export default class Text2 extends Group {
constructor(model, style) {
@ -13,7 +13,7 @@ export default class Text2 extends Group {
this.style = style;
this.z = 6;
this.prdType = getPrdType();
if (model.showConditions === '01' || (model.showConditions === '02' && this.prdType === '02') || (model.showConditions === '03' && this.prdType === '01') || !model.showConditions) {
if (isShowThePrdType(this.prdType, model.showConditions)) {
this.create();
this.setState(model);
}

4
src/utils/baseUrl.js
View File

@ -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';