From 1e1f9a598d62fb248c7e4d83c9eae4bfee8dac0e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 18 Dec 2019 17:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AB=98=E7=BA=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataRelation/automaticoperate/route.vue   | 30 ++++++-----
 .../dataRelation/routeoperate/route.vue       | 50 ++++---------------
 .../newMapdraft/mapoperate/signal/index.vue   |  1 +
 3 files changed, 25 insertions(+), 56 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
index 82580a08a..eee38d7ef 100644
--- a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
@@ -29,25 +29,19 @@
               @click="hover('sectionList')"
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
-          <el-form-item :label="$t('map.psdList') + ':'" prop="psdList">
-            <el-select v-model="addModel.psdList" multiple clearable :filterable="true">
+          <el-form-item label="关联站台列表:" prop="stationStandList">
+            <el-select v-model="addModel.stationStandList" multiple clearable :filterable="true" style="width: 220px;">
               <el-option
-                v-for="item in psdList"
-                :key="item.code"
-                :label="item.name + ' (' + item.code+ ')'"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('map.espList') + ':'" prop="espList">
-            <el-select v-model="addModel.espList" multiple clearable :filterable="true">
-              <el-option
-                v-for="item in espList"
+                v-for="item in stationStandList"
                 :key="item.code"
                 :label="item.name + ' (' + item.code+ ')'"
                 :value="item.code"
               />
             </el-select>
+            <el-button
+              :type=" field === 'routeStationStandList' ? 'danger' : 'primary'"
+              @click="hover('routeStationStandList')"
+            >{{ $t('map.activate') }}</el-button>
           </el-form-item>
           <el-form-item :label="$t('map.alwaysRed') + ':'" prop="alwaysRed">
             <el-radio-group v-model="addModel.alwaysRed">
@@ -111,8 +105,7 @@ export default {
                 signalCode: '',
                 alwaysRed: true,
                 sectionList: [],
-                psdList: [],
-                espList: []
+                stationStandList: []
             },
             editShow: false,
             rules: {
@@ -128,7 +121,8 @@ export default {
     computed: {
         ...mapGetters('map', [
             'signalList',
-            'sectionList'
+            'sectionList',
+            'stationStandList'
         ])
     },
     watch: {
@@ -162,6 +156,10 @@ export default {
                     if (this.addModel.sectionList.indexOf(selected.code) === -1) {
                         this.addModel.sectionList.push(selected.code);
                     }
+                } else if (selected._type.toUpperCase() === 'StationStand'.toUpperCase() && this.field.toUpperCase() === 'routeStationStandList'.toUpperCase()) {
+                    if (this.addModel.stationStandList.indexOf(selected.code) === -1) {
+                        this.addModel.stationStandList.push(selected.code);
+                    }
                 }
             }
         },
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index cdb656536..551e06945 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -168,30 +168,20 @@
             </el-table-column>
           </el-table>
         </el-form-item>
-        <el-form-item :label="$t('map.psdList') + ':'" prop="psdList">
-          <el-select v-model="addModel.psdList" multiple clearable :filterable="true">
+        <el-form-item label="关联站台列表:" prop="stationStandList">
+          <el-select v-model="addModel.stationStandList" multiple clearable :filterable="true" style="width: 220px;">
             <el-option
-              v-for="item in psdList"
+              v-for="item in stationStandList"
               :key="item.code"
               :label="item.name + ' (' + item.code+ ')'"
               :value="item.code"
             />
           </el-select>
           <el-button
-            :type=" field === 'routePsdList' ? 'danger' : 'primary'"
-            @click="hover('routePsdList')"
+            :type=" field === 'routeStationStandList' ? 'danger' : 'primary'"
+            @click="hover('routeStationStandList')"
           >{{ $t('map.activate') }}</el-button>
         </el-form-item>
-        <el-form-item :label="$t('map.espList') + ':'" prop="espList">
-          <el-select v-model="addModel.espList" multiple clearable :filterable="true">
-            <el-option
-              v-for="item in espList"
-              :key="item.code"
-              :label="item.name + ' (' + item.code+ ')'"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
         <el-form-item label="关联延续保护区段:" prop="overlapCode">
           <el-input v-model="overlapName" style="width: 178px" readonly="true" />
           <el-button type="primary" @click="selectedOverlapCode">选择</el-button>
@@ -205,11 +195,6 @@
               :value="item.code"
             />
           </el-select>
-          <!-- <el-button type="primary" @click="selectedConflictingRouteList">选择</el-button> -->
-          <!-- <el-button
-            :type=" field === 'conflictingRouteList' ? 'danger' : 'primary'"
-            @click="hover('conflictingRouteList')"
-          >{{ $t('map.activate') }}</el-button> -->
         </el-form-item>
         <el-form-item>
           <el-button-group>
@@ -287,8 +272,7 @@ export default {
                 routeSectionList: [], // 进路物理区段
                 routeSwitchList: [], // 进路道岔列表
                 routeFlankProtectionList: [], // 进路侧防道岔列表
-                psdList: [], // 站台屏蔽门数据列表
-                espList: [], // 站台紧急停车按钮数据
+                stationStandList: [], // 站台数据列表
                 overlapCode:'',
                 conflictingRouteList: [] // 敌对进路
             },
@@ -302,8 +286,6 @@ export default {
             'switchList',
             'sectionList',
             'stationList',
-            'espList',
-            'psdList',
             'stationStandList'
         ]),
         routeName: {
@@ -373,9 +355,6 @@ export default {
         }
     },
     mounted() {
-        // this.$Dictionary.normal().then(list => {
-        //     this.SwitchLocateTypeList = list;
-        // });
         this.getRouteList();
     },
     methods: {
@@ -464,9 +443,6 @@ export default {
                 this.addModel.routeFlankProtectionList = [];
                 this.overlapName = '';
                 this.addModel.overlapCode = '';
-                // if (this.selected && this.selected._type.toUpperCase() === 'Station'.toUpperCase()) {
-                //     this.addModel.stationCode = this.selected.code;
-                // }
                 this.isSave = true;
             }
         },
