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_cuiweidong 2021-04-29 10:06:12 +08:00
parent d8af8fb70a
commit 34a20d3475
7 changed files with 159 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/iscs_new/animateHandle.js
View File

@ -7,13 +7,13 @@ function traverse(group, map) {
} else { } else {
map[el.name] = el; map[el.name] = el;
} }
}) });
return map; return map;
} }
class Animate { class Animate {
constructor(state) { constructor(state) {
this._state = {...state} this._state = {...state};
this._sum = 0; this._sum = 0;
this._count = 0; this._count = 0;
this._first = true; this._first = true;
@ -22,14 +22,14 @@ class Animate {
run(interval) { run(interval) {
this._sum = this._sum + interval; this._sum = this._sum + interval;
const total = this._state.time + (this._first? this._state.delay: 0) const total = this._state.time + (this._first ? this._state.delay : 0);
if (this._sum > total) { if (this._sum > total) {
this.animate(this) this.animate(this);
this._count = this._count + 1; this._count = this._count + 1;
this._sum = 0; this._sum = 0;
this._first = false; this._first = false;
} }
} }
isLoop() { isLoop() {
return this._state.loop || this._count < this._state.frameList.length; return this._state.loop || this._count < this._state.frameList.length;
@ -47,42 +47,42 @@ class Animate {
return this._state.code == code; return this._state.code == code;
} }
getIndex(index=0) { getIndex(index = 0) {
return index? index: this._count%this._state.frameList.length; return index || this._count % this._state.frameList.length;
} }
getFrame(index=0) { getFrame(index = 0) {
return this._state.frameList[index]; return this._state.frameList[index];
} }
animate() { animate() {
const shape = this._state.shape; const shape = this._state.shape;
const mapShape = this._state.mapShape; const mapShape = this._state.mapShape;
const index = this.getIndex(); const index = this.getIndex();
const frame = this.getFrame(index); const frame = this.getFrame(index);
if(shape && mapShape && frame) { if (shape && mapShape && frame) {
const mapView = traverse(shape, {}); const mapView = traverse(shape, {});
if (this.isNeedDefault()) { if (this.isNeedDefault()) {
Object.keys(mapShape).forEach(name => { Object.keys(mapShape).forEach(name => {
const state = mapShape[name] const state = mapShape[name];
const view = mapView[name]; const view = mapView[name];
if (view) { if (view) {
shape.setInvisible(shape.model.base.hide); shape.setInvisible(shape.model.base.hide);
view.attr({shape: state.default.shape, style: state.default.style}); view.attr({shape: state.default.shape, style: state.default.style});
view.dirty(); view.dirty();
} }
}) });
} }
Object.keys(frame).forEach(name => { Object.keys(frame).forEach(name => {
const view = mapView[name]; const view = mapView[name];
const model = frame[name]; const model = frame[name];
if (view && model) { if (view && model) {
shape.setInvisible(model.hide); shape.setInvisible(model.hide);
view.attr({shape: model.shape, style: model.style}); view.attr({shape: model.shape, style: model.style});
view.dirty(); view.dirty();
} }
}) });
} }
} }
@ -104,7 +104,7 @@ class AnimateHandle {
this._animates.push(animate); this._animates.push(animate);
} }
} }
} }
animate(state) { animate(state) {
const animate = this._animates.find(el => el.isEqual(state.code)); const animate = this._animates.find(el => el.isEqual(state.code));
@ -115,4 +115,4 @@ class AnimateHandle {
} }
} }
export default AnimateHandle export default AnimateHandle;

16
src/iscs_new/map.js
View File

@ -197,14 +197,14 @@ class JMap {
this.$shapeFactory.addShape(oldShape); this.$shapeFactory.addShape(oldShape);
this.$painter.add(oldShape); this.$painter.add(oldShape);
break; break;
case orders.changeStatus: // case orders.changeStatus:
// model // // model
this.$painter.update(this.$stateHandle.update(this.$shapeFactory, [])); // this.$painter.update(this.$stateHandle.update(this.$shapeFactory, []));
debugger; // debugger;
break; // break;
case orders.ResetStatus: // case orders.ResetStatus:
debugger; // debugger;
break; // break;
} }
} }
}); });

103
src/iscs_new/stateHandle.js
View File

