From d6dccd10d7d8a9221e32c500c56cda45053c3e63 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 8 Dec 2020 09:52:07 +0800
Subject: [PATCH 12/52] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BD=A6=E7=AB=99?=
=?UTF-8?q?=E9=9A=90=E8=97=8F=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/shape/Station/EStationText.js | 5 ++++-
src/jmapNew/shape/Station/index.js | 17 +++++++++++------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/jmapNew/shape/Station/EStationText.js b/src/jmapNew/shape/Station/EStationText.js
index 9e9e7fc0c..e9f2377b2 100644
--- a/src/jmapNew/shape/Station/EStationText.js
+++ b/src/jmapNew/shape/Station/EStationText.js
@@ -31,7 +31,10 @@ class EStationText extends Group {
textBorderWidth:style.Station.stationText.textBorderWidth
}
});
- model.visible && this.add(this.stationName);
+ this.add(this.stationName);
+ if (!model.visible) {
+ this.stationName.setStyle('fontSize', 0);
+ }
if (model.subheadDisplay) { // 副标题
this.subheadText = new Text({
zlevel: this.model.zlevel,
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index a2c6b1abb..99cb53cdf 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -74,7 +74,10 @@ export default class Station extends Group {
textFill: model.kmPostFontColor
});
this.add(this.mileageText);
- model.visible && model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
+ model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
+ if (!model.visible) {
+ this.mileageText.setStyle('fontSize', 0);
+ }
}
// if (!model.visible) { // 隐藏车站
@@ -462,11 +465,13 @@ export default class Station extends Group {
}
setShowStation(flag) {
if (flag) {
- this.eachChild(item => {
- item.show();
- });
- if (this.mileageText) {
- this.model.visible && this.model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
+ if (this.model.visible) {
+ this.eachChild(item => {
+ item.show();
+ });
+ if (this.mileageText) {
+ this.model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
+ }
}
this.isShowShape = true;
this.setState(this.model);
From 085990f755a8b74e3f2f21d29a8842f938896e07 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 8 Dec 2020 11:09:02 +0800
Subject: [PATCH 13/52] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=99=E5=8F=B0?=
=?UTF-8?q?=E7=B4=A7=E6=80=A5=E6=8C=89=E9=92=AE=E6=89=B9=E9=87=8F=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8C=BA=E6=AE=B5=E6=89=B9?=
=?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/newMap/displayNew/demonMenu.vue | 14 +++++------
src/views/newMap/jointTrainingNew/index.vue | 14 +++++------
.../newMapdraft/mapoperate/espDraft.vue | 25 +++++++++++++++++++
.../mapoperate/section/batchSettings.vue | 18 ++++++-------
4 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index e53a033ca..1ecd530ae 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -161,15 +161,15 @@ export default {
}
},
jumpjlmap3dmodel() {
- if(this.deviceif == false){
- this.deviceif = true;
- }else{
- if (this.deviceShow == false) {
- this.deviceShow = true;
+ if (this.deviceif == false) {
+ this.deviceif = true;
} else {
- this.deviceShow = false;
+ if (this.deviceShow == false) {
+ this.deviceShow = true;
+ } else {
+ this.deviceShow = false;
+ }
}
- }
},
showdriving() {
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index f47a0603f..d58fe0666 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -295,15 +295,15 @@ export default {
// });
// },
devicemodel() {
- if(this.deviceif == false){
- this.deviceif = true;
- }else{
- if (this.deviceShow == false) {
- this.deviceShow = true;
+ if (this.deviceif == false) {
+ this.deviceif = true;
} else {
- this.deviceShow = false;
+ if (this.deviceShow == false) {
+ this.deviceShow = true;
+ } else {
+ this.deviceShow = false;
+ }
}
- }
},
/* 地图根据仿真group获取仿真基础信息 */
diff --git a/src/views/newMap/newMapdraft/mapoperate/espDraft.vue b/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
index 23408cc91..709319dc5 100644
--- a/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
@@ -16,6 +16,11 @@
批量创建
+
+
+ 一键删除无效数据
+
+
@@ -166,6 +171,26 @@ export default {
this.$message('暂无新车站或车站已有对应紧急停车按钮！');
}
},
+ // 删除无用数据
+ handleDelete() {
+ this.$confirm('您是否确定一键删除无用数据？', this.$t('tip.hint'), {
+ confirmButtonText: this.$t('tip.confirm'),
+ cancelButtonText: this.$t('tip.cancel'),
+ type: 'warning'
+ }).then(() => {
+ const models = [];
+ this.espList.forEach(item => {
+ const model = this.$store.getters['map/getDeviceByCode'](item.standCode);
+ if (!model) {
+ models.push(deepAssign(item, { _dispose: true }));
+ }
+ });
+ models.length && this.$emit('updateMapModel', models);
+ this.$message.success('删除成功!');
+ }).catch(() => {
+ this.$message.info('删除失败');
+ });
+ },
updateMapModel(data) {
this.$emit('updateMapModel', data);
this.field = '';
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
index a692ff394..a1a6d0f53 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
@@ -406,7 +406,7 @@ export default {
models.push(deepAssign(item, { _dispose: true }));
}
});
- const arrList = ['signalList', 'stationList', 'stationStandList', 'psdList', 'axleCounterResetButtonList', 'tbStrategyList', 'zcList', 'cycleButtonList', 'totalGuideLockButtonVOList', 'automaticRouteButtonList', 'outerFrameList', 'directionRodList', 'textList'];
+ const arrList = ['signalList', 'stationList', 'psdList', 'axleCounterResetButtonList', 'tbStrategyList', 'zcList', 'cycleButtonList', 'totalGuideLockButtonVOList', 'automaticRouteButtonList', 'outerFrameList', 'directionRodList', 'textList'];
arrList.forEach(itemName => {
map[itemName] && map[itemName].forEach(item => {
const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
@@ -415,6 +415,14 @@ export default {
}
});
});
+ map.stationStandList.forEach(item => {
+ const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
+ if (flag) {
+ models.push(deepAssign(item, { _dispose: true }));
+ const esp = map.espList.find(ele => ele.standCode == item.code);
+ esp && models.push(deepAssign(esp, { _dispose: true }));
+ }
+ });
// map.signalList.forEach(item => {
// const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
// if (flag) {
@@ -427,14 +435,6 @@ export default {
// models.push(deepAssign(item, { _dispose: true }));
// }
// });
- // map.stationStandList.forEach(item => {
- // const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
- // if (flag) {
- // models.push(deepAssign(item, { _dispose: true }));
- // const esp = map.espList.find(ele => ele.standCode == item.code);
- // esp && models.push(deepAssign(esp, { _dispose: true }));
- // }
- // });
// map.psdList && map.psdList.forEach(item => {
// const flag = this.fromModel.right ? item.position.x > pointX : item.position.x < pointX;
// if (flag) {
From 407d1d421babbf17e0d228e807378eb9bae794e3 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 8 Dec 2020 11:26:45 +0800
Subject: [PATCH 14/52] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=BB=BA?=
=?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/mapList.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/utils/mapList.js b/src/utils/mapList.js
index 0c791c502..211663807 100644
--- a/src/utils/mapList.js
+++ b/src/utils/mapList.js
@@ -1,5 +1,6 @@
import { getSessionStorage } from '@/utils/auth';
-import { listPublishMap, getMapListByProjectCode } from '@/api/jmap/map';
+// listPublishMap
+import { getMapListByProjectCode, getPublishMapListOnline } from '@/api/jmap/map';
import { ProjectCode } from '@/scripts/ProjectConfig';
export async function getMapListByProject() {
@@ -8,7 +9,8 @@ export async function getMapListByProject() {
if (project.endsWith('xty') || project.endsWith('gzb') || project.endsWith('heb')) {
mapList = await getMapListByProjectCode(ProjectCode[project]);
} else {
- mapList = await listPublishMap({ 'drawWay': true });
+ // mapList = await listPublishMap({ 'drawWay': true });
+ mapList = await getPublishMapListOnline();
}
return mapList;
}
From 7a607d308d9b6c04c3e9d9f75622ca1a35fb27d9 Mon Sep 17 00:00:00 2001
From: sunzhenyu
Date: Tue, 8 Dec 2020 11:28:34 +0800
Subject: [PATCH 15/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
=?UTF-8?q?=E5=AE=A2=E6=B5=81pis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jl3dtrafficplan/connect/trainconnect.js | 7 +-
.../jl3dtrafficplan/jl3dtraffictrain.js | 9 +-
.../jl3dtrafficplan/loader/trainconfig.js | 2 +-
.../jl3dtrafficplan/utils/trainpiscanvas.js | 128 ++++++++++++++++++
.../jlmap3d/trafficplan/jl3dtraffictrain.vue | 15 ++
static/trafficplan/directdown.jpg | Bin 0 -> 36497 bytes
static/trafficplan/directtop.jpg | Bin 0 -> 36482 bytes
7 files changed, 157 insertions(+), 4 deletions(-)
create mode 100644 src/jlmap3d/jl3dtrafficplan/utils/trainpiscanvas.js
create mode 100644 static/trafficplan/directdown.jpg
create mode 100644 static/trafficplan/directtop.jpg
diff --git a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
index 8e9dbd4bf..151b6a7fb 100644
--- a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
+++ b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
@@ -75,8 +75,13 @@ export function TrainConnect(trafficTrain,deviceaction,toptrain,routegroup,passe
}
if(data.type == "TRAIN_PIS"){
- console.log(data);
+ for(let i=0;i