@@ -481,14 +457,6 @@ export default {
         },
         setSelected(selected) {
             if (selected) {
-                // if (selected._type.toUpperCase() === 'Station'.toUpperCase()) {
-                //     this.addModel.stationCode = selected.code;
-                // } else
-                // else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'conflictingRouteList'.toUpperCase()) {
-                //     if (this.addModel.conflictingRouteList.indexOf(selected.code) === -1) {
-                //         this.addModel.conflictingRouteList.push(selected.code);
-                //     }
-                // }
                 if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'startSignalCode'.toUpperCase()) {
                     this.addModel.startSignalCode = selected.code;
                 } else if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'endSignalCode'.toUpperCase()) {
@@ -501,8 +469,10 @@ export default {
                     this.routeCode = selected.code;
                 } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase() && this.field.toUpperCase() === 'routeFlankProtectionList'.toUpperCase()) {
                     this.flankCode = selected.code;
-                } else if (selected._type.toUpperCase() === 'Psd'.toUpperCase() && this.field.toUpperCase() === 'routePsdList'.toUpperCase()) {
-                    this.addModel.psdList.push(selected.code);
+                } else if (selected._type.toUpperCase() === 'StationStand'.toUpperCase() && this.field.toUpperCase() === 'routeStationStandList'.toUpperCase()) {
+                    if (this.addModel.stationStandList.indexOf(selected.code) === -1) {
+                        this.addModel.stationStandList.push(selected.code);
+                    }
                 }
             }
         },
diff --git a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
index c2efb2d29..acee40db0 100644
--- a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
@@ -330,6 +330,7 @@ export default {
                         models.push(signalModel);
                     });
                     this.$emit('updateMapModel', models);
+                    this.$message.success('数据构建成功!');
                 }
             });
         },