-
+
+
-
+
diff --git a/src/views/designPlatform/userIndex.vue b/src/views/designPlatform/userIndex.vue
index b1c1ef93b..a856f93e6 100644
--- a/src/views/designPlatform/userIndex.vue
+++ b/src/views/designPlatform/userIndex.vue
@@ -1,20 +1,13 @@
-
+ {{ $t('map.publishedMapList') }}
+
+
+
{{ tnode.label }}
-
-
+
+
+
-
-
-
-
+
+
@@ -47,9 +40,6 @@ export default {
...mapGetters([
'lessonbar'
]),
- height() {
- return this.$store.state.app.height - 50;
- },
width() {
return this.$store.state.app.width;
}
@@ -140,8 +130,6 @@ export default {
}
.examList {
- // position: fixed;
- // top: 61px;
float: left;
height: 100%;
}
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
index 263a90896..0e1572878 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
@@ -104,6 +104,7 @@
-
-
+
-
-
+
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
index 1898eb398..19d25c0ed 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
@@ -107,6 +107,7 @@
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/line.vue b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
index c3476f8c1..0ab514631 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/line.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
@@ -161,7 +161,7 @@ export default {
{ prop: 'code', label: this.$t('map.lineCoding'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.lineList, change: true, deviceChange: this.deviceChange },
{ prop: 'type', label: this.$t('map.lineType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.LineTypeList },
{ prop: 'width', label: this.$t('map.lineWidth'), type: 'number', min: 1, placeholder: 'px' },
- { prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '120px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }
+ { prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }
]
},
map: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index e96b8fcea..a4566e08d 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -130,7 +130,7 @@
选择link:
-
+
{
- if (section.linkCode == this.linkCode) {
- const selectedSection = this.$store.getters['map/getDeviceByCode'](section.code);
- selected.push(selectedSection);
- this.switchList.forEach(switchEle => {
- if (section.relSwitchCode == switchEle.code) {
- const selectedSwitch = this.$store.getters['map/getDeviceByCode'](switchEle.code);
- switchList.push(selectedSwitch);
- }
- });
- }
+ this.linkCode.forEach(linkCode => {
+ this.sectionList.forEach(section => {
+ if (section.linkCode == linkCode) {
+ const selectedSection = this.$store.getters['map/getDeviceByCode'](section.code);
+ selected.push(selectedSection);
+ this.switchList.forEach(switchEle => {
+ if (section.relSwitchCode == switchEle.code) {
+ const selectedSwitch = this.$store.getters['map/getDeviceByCode'](switchEle.code);
+ switchList.push(selectedSwitch);
+ }
+ });
+ }
+ });
});
this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'),
@@ -1123,6 +1124,7 @@ export default {
});
await this.$emit('delMapModel', selected);
this.deviceSelect();
+ this.linkCode = '';
}).catch(() => {
this.$message.info(this.$t('tip.cancelledDelete'));
});
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index 08b6eb31f..979639b0f 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -171,15 +171,15 @@ export default {
create() { // 一键生成道岔
this.questionList = []; // 有问题区段列表
const models = [];
- // const remove = [];
const linkObj = {};
this.linkList.forEach(link => {
if (link && link.leftFdCode && link.leftSdCode) { // 左侧同时都有关联link
linkObj[`${link.code}`] = { name: '', num: 0 };
} else if (link && link.rightFdCode && link.rightSdCode) { // 右侧同时都有关联link
linkObj[`${link.code}`] = { name: '', num: 0 };
+ } else if (link && link.leftFdCode && !link.leftSdCode && link.rightFdCode && !link.rightSdCode) { // 左右正向link关联，侧向link不关联检测
+ linkObj[`${link.code}`] = { name: '', num: 0 };
}
-
});
this.sectionList.forEach(section => {
for (const link in linkObj) {
@@ -227,7 +227,7 @@ export default {
}
};
const swch = this.findSwitchData(model.sectionACode, model.sectionBCode, model.sectionCCode);
- !swch && models.push(model);
+ !swch && models.push(model); // 已有的道岔不在创建
}
}
}
@@ -273,6 +273,16 @@ export default {
}
}
});
+ const createArr = [];
+ models.forEach((item) => {
+ const sectionA = this.$store.getters['map/getDeviceByCode'](item.sectionACode);
+ const sectionB = this.$store.getters['map/getDeviceByCode'](item.sectionBCode);
+ const sectionC = this.$store.getters['map/getDeviceByCode'](item.sectionCCode);
+ if (linkObj[sectionA.linkCode].num != 1 && linkObj[sectionB.linkCode].num != 1 && linkObj[sectionC.linkCode].num != 1 ) {
+ createArr.push(item);
+ }
+ });
+ // console.log(models, createArr, '创建道岔list');
this.$confirm(this.$t('tip.confirmBatchGeneration'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'),
@@ -280,14 +290,11 @@ export default {
}).then(() => {
for (const link in linkObj) {
if (linkObj[link].num == 1) {
- this.questionList.push(`${this.$t('map.section')}${linkObj[link].name}${this.$t('tip.linkNoneSplit')}`);
+ this.questionList.push(`${this.$t('map.section')}${linkObj[link].name}${this.$t('tip.linkNoneSplit')}, ${this.$t('tip.createSwitchPortion')}`);
}
}
- if (!this.questionList.length) { // 没有问题list 再去创建
- // this.$emit('delMapModel', remove);
- this.$emit('addOrUpdateMapModel', models);
- this.createSwitchSection(models);
- }
+ this.$emit('addOrUpdateMapModel', createArr);
+ this.createSwitchSection(createArr);
}).catch(() => {
this.$message({
type: 'info',
From 60c58fe290ae0a4820eadc1a3253a2cd978c9a9e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 28 Oct 2019 18:42:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E4=B8=AA?=
=?UTF-8?q?=E4=BA=BA=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6=20=E5=85=81?=
=?UTF-8?q?=E8=AE=B8=E6=BB=9A=E8=BD=AE=E4=BA=8B=E4=BB=B6,=20=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E5=8C=BA=E6=AE=B5=E5=9D=90=E6=A0=87?=
=?UTF-8?q?=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmap/map.js | 2 ++
src/views/designPlatform/mapPreview.vue | 5 +----
src/views/jlmap/index.vue | 9 ++++++++-
.../mapdraft/mapedit/mapoperate/section.vue | 18 +++++++++++++++++-
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/jmap/map.js b/src/jmap/map.js
index 5800b8714..cd50c6fb3 100644
--- a/src/jmap/map.js
+++ b/src/jmap/map.js
@@ -40,6 +40,7 @@ class Jlmap {
initMapInstance(opts) {
const width = opts.dom.clientWidth;
const height = opts.dom.clientHeight;
+ this.zoomOnMouseWheel = opts.options.zoomOnMouseWheel;
this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
@@ -125,6 +126,7 @@ class Jlmap {
if (this.$options.disabled == true) {
this.$mouseController.disable();
} else {
+ opts['zoomOnMouseWheel'] = this.zoomOnMouseWheel;
this.$mouseController.enable(opts);
}
diff --git a/src/views/designPlatform/mapPreview.vue b/src/views/designPlatform/mapPreview.vue
index 206646eaf..3307c0814 100644
--- a/src/views/designPlatform/mapPreview.vue
+++ b/src/views/designPlatform/mapPreview.vue
@@ -1,6 +1,6 @@
-