@ -1,60 +1,63 @@
import * as utils from './utils/utils'; import * as utils from './utils/utils';
export default class StateHandle { export default class StateHandle {
constructor(map) { constructor(map) {
this.$map = map; this.$map = map;
} }
parse(shapeFactory, state) { parse(shapeFactory, state) {
const mapTemplate = shapeFactory.getMapTemplate(); const mapTemplate = shapeFactory.getMapTemplate();
const template = mapTemplate[state.type]; const template = mapTemplate[state.type];
const templateState = template.mapState[state.status]||{}; const templateState = template.mapState[state.status] || {};
const frameList = templateState.frameList||[]; // const frameList = templateState.frameList||[];
const frameList = Object.values(templateState.covertStatusList) || [];
// 增加第一帧初始数据 // 增加第一帧初始数据
// if (templateState && // if (templateState &&
// templateState.needDefault) { // templateState.needDefault) {
// templateState.frameList.unshift( // templateState.frameList.unshift(
// Object.entries(template.mapShape).map(el => { // Object.entries(template.mapShape).map(el => {
// return { name: el[0], ...el[1][utils.defStatus]}; // return { name: el[0], ...el[1][utils.defStatus]};
// }) // })
// ); // );
// } // }
return { return {
...state, ...state,
...templateState, ...templateState,
mapShape: template.mapShape, mapShape: template.mapShape,
shape: shapeFactory.getShapeByCode(state.code), shape: shapeFactory.getShapeByCode(state.code),
frameList: frameList.map(frame => { frameList: frameList.map(frame => {
return Object.fromEntries(frame.map(el => { // return Object.fromEntries(frame.map(el => {
const mapState = template.mapShape[el.name]||{}; return Object.fromEntries(frame.frameList.map((el, index) => {
const state = mapState[el.status]||{}; const mapState = template.mapShape[el.name] || {};
return [el.name, { const state = mapState[el.status] || {};
...el, return [el.name || index, {
...state loop:frame.loop,
}] ...el,
})); ...state
}) }];
} }));
} })
};
}
update(shapeFactory, states=[]) { update(shapeFactory, states = []) {
return states.reduce((list,state) => { return states.reduce((list, state) => {
return [ return [
...list, ...list,
this.parse(shapeFactory, state), // 测试只有自身 this.parse(shapeFactory, state) // 测试只有自身
// this.updateState(this.parse(shapeFactory, state)), // 处理自身 // this.updateState(this.parse(shapeFactory, state)), // 处理自身
// this.updateState(this.parse(shapeFactory, state)) // 处理依赖 // this.updateState(this.parse(shapeFactory, state)) // 处理依赖
]; ];
}, []); }, []);
} }
updateState(state={}) { updateState(state = {}) {
return {} return {};
} }
updateDepState(state={}) { updateDepState(state = {}) {
return {} return {};
} }
} }

1
src/iscs_new/transformHandle.js
View File

