From 52816d63978aaee531709af3a1500e6d847e4dcb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 2 Dec 2019 09:49:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4link=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/newMapdraft/mapoperate/section.vue | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section.vue b/src/views/newMap/newMapdraft/mapoperate/section.vue
index b1645b830..784605dfc 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section.vue
@@ -226,7 +226,6 @@ export default {
     data() {
         return {
             questionList: [],
-            linksCollection: [],
             activeName: 'first',
             SectionTypeList: [],
             SectionSepTypeList: [],
@@ -264,7 +263,6 @@ export default {
                 relSwitchCode: '',
                 stationCode: '',
                 logicSectionNameSort: '',
-                linkCode: '',
                 sepTypeLeft: '',
                 offsetLeft: 0,
                 sepTypeRight: '',
@@ -735,7 +733,6 @@ export default {
                 logicSectionNum: [],
                 logicSectionShow: model.logicSectionShow,
                 stationCode: model.stationCode,
-                linkCode: model.linkCode,
                 offsetLeft: middleOffset * (index) + model.offsetLeft,
                 offsetRight: middleOffset * (index + 1) + model.offsetLeft,
                 sepTypeLeft: '00',
@@ -882,7 +879,7 @@ export default {
                             copySection.trainPosType = model.trainPosType;
                             models.push(copySection);
                         }
-                        if (section.linkCode == model.linkCode && model.code != section.code && section.type == '01') {
+                        if (model.code != section.code && section.type == '01') {
                             const lastIndex = this.oldPoint.length - 1;
                             const copySection = deepAssign({}, section);
                             if (this.oldPoint[0].x == section.points[section.points.length - 1].x && this.oldPoint[0].y == section.points[section.points.length - 1].y) {
@@ -965,7 +962,6 @@ export default {
                                 offsetLeft: selected.offsetLeft,
                                 sepTypeRight: index == this.addModel.splitNumber ? selected.sepTypeRight : '01', // 右侧分隔符类型 (终点右侧按原来区段类型走 其余 默认 01)
                                 offsetRight: selected.offsetRight,
-                                linkCode: selected.linkCode,
                                 trainPosType: this.addModel.trainPosType,
                                 isCurve: selected.isCurve,
                                 lengthFact: 0,
@@ -987,7 +983,7 @@ export default {
                             if (index === 0) {
                                 elem.leftSection = selected.leftSection;
                                 elem.rightSection = models[index + 1].code;
-                            } else if (index === models.length-1) {
+                            } else if (index === models.length - 1) {
                                 elem.leftSection = models[index - 1].code;
                                 elem.rightSection = selected.rightSection;
                             } else {
@@ -1024,10 +1020,6 @@ export default {
                         }
 
                         if (rsection && lsection) {
-                            if (lsection.linkCode !== rsection.linkCode) {
-                                this.$messageBox(this.$t('tip.linkCannotMerged'));
-                                return;
-                            }
                             const uid = getUID('Section');
                             const model = {
                                 _type: 'Section',
@@ -1168,18 +1160,5 @@ export default {
 			padding: 18px 0;
 		}
 	}
-	.link_box_select{
-		padding: 10px 20px;
-        .title{
-            width: 100px;
-            display: block;
-            float: left;
-            text-align: right;
-            line-height: 28px;
-            font-weight: 700;
-            font-size: 14px;
-            color: #606266;
-        }
-	}
 
 </style>

From 4b7683248cb68db9e08d67436ebde98a894c293e Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 2 Dec 2019 11:12:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/newMapdraft/mapoperate/section.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section.vue b/src/views/newMap/newMapdraft/mapoperate/section.vue
index 784605dfc..5eff303c9 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section.vue
@@ -517,6 +517,7 @@ export default {
             if (this.sectionList && this.sectionList.length) {
                 list = this.sectionList.filter(elem => { return elem.type === '01'; });
             }
+            list.unshift({code: '', name: '无'});
             return list;
         },
         ReverseSectionList() {