From fa70285ef90c834b5136748f40445c628b27e89d Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 9 Sep 2020 09:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A5=BF=E5=AE=89=E4=BA=8C?=
 =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E5=88=97=E8=BD=A6=E5=8F=B3=E9=94=AE=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Section/index.js            | 20 -----------
 .../xian_02/menus/dialog/trainDestination.vue | 34 +++++++++++--------
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index dd130129c..5dbc03e9e 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -718,7 +718,6 @@ export default class Section extends Group {
                 lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
             });
         }
-        // this.protectiveTimeRelease();
     }
 
     // /** 延时释放*/
@@ -741,25 +740,6 @@ export default class Section extends Group {
     //     }
     // }
 
-    /** 保护区段延时解锁 时间计时*/
-    protectiveTimeRelease() {
-        // console.log(this.model);
-        // this.releaseName.setStyle('text', '20');
-        // this.section.setStyle({
-        //     stroke: this.style.Section.line.protectiveLockColor,
-        //     lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-        // });
-        // this.release && this.release.show();
-        // this.release && this.release.setStyle({
-        //     stroke: this.style.Section.line.protectiveLockColor,
-        //     lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-        // });
-        // this.release && this.release.animateStyle(true, [
-        //     { time: 1000, styles: { stroke: this.style.Section.line.protectiveLockColor } },
-        //     { time: 2000, styles: { stroke: this.style.Section.line.protectiveTimeReleaseColor } }
-        // ]);
-    }
-
     /** 区段切除*/
     sectionCutOff() {
         const lineWidth = this.style.Section.line.width + (this.model.status != '01' ? this.style.Section.line.beyondWidth : 0);
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
index 0d66de4b9..2dea091f2 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
@@ -41,7 +41,7 @@
       <el-col :span="12">
         <el-select v-model="addModel.operation" placeholder="请选择">
           <el-option
-            v-for="item in typeList"
+            v-for="item in typeList1"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -50,7 +50,7 @@
       </el-col>
     </el-row>
     <el-row class="option_box">
-      <div v-for="(item, index) in optionObject[addModel.operation]" :key="index" class="content_list" :class="{'active': item.active}" @click="handleOption(item)">{{ item.name }}</div>
+      <div v-for="(item, index) in optionObject" :key="index" class="content_list" :class="{'active': item.active}" @click="handleOption(item)">{{ item.name }}</div>
     </el-row>
     <el-row class="option_result_box" />
     <el-row justify="center" class="button-group">
@@ -81,13 +81,16 @@ export default {
         return {
             trainNoList: [],
             selected: null,
-            optionObject: {},
+            optionObject: [],
             typeList: [
                 { label: '往返运营', value: 'NORMAL_OPERATION' },
                 { label: '末班运营', value: 'LAST_OPERATION' },
                 { label: '非运营', value: 'NON_OPERATION' },
                 { label: '末班非运营', value: 'LAST_NON_OPERATION' }
             ],
+            typeList1: [
+                { label: '往返运营', value: 'NORMAL_OPERATION' }
+            ],
             addModel: {
                 groupNumber: '',
                 serviceNumber: '',
@@ -133,7 +136,7 @@ export default {
             if (!this.dialogShow) {
                 this.addModel.groupNumber = selected.groupNumber;
                 this.addModel.serviceNumber = selected.serviceNumber;
-                this.addModel.destinationCode = parseInt(selected.destinationCode) || selected.destinationCode;
+                this.addModel.destinationCode = parseInt(selected.destinationCode) || 0;
                 this.addModel.trainDestinationCode = '';
                 this.trainDestinationCode = '';
             }
@@ -154,20 +157,23 @@ export default {
                 const lable = this.typeList.find(ele => ele.value == item.type);
                 item['active'] = false;
                 item['name'] = `${item.code}  ${item.description}  ${lable.label}`;
-                if (this.optionObject[item.type]) {
-                    this.optionObject[item.type].push(item);
-                } else {
-                    this.optionObject[item.type] = [item];
-                }
+                item['code'] = `0000${item.code}`;
+                item['code'] = item['code'].substring(item['code'].length - 4);
+                // if (this.optionObject[item.type]) {
+                // this.optionObject[item.type].push(item);
+                // } else {
+                //     this.optionObject[item.type] = [item];
+                // }
+                this.optionObject.push(item);
             });
         },
         handleOption(item) {
             this.addModel.trainDestinationCode = `${parseInt(item.code)}`;
-            for (const key in this.optionObject) {
-                this.optionObject[key].forEach(item => {
-                    item.active = false;
-                });
-            }
+            // for (const key in this.optionObject) {
+            this.optionObject.forEach(item => {
+                item.active = false;
+            });
+            // }
             item.active = true;
             this.trainDestinationCode = item.code;
         },