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-07-03 11:11:57 +08:00
parent fa5097cd8d
commit f91fc75528
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue
View File

@ -146,6 +146,7 @@ export default {
}); });
}, },
doClose() { doClose() {
this.row = null;
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.restoreBeforeDevices(); this.restoreBeforeDevices();
@ -156,7 +157,9 @@ export default {
// 恢复之前选中设备 // 恢复之前选中设备
if (this.beforeSectionList && this.beforeSectionList.length) { if (this.beforeSectionList && this.beforeSectionList.length) {
this.beforeSectionList.forEach(elem => { this.beforeSectionList.forEach(elem => {
elem.cutOff = false; const section = deepAssign({}, this.$store.getters['map/getDeviceByCode'](elem.code)); // 最新状态数据 覆盖
section.cutOff = false;
elem = Object.assign(elem, section);
}); });
} }

4
src/utils/baseUrl.js
View File

@ -2,11 +2,11 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // 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.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.41:9000'; // 张赛
BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛

25
src/views/newMap/newMapdraft/mapoperate/station.vue
View File

@ -238,11 +238,7 @@ export default {
}; };
}, },
PhysicalSectionList() { PhysicalSectionList() {
let list = []; return this.sectionList.filter(elem => { return elem.type === '01' && !elem.switchSection; });
if (this.sectionList && this.sectionList.length) {
list = this.sectionList.filter(elem => { return elem.type === '01' && !elem.switchSection; });
}
return list;
}, },
isPointsShow() { isPointsShow() {
@ -269,7 +265,6 @@ export default {
this.$refs.dataform && this.$refs.dataform.resetFields(); this.$refs.dataform && this.$refs.dataform.resetFields();
this.activeName = 'first'; this.activeName = 'first';
this.editModel = deepAssign(this.editModel, selected); this.editModel = deepAssign(this.editModel, selected);
console.log(this.editModel.nameFont, selected, '=========');
// 被控制的车站数据 // 被控制的车站数据
const beCentralizedStation = {}; const beCentralizedStation = {};
this.relStationList = JSON.parse(JSON.stringify(this.stationList)); this.relStationList = JSON.parse(JSON.stringify(this.stationList));
@ -377,22 +372,18 @@ export default {
createControlMode: item.control createControlMode: item.control
}; };
const model = Object.assign(stationModel, data); const model = Object.assign(stationModel, data);
this.sectionList.forEach(elem => { const sectionModel = this.$store.getters['map/getDeviceByCode'](item.sectionCode);
if (elem.code === item.sectionCode) { const last = sectionModel.points.length - 1;
const l = 0;
const r = elem.points.length - 1;
model.position = { model.position = {
x: elem.points[l].x + (elem.points[r].x - elem.points[l].x) / 2, x: sectionModel.points[0].x + (sectionModel.points[last].x - sectionModel.points[0].x) / 2,
y: elem.points[l].y - this.addModel.positionY y: sectionModel.points[0].y - this.addModel.positionY
}; };
if (item.control) { if (item.control) {
model.controlModePoint = { model.controlModePoint = {
x: elem.points[l].x + (elem.points[r].x - elem.points[l].x) / 2, x: sectionModel.points[0].x + (sectionModel.points[last].x - sectionModel.points[0].x) / 2,
y: elem.points[l].y - this.addModel.positionY + 30 y: sectionModel.points[0].y - this.addModel.positionY + 30
}; };
} }
}
});
models.push(model); models.push(model);
}); });
this.$emit('updateMapModel', models); this.$emit('updateMapModel', models);
@ -417,7 +408,7 @@ export default {
// 删除对象 // 删除对象
deleteObj() { deleteObj() {
const selected = this.$store.getters['map/getDeviceByCode'](this.editModel.code); const selected = this.$store.getters['map/getDeviceByCode'](this.editModel.code);
if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) { if (selected && selected._type == 'Station') {
this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), { this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'), confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'), cancelButtonText: this.$t('tip.cancel'),