Merge remote-tracking branch 'origin/master'
# Conflicts: # src/jmapNew/painter.js
This commit is contained in:
commit
80178a80f6
@ -2,7 +2,7 @@ import * as zrUtil from 'zrender/src/core/util';
|
||||
// import * as vector from 'zrender/src/core/vector';
|
||||
import Group from 'zrender/src/container/Group';
|
||||
import deviceType from './constant/deviceType';
|
||||
import nccGraphType from './constant/nccGraphType';
|
||||
import systemGraphType from './constant/systemGraphType';
|
||||
import transitionDeviceStatus from './constant/stateTransition';
|
||||
// import shapefactory from './shape/factory';
|
||||
import Graphic from './shape';
|
||||
@ -43,7 +43,7 @@ class Painter {
|
||||
// 添加子级图层
|
||||
zrUtil.each([
|
||||
...Object.values(deviceType),
|
||||
...Object.values(nccGraphType)], (type) => {
|
||||
...Object.values(systemGraphType)], (type) => {
|
||||
const level = new Group({ name: `__${type}__` });
|
||||
this.mapInstanceLevel[type] = level;
|
||||
this.parentLevel.add(level);
|
||||
@ -155,17 +155,13 @@ class Painter {
|
||||
trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
|
||||
trainDevice.instance = null;
|
||||
trainDevice.zrOptions = this.$jmap.$options;
|
||||
curModel.sectionModel && curModel.sectionModel.instance && this.add(trainDevice);
|
||||
curModel.sectionModel.instance && this.add(trainDevice);
|
||||
});
|
||||
|
||||
if (this.screenFlag) {
|
||||
this.$transformHandleScreen.transformView(device.instance);
|
||||
}
|
||||
}
|
||||
updateNccTrain(device) {
|
||||
this.delete(device);
|
||||
this.add(device);
|
||||
}
|
||||
/** 画面更新 */
|
||||
updatePicture(device) {
|
||||
if (device) {
|
||||
|
Loading…
Reference in New Issue
Block a user