From 4361d503f385a93968d5b83d9f0e40f3f3501754 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 9 Dec 2020 15:03:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=A1=E5=8F=B7=E6=9C=BA?=
 =?UTF-8?q?=E8=81=94=E9=94=81=E7=AB=99=E8=AE=BE=E7=BD=AE=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/mapoperate/signal/index.vue     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
index 4ed37c12d..f087cd2b0 100644
--- a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
@@ -69,8 +69,8 @@
           </div>
           <el-form ref="signalCiStation1" label-width="130px" :model="ciModelForm" size="mini" :rules="ciModelFormRules" style="margin-top: 15px;">
             <el-form-item label="信号机选择:" prop="signalList">
-              <el-select v-model="ciModelForm.signalList" multiple placeholder="请选择">
-                <el-option v-for="item in signalList" :key="item.code" :label="item.name" :value="item.code" />
+              <el-select v-model="ciModelForm.signalList" multiple filterable placeholder="请选择">
+                <el-option v-for="item in filterSignalList" :key="item.code" :label="item.name" :value="item.code" />
               </el-select>
               <el-button
                 :type="field == 'signalCodes' ? 'danger' : 'primary'"
@@ -296,6 +296,17 @@ export default {
             }
             return list;
         },
+        // 未设置联锁站信号机列表
+        filterSignalList() {
+            let list = [];
+            if (this.signalList && this.signalList.length) {
+                list = this.signalList.filter(elem => {
+                    return !elem.interlockStationCode;
+                });
+            }
+            console.log(list, '过滤信号机联锁');
+            return list;
+        },
         form() {
             return {
                 labelWidth: '150px',
@@ -348,7 +359,7 @@ export default {
                         name: this.$t('map.mapData'),
                         item: [
                             { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.centralizedStationList },
-                            { prop: 'interlockStationCode', label: '所属联锁站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.ciStationList},
+                            { prop: 'interlockStationCode', label: '所属联锁站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.ciStationList},
                             { prop: 'uniqueName', label: this.$t('map.signalUniqueName'), type: 'input' },
                             { prop: 'sectionCode', label: this.$t('map.belongsSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.signalSectionList, hover: this.hover, buttonType: 'signalSection', buttonShowType: this.signalSectionShow },
                             { prop: 'sectionOffset', label: this.$t('map.signalOffset'), type: 'number', min: 0, placeholder: this.$t('tip.meter') }