@ -45,6 +45,7 @@ export default class TransformHandle {
// 遍历view执行回调 // 遍历view执行回调
traverse(cb, context) { traverse(cb, context) {
debugger
this.traverseLayer(layer => { this.traverseLayer(layer => {
layer.eachChild(shape => { layer.eachChild(shape => {
cb.call(context, shape); cb.call(context, shape);

16
src/jmapNew/shape/Signal/index.js
View File

@ -27,7 +27,7 @@ class Signal extends Group {
this._code = model.code; this._code = model.code;
this._type = model._type; this._type = model._type;
this.model = model; this.model = model;
this.mapDevice = mapDevice; this.mapDevice = mapDevice;
this.style = style; this.style = style;
this.count = parseInt(model.lampPositionType); this.count = parseInt(model.lampPositionType);
this.lamps = new Array(this.count); this.lamps = new Array(this.count);
@ -322,12 +322,12 @@ class Signal extends Group {
const drict = this.model.right ? 1 : -1; // 朝向 左:右 const drict = this.model.right ? 1 : -1; // 朝向 左:右
const posit = this.model.positionType == '01' ? -1 : 1; // 位置 上:下 const posit = this.model.positionType == '01' ? -1 : 1; // 位置 上:下
// 信号机名称 // 信号机名称
const actual = this.mapDevice[model.linkSignalCode]; 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 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 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.right ? 'left' : 'right';
const textVerticalAlign = posit == 1 ? 'top' : 'bottom'; const textVerticalAlign = posit == 1 ? 'top' : 'bottom';
const fillColor = actual.virtual? style.Signal.transmission.fillColorVirtual: style.Signal.transmission.fillColor; const fillColor = actual.virtual ? style.Signal.transmission.fillColorVirtual : style.Signal.transmission.fillColor;
this.sigName = new ESigName({ this.sigName = new ESigName({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z, z: this.z,
@ -511,12 +511,12 @@ class Signal extends Group {
} }
if (this.style.Signal.lamp.guidName !== 'singleRY') { if (this.style.Signal.lamp.guidName !== 'singleRY') {
if (this.lamps.length == 1) { if (this.lamps.length == 1) {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor); this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor);
} else { } else {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor); this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor);
this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.yellowColor); this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.yellowColor);
} }
} }
} }
@ -859,8 +859,8 @@ class Signal extends Group {
default: default:
var drict = this.model.right ? 1 : -1; // 朝向 右:左 var drict = this.model.right ? 1 : -1; // 朝向 右:左
var offsetY = this.model.positionType == '01' ? this.style.Signal.text.fontSize : 0; // 位置 上:下 var offsetY = this.model.positionType == '01' ? this.style.Signal.text.fontSize : 0; // 位置 上:下
var shape = this.model.type == 'TRANSMISSION'? this.transmission: this.sigPost; var shape = this.model.type == 'TRANSMISSION' ? this.transmission : this.sigPost;
rect = shape.getBoundingRect().clone(); rect = shape.getBoundingRect().clone();
rect.x = rect.x + drict * this.style.Signal.post.standardVerticalWidth; rect.x = rect.x + drict * this.style.Signal.post.standardVerticalWidth;
rect.y = rect.y - offsetY; rect.y = rect.y - offsetY;
break; break;

104
src/views/iscs_new/iscsPreview/index.vue
View File

@ -55,7 +55,8 @@ export default {
selected: null, selected: null,
statusTab:'', statusTab:'',
stateList:[], stateList:[],
elementList:[] elementList:[],
type:''
}; };
}, },
mounted() { mounted() {
@ -64,52 +65,71 @@ export default {
onSelectTab() { onSelectTab() {
}, },
setData(data ) { setData(data) {
this.stateList = data.stateList; this.stateList = data.stateList;
this.elementList = utils.deepClone(data.shapeList); this.elementList = utils.deepClone(data.shapeList);
this.type = data.type;
}, },
previewStatus(data) { previewStatus(data) {
// this.resetDefaultStatus(); // this.resetDefaultStatus();
const that = this; // covertStatusList: Object
const list = Object.values(data.covertStatusList); // description: "关闭"
list.forEach(each=>{ // id: 1
if (each.loop) { // needDefault: true
// ChangeStatus // status: "close"
} else { // weight: 1
const frameList = each.frameList; this.$iscs.update([
// this.$iscs.update([ { status: data.status, code: '100', type: this.type }
// { status: 's1', code: '100', type: 'Device' }, ]);
// { status: 's2', code: '101', type: 'Device' } // const that = this;
// ]); // const list = Object.values(data.covertStatusList);
frameList.forEach(frame=>{ // list.forEach(each=>{
const element = that.elementList.find(ele=>{ return ele.name == frame.name; }); // debugger;
if (element) { // if (each.loop) {
const elementStyle = element.stateList.find(state=>{ return state.status == frame.status; }); // // ChangeStatus
if (elementStyle) { // } else {
const model = utils.deepClone(element); // const frameList = each.frameList;
const style = elementStyle.style || {}; // // <模型类型>
// model.changeStyle = // // this.$iscs.update([
if (style && JSON.stringify(style) != '{}') { // // { status: 's1', code: '100', type: 'Device' },
const keys = Object.keys(style); // // { status: 's2', code: '101', type: 'Device' }
keys.forEach(eachKey=>{ // // ]);
model.style[eachKey] = style[eachKey]; // frameList.forEach(frame=>{
}); // const element = that.elementList.find(ele=>{ return ele.name == frame.name; });
} // if (element) {
const shape = elementStyle.shape || {}; // const elementStyle = element.stateList.find(state=>{ return state.status == frame.status; });
if (shape && JSON.stringify(shape) != '{}') { // if (elementStyle) {
const keys = Object.keys(shape); // const model = utils.deepClone(element);
keys.forEach(eachShape=>{
model.shape[eachShape] = style[eachShape]; // // this.$iscs.update([
}); // // { status: 's1', code: '100', type: 'Device' },
} // // { status: 's2', code: '101', type: 'Device' }
// { status: 's1', code: '100', type: 'Device' }, // // ]);
this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.Update}}]);
// this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.ChangeStatus}}]); // // model.frameList = [];
} // // const style = elementStyle.style || {};
} // // // model.changeStyle =
}); // // if (style && JSON.stringify(style) != '{}') {
} // // const keys = Object.keys(style);
}); // // keys.forEach(eachKey=>{
// // model.style[eachKey] = style[eachKey];
// // });
// // }
// // const shape = elementStyle.shape || {};
// // if (shape && JSON.stringify(shape) != '{}') {
// // const keys = Object.keys(shape);
// // keys.forEach(eachShape=>{
// // model.shape[eachShape] = style[eachShape];
// // });
// // }
// // { status: 's1', code: '100', type: 'Device' },
// // this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.Update}}]);
// this.$refs.iscsCanvas.doAction([{model, action: {shapeType: shapeType.Element, order: orders.ChangeStatus}}]);
// }
// }
// });
// }
// });
}, },
resetDefaultStatus() { resetDefaultStatus() {
this.elementList.forEach(element=>{ this.elementList.forEach(element=>{

2
src/views/iscs_new/iscsPreview/iscsCanvas.vue
View File

@ -101,7 +101,7 @@ export default {
if (this.$route.query.id) { if (this.$route.query.id) {
setTimeout(_ => { setTimeout(_ => {
Idb.select('composeTemplateList', this.$route.query.id).then(resp => { Idb.select('composeTemplateList', this.$route.query.id).then(resp => {
this.$iscs.setMap([], { this.$iscs.setMap([resp], {
elementList: resp.shapeList || [], elementList: resp.shapeList || [],
composeList: resp.composeList || [] composeList: resp.composeList || []
}, option); }, option);