From 2a851dc51f10d2acaefdb61741ebc294096eecf0 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 2 Dec 2019 14:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BBselect?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=AF=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/newMapdraft/mapoperate/config/list.vue | 2 ++
 src/views/newMap/newMapdraft/mapoperate/section.vue     | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
index 95a452f8e..8595d309a 100644
--- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
@@ -12,6 +12,7 @@
                   filterable
                   :placeholder="item.placeholder"
                   :disabled="item.disabled"
+                  :clearable="item.clearable"
                   @change="item.deviceChange"
                 >
                   <el-option
@@ -28,6 +29,7 @@
                   filterable
                   :placeholder="item.placeholder"
                   :disabled="item.disabled"
+                  :clearable="item.clearable"
                 >
                   <el-option
                     v-for="option in item.options"
diff --git a/src/views/newMap/newMapdraft/mapoperate/section.vue b/src/views/newMap/newMapdraft/mapoperate/section.vue
index 184e69659..5ccd974c9 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section.vue
@@ -383,8 +383,8 @@ export default {
                                 { prop: 'namePosition.y', firstLevel: 'namePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
                             ] },
                             { prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList},
-                            { prop: 'leftSection', label: '左关联区段', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.PhysicalSectionList},
-                            { prop: 'rightSection', label: '右关联区段', type: 'select', optionLabel: 'name', optionValue: 'code', options: this.PhysicalSectionList},
+                            { prop: 'leftSection', label: '左关联区段', type: 'select', optionLabel: 'name', optionValue: 'code', clearable: true, options: this.PhysicalSectionList},
+                            { prop: 'rightSection', label: '右关联区段', type: 'select', optionLabel: 'name', optionValue: 'code', clearable: true, options: this.PhysicalSectionList},
                             { prop: 'parentCode', label: this.$t('map.associatedSection'), type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: true, options: this.sectionList, isHidden: !this.isParentCode },
 
                             { prop: 'isStandTrack', label: this.$t('map.isStandTrack'), type: 'checkbox', isHidden: !this.isStandTrackShow }, // 1
@@ -458,6 +458,8 @@ export default {
                 const leftSection = this.$store.getters['map/getDeviceByCode'](value);
                 if (leftSection && (leftSection.points[1].x !== this.selected.points[0].x || leftSection.points[1].y !== this.selected.points[0].y )) {
                     callback(new Error('所选择关联区段不相邻！'));
+                // } else if (this.editModel.type === '03' && !this.editModel.rightSection && !value) {
+                //     callback(new Error('道岔区段需有一侧关联区段'));
                 } else {
                     callback();
                 }
@@ -466,6 +468,8 @@ export default {
                 const rightSection = this.$store.getters['map/getDeviceByCode'](value);
                 if (rightSection && (rightSection.points[0].x !== this.selected.points[1].x || rightSection.points[0].y !== this.selected.points[1].y )) {
                     callback(new Error('所选择关联区段不相邻！'));
+                // } else if (this.editModel.type === '03' && !this.editModel.leftSection && !value) {
+                //     callback(new Error('道岔区段需有一侧关联区段'));
                 } else {
                     callback();
                 }