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:
zyy 2020-12-07 16:10:03 +08:00
parent a797f63e93
commit 6b53bc55d6
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/shape/Station/index.js
View File

@ -13,7 +13,7 @@ import Text from 'zrender/src/graphic/Text';
import store from '@/store/index_APP_TARGET';
import EStationText from './EStationText';
import {traverseLineElements, traverseStatusElements} from '../utils/ShapeStatusCovert';
import { traverseLineElements } from '../utils/ShapeStatusCovert';
import Vue from 'vue';
@ -39,9 +39,9 @@ export default class Station extends Group {
const model = this.model;
const style = this.style;
// // 站台所有的绘图元素
// 站台所有的绘图元素
const elementTypeList = {
'stationText':EStationText // 车站名称 （普通站台样式）
'stationText': EStationText // 车站名称 （普通站台样式）
};
// 遍历当前线路下的绘图元素 组合模式

2
src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
View File

@ -361,7 +361,6 @@ export default {
const pointX = section.points[index].x;
const map = this.$store.state.map.map;
const models = [];
console.log(this.$store.state.map.map);
map.sectionList.forEach(item => {
if (item.type == '04') {
const flag = this.fromModel.right ? item.namePosition.x >= pointX : item.namePosition.x < pointX;
@ -437,7 +436,6 @@ export default {
}
models.push(deepAssign(section, { _type: 'Section' }));
this.$emit('updateMapModel', models);
console.log(models, '批量删除');
}
}
};

8
src/views/newMap/newMapdraft/mapoperate/section/index.vue
View File

@ -680,7 +680,15 @@ export default {
const trainWindowModel = this.$store.getters['map/getDeviceByCode'](selected.trainWindowCode);
trainWindowModel && models.push(deepAssign(trainWindowModel, { _dispose: true }));
const deleteObjAssociatedSection = this.handleDeleteSectionAssociatedSection(selected);
if (selected.type == '01') {
selected.logicSectionCodeList && selected.logicSectionCodeList.forEach(code => {
const selectedLocl = this.$store.getters['map/getDeviceByCode'](code);
const trainWindowModel = this.$store.getters['map/getDeviceByCode'](selectedLocl.trainWindowCode);
trainWindowModel && models.push(deepAssign(trainWindowModel, { _dispose: true }));
});
}
models = [...models, ...deleteObjAssociatedSection];
// console.log(models, '=====');
this.$emit('updateMapModel', models);
this.clear();
}).catch(error => {

20
src/views/newMap/newMapdraft/mapoperate/splitScreen.vue
View File

@ -161,13 +161,15 @@ export default {
if (data.bigScreenSplitConfig) {
data.bigScreenSplitConfig.forEach(item => {
const section = this.$store.getters['map/getDeviceByCode'](item.sectionCode);
const param = {
position: String(section.points[section.points.length - 1].x),
name: `${section.name}(${section.code})`,
offsetTop: 0,
sectionCode: section.code
};
this.tableData.push(param);
if (section) {
const param = {
position: String(section.points[section.points.length - 1].x),
name: `${section.name}(${section.code})`,
offsetTop: 0,
sectionCode: section.code
};
this.tableData.push(param);
}
});
this.tableData.sort((a, b) => Number(a.position) - Number(b.position)); // 数组排序
@ -270,8 +272,8 @@ export default {
clear() {
this.$refs.hostileForm.resetFields();
this.addModel.sectionCode = '';
this.index = '';
this.field = '';
this.index = '';
this.field = '';
},
generateOverlab() { // 生成
if (!this.addModel.sectionCode) {