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:
joylink_zhangsai 2023-05-06 19:00:17 +08:00
parent 80178a80f6
commit fff07141b6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/painter.js
View File

@ -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 systemGraphType from './constant/systemGraphType';
import nccGraphType from './constant/nccGraphType';
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(systemGraphType)], (type) => {
...Object.values(nccGraphType)], (type) => {
const level = new Group({ name: `__${type}__` });
this.mapInstanceLevel[type] = level;
this.parentLevel.add(level);
@ -155,13 +155,17 @@ class Painter {
trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
trainDevice.instance = null;
trainDevice.zrOptions = this.$jmap.$options;
curModel.sectionModel.instance && this.add(trainDevice);
curModel.sectionModel && 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) {