From 1d63ad4b362b7802790d2e50abbf24e108834cce Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Sun, 26 Apr 2020 18:49:22 +0800
Subject: [PATCH 1/5] =?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

---
 .../dataRelation/dwellTimeOperate/dwellTime.vue           | 2 +-
 .../newMapdraft/dataRelation/routingoperate/route.vue     | 8 +++++---
 .../newMapdraft/dataRelation/runLeveloperate/detail.vue   | 5 ++++-
 .../newMapdraft/dataRelation/runLeveloperate/route.vue    | 6 ++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
index 6af6d89a4..e9ba5804c 100644
--- a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
@@ -4,7 +4,7 @@
       <el-form ref="form" :model="addModel" :rules="rules" label-width="80px" size="mini">
         <div class="definition">
           <el-form-item label="停站车站" prop="stationCode">
-            <el-select v-model="addModel.stationCode" clearable :filterable="true">
+            <el-select v-model="addModel.stationCode" clearable :filterable="true" :disabled="editShow">
               <el-option
                 v-for="item in stationList"
                 :key="item.code"
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index 1edb10456..74895d6d1 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -21,7 +21,7 @@
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
           <el-form-item :label="$t('map.startSectionColon')" prop="startSectionCode" @change="changeStartSection()">
-            <el-select v-model="addModel.startSectionCode" clearable :filterable="true">
+            <el-select v-model="addModel.startSectionCode" clearable :filterable="true" :disabled="editShow">
               <el-option
                 v-for="item in filterSectionList"
                 :key="item.code"
@@ -30,6 +30,7 @@
               />
             </el-select>
             <el-button
+              :disabled="editShow"
               :type=" field === 'startSectionCode' ? 'danger' : 'primary'"
               @click="hover('startSectionCode')"
             >{{ $t('map.activate') }}</el-button>
@@ -49,7 +50,7 @@
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
           <el-form-item :label="$t('map.endSectionColon')" prop="endSectionCode" @change="changeEndSection()">
-            <el-select v-model="addModel.endSectionCode" clearable :filterable="true">
+            <el-select v-model="addModel.endSectionCode" clearable :filterable="true" :disabled="editShow">
               <el-option
                 v-for="item in filterSectionList"
                 :key="item.code"
@@ -58,11 +59,12 @@
               />
             </el-select>
             <el-button
+              :disabled="editShow"
               :type=" field === 'endSectionCode' ? 'danger' : 'primary'"
               @click="hover('endSectionCode')"
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
-          <el-form-item :label="$t('map.destinationCode')" prop="destinationCode">
+          <el-form-item :label="$t('map.destinationCode')" prop="destinationCode" :disabled="editShow">
             <el-input v-model="addModel.destinationCode" />
           </el-form-item>
           <el-form-item :label="$t('map.routingDirection')" prop="directionCode">
diff --git a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
index 308c89068..4c12cf2d3 100644
--- a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
@@ -89,7 +89,10 @@ export default {
                     },
                     {
                         title: '站间距离',
-                        prop: 'distance'
+                        prop: 'distance',
+                        type: 'tag',
+                        columnValue: (row) => { return row.distance + ' m'; },
+                        tagType: (row) => { return 'success'; }
                     },
                     {
                         title: '第一等级时间',
diff --git a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue
index e826094c7..7607a8827 100644
--- a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue
@@ -19,7 +19,7 @@
               >{{ $t('map.activate') }}</el-button>
             </el-form-item>
             <el-form-item :label="$t('map.startSectionColon')" prop="startSectionCode">
-              <el-select v-model="addModel.startSectionCode" clearable :filterable="true">
+              <el-select v-model="addModel.startSectionCode" clearable :filterable="true" :disabled="editShow">
                 <el-option
                   v-for="item in filterSectionList"
                   :key="item.code"
@@ -28,6 +28,7 @@
                 />
               </el-select>
               <el-button
+                :disabled="editShow"
                 :type=" field === 'startSectionCode' ? 'danger' : 'primary'"
                 @click="hover('startSectionCode')"
               >{{ $t('map.activate') }}</el-button>
@@ -47,7 +48,7 @@
               >{{ $t('map.activate') }}</el-button>
             </el-form-item>
             <el-form-item :label="$t('map.endSectionColon')" prop="endSectionCode">
-              <el-select v-model="addModel.endSectionCode" clearable :filterable="true">
+              <el-select v-model="addModel.endSectionCode" clearable :filterable="true" :disabled="editShow">
                 <el-option
                   v-for="item in filterSectionList"
                   :key="item.code"
@@ -56,6 +57,7 @@
                 />
               </el-select>
               <el-button
+                :disabled="editShow"
                 :type=" field === 'endSectionCode' ? 'danger' : 'primary'"
                 @click="hover('endSectionCode')"
               >{{ $t('map.activate') }}</el-button>

From f318854de7b487cdbfe471d705089a4263a6cf43 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 27 Apr 2020 10:06:17 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E7=89=88=E7=BB=98=E5=9B=BE=20=20?=
 =?UTF-8?q?=E4=BA=A4=E8=B7=AF=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

---
 .../dataRelation/routingoperate/route.vue     | 83 ++++++++++++++-----
 1 file changed, 61 insertions(+), 22 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index 74895d6d1..d7755bc7c 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -20,8 +20,8 @@
               @click="hover('startStationCode')"
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
-          <el-form-item :label="$t('map.startSectionColon')" prop="startSectionCode" @change="changeStartSection()">
-            <el-select v-model="addModel.startSectionCode" clearable :filterable="true" :disabled="editShow">
+          <el-form-item :label="$t('map.startSectionColon')" prop="startSectionCode">
+            <el-select v-model="addModel.startSectionCode" clearable :filterable="true" :disabled="editShow" @change="changeStartSection()">
               <el-option
                 v-for="item in filterSectionList"
                 :key="item.code"
@@ -35,8 +35,8 @@
               @click="hover('startSectionCode')"
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
-          <el-form-item :label="$t('map.endStationColon')" prop="endStationCode" @change="changeEndStation()">
-            <el-select v-model="addModel.endStationCode" clearable :filterable="true">
+          <el-form-item :label="$t('map.endStationColon')" prop="endStationCode">
+            <el-select v-model="addModel.endStationCode" clearable :filterable="true" @change="changeEndStation()">
               <el-option
                 v-for="item in filterStationList"
                 :key="item.code"
@@ -49,8 +49,8 @@
               @click="hover('endStationCode')"
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
-          <el-form-item :label="$t('map.endSectionColon')" prop="endSectionCode" @change="changeEndSection()">
-            <el-select v-model="addModel.endSectionCode" clearable :filterable="true" :disabled="editShow">
+          <el-form-item :label="$t('map.endSectionColon')" prop="endSectionCode">
+            <el-select v-model="addModel.endSectionCode" clearable :filterable="true" :disabled="editShow" @change="changeEndSection()">
               <el-option
                 v-for="item in filterSectionList"
                 :key="item.code"
@@ -297,19 +297,19 @@ export default {
         // },
         changeStartStation() {
             this.judgeAllowSelected();
-            this.addStartSectionData();
+            this.addStartSectionData(true);
         },
         changeStartSection() {
             this.judgeAllowSelected();
-            this.addStartSectionData();
+            this.addStartSectionData(false);
         },
         changeEndStation() {
             this.judgeAllowSelected();
-            this.addEndSectionData();
+            this.addEndSectionData(true);
         },
         changeEndSection() {
             this.judgeAllowSelected();
-            this.addEndSectionData();
+            this.addEndSectionData(false);
         },
         judgeAllowSelected() {
             if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '' && this.addModel.endStationCode != '' && this.addModel.endSectionCode != '') {
@@ -318,14 +318,14 @@ export default {
                 this.allowSelect = false;
             }
         },
-        addStartSectionData() {
+        addStartSectionData(isStation) {
             if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '') {
-                this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top');
+                this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation);
             }
         },
-        addEndSectionData() {
+        addEndSectionData(isStation) {
             if (this.addModel.endStationCode != '' && this.addModel.endSectionCode != '') {
-                this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom');
+                this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom', isStation);
             }
         },
         hover(field) {
@@ -339,19 +339,19 @@ export default {
                 if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'startStationCode'.toUpperCase()) {
                     this.addModel.startStationCode = selected.code;
                     this.judgeAllowSelected();
-                    this.addStartSectionData();
+                    this.addStartSectionData(true);
                 } else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'endStationCode'.toUpperCase()) {
                     this.addModel.endStationCode = selected.code;
                     this.judgeAllowSelected();
-                    this.addEndSectionData();
+                    this.addEndSectionData(true);
                 } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'startSectionCode'.toUpperCase()) {
                     this.addModel.startSectionCode = selected.code;
                     this.judgeAllowSelected();
-                    this.addStartSectionData();
+                    this.addStartSectionData(false);
                 } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'endSectionCode'.toUpperCase()) {
                     this.addModel.endSectionCode = selected.code;
                     this.judgeAllowSelected();
-                    this.addEndSectionData();
+                    this.addEndSectionData(false);
                     this.addModel.destinationCode = selected.destinationCode || '';
                 } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() == 'routingSection'.toUpperCase()) {
                     this.sectionCode = selected.code;
@@ -360,7 +360,7 @@ export default {
                 }
             }
         },
-        pushSection(data, type) {
+        pushSection(data, type, isStation) {
             const list = this.addModel.parkSectionCodeList;
             if (data && data.stationCode && data.sectionCode) {
                 const index = list.findIndex(elem => { return elem.sectionCode == data.sectionCode; });
@@ -369,16 +369,55 @@ export default {
                     if (index < 0) {
                         list.splice(list.length - 1, 0, data);
                     } else {
-                        this.$messageBox(this.$t('tip.routeSameID'));
+                        this.$messageBox('该区段已经在交路区段中存在');
                     }
                     break;
                 }
                 case 'top': {
-                    list.splice(0, 1, data);
+                    if (isStation) {
+                        if (index < 0) {
+                            list.splice(0, 1, data);
+                        }
+                    } else {
+                        if (index < 0) {
+                            list.splice(0, 1, data);
+                        } else {
+                            if (index == list.length - 1) {
+                                this.$messageBox('起始区段和终到区段不能相同');
+                                this.addModel.startSectionCode = list[0].sectionCode;
+                            } else {
+                                this.$messageBox('该区段已经在交路区段中存在');
+                            }
+                        }
+                    }
                     break;
                 }
                 case 'bottom': {
-                    list.splice(list.length, 1, data);
+                    if (isStation) {
+                        if (index < 0) {
+                            if (list.length >= 2) {
+                                list.splice(list.length - 1, 1, data);
+                            } else {
+                                list.push(data);
+                            }
+                        }
+                    } else {
+                        if (index < 0) {
+                            if (list.length >= 2) {
+                                list.splice(list.length - 1, 1, data);
+                            } else {
+                                list.push(data);
+                            }
+                        } else {
+                            if (index == 0) {
+                                this.$messageBox('起始区段和终到区段不能相同');
+                                this.addModel.endSectionCode = list[list.length - 1].sectionCode;
+                            } else {
+                                this.$messageBox('该区段已经在交路区段中存在');
+                            }
+                        }
+                    }
+
                     break;
                 }
                 default: {

From 0fb3536fff375b179812bb6d44695f558b495dbf Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 27 Apr 2020 10:54:42 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=BB=98=E5=88=B6=20=E4=BA=A4=E8=B7=AF=20=E5=81=9C=E7=AB=99?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E8=AE=BE=E7=BD=AE=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=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

---
 .../dataRelation/dwellTimeOperate/detail.vue  | 57 ++++---------------
 .../dwellTimeOperate/dwellTime.vue            | 14 ++++-
 .../dataRelation/routingoperate/detail.vue    | 23 +++++---
 .../dataRelation/runLeveloperate/detail.vue   |  4 +-
 4 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
index 75e1092b2..644f959df 100644
--- a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-dialogDrag class="autoSignal" :title="$t('map.automaticSignalList')" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag class="autoSignal" title="停站时间列表" :visible.sync="show" width="85%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"
@@ -29,7 +29,6 @@ export default {
     data() {
         return {
             show: false,
-            mapList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -37,16 +36,9 @@ export default {
             queryForm: {
                 labelWidth: '120px',
                 queryObject: {
-                    code: {
-                        type: 'text',
-                        label: this.$t('map.autoSignalCode'),
-                        config: {
-                            data: []
-                        }
-                    },
-                    signalCode: {
+                    stationCode: {
                         type: 'select',
-                        label: this.$t('map.signal'),
+                        label: '经停车站',
                         config: {
                             data: []
                         }
@@ -95,24 +87,17 @@ export default {
     },
     computed: {
         ...mapGetters('map', [
-            'sectionList',
-            'signalList',
-            'stationStandList'
+            'stationList'
         ])
     },
-    watch: {
-        signalList: function (val, old) {
-            const list = [];
-            if (val && val.length) {
-                for (let i = 0; i < val.length; i++) {
-                    list.push({ label: val[i].uniqueName, value: val[i].code });
-                }
-                this.queryForm.queryObject.signalCode.config.data = list;
-            }
-        }
-    },
     mounted() {
-        this.acquireMapList();
+        const list = [];
+        if (this.stationList && this.stationList.length) {
+            for (let i = 0; i < this.stationList.length; i++) {
+                list.push({ label: this.stationList[i].name, value: this.stationList[i].code });
+            }
+            this.queryForm.queryObject.stationCode.config.data = list;
+        }
     },
     methods: {
         doShow() {
@@ -143,26 +128,6 @@ export default {
                 return getStationParkTimeList(this.mapInfo.id, params);
             }
         },
-        acquireMapList() {
-            // 地图名称列表
-            listMap({ drawWay:true}).then(response => {
-                this.mapList = response.data;
-            });
-        },
-        afterQuery(data) {
-            if (data && data.list) {
-                const that = this;
-                const list = data.list;
-                if (list) {
-                    list.map(elem => {
-                        that.$convertSpecifiedField(elem, that.mapList, 'id', 'name', ['mapId']);
-                        elem.code = elem.signalCode;
-                        elem.signalCode = that.formatName(elem.signalCode);
-                    });
-                }
-            }
-            return data;
-        },
         editObj(index, row) {
             getStationParkTime(row.id).then(response => {
                 const data = response.data;
diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
index e9ba5804c..fa48621c2 100644
--- a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
@@ -60,7 +60,7 @@
                   <el-button
                     type="text"
                     size="small"
-                    @click.native.prevent="deleteSection(addModel.routingSectionList, scope.$index)"
+                    @click.native.prevent="deleteSection(addModel.parkingTimeVOList, scope.$index)"
                   >
                     {{ $t('map.remove') }}
                   </el-button>
@@ -176,7 +176,12 @@ export default {
             return formatName(code);
         },
         pushSection(list, data) {
-            list.push(data);
+            const index = list.findIndex(elem => { return elem.sectionCode == data.sectionCode; });
+            if (index < 0) {
+                list.push(data);
+            } else {
+                this.$messageBox('该区段已经在列表中存在');
+            }
         },
         setSelected(selected) {
             if (selected) {
@@ -191,6 +196,9 @@ export default {
                 }
             }
         },
+        deleteSection(list, index) {
+            list.splice(index, 1);
+        },
         buildModel(code) {
             const model = Object.assign({}, this.addModel);
             if (code) { model['code'] = code; }
@@ -236,7 +244,7 @@ export default {
                 this.addModel.stationCode = '';
                 this.addModel.parkingTimeVOList = [];
                 this.sectionCode = '';
-                this.parkingTime = 0;
+                this.parkingTime = 30;
                 this.addModel.code = '';
                 this.isSave = true;
             }
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
index df4bb3436..93b48808e 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
@@ -218,13 +218,19 @@ export default {
         },
         deleteObj(index, row) {
             if (this.mapInfo && this.mapInfo.id && row) {
-                // 删除
-                deleteRoutingData(row.id).then(response => {
-                    this.$message.success(this.$t('map.successfullyDelete'));
-                    this.reloadTable();
-                }).catch(() => {
-                    this.$messageBox(this.$t('map.failDelete'));
-                });
+                this.$confirm('是否确认删除交路', this.$t('global.tips'), {
+                    confirmButtonText: this.$t('global.confirm'),
+                    cancelButtonText: this.$t('global.cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    // 删除
+                    deleteRoutingData(row.id).then(response => {
+                        this.$message.success(this.$t('map.successfullyDelete'));
+                        this.reloadTable();
+                    }).catch(() => {
+                        this.$messageBox(this.$t('map.failDelete'));
+                    });
+                }).catch();
             }
         },
         generateData(index, row) {
@@ -243,7 +249,6 @@ export default {
         sectionDetail(index, row) {
             const sectionDict = {};
             const stationDict = {};
-
             this.sectionList.forEach(elem => { sectionDict[elem.code] = elem.name; });
             this.stationList.forEach(elem => { stationDict[elem.code] = elem.name; });
 
@@ -266,7 +271,7 @@ export default {
                     ]
                 }
             };
-            this.$refs.previewField.doShow(fieldList, row.routingSectionList);
+            this.$refs.previewField.doShow(fieldList, row.parkSectionCodeList);
         },
         reloadTable() {
             if (this.queryList && this.queryList.reload) {
diff --git a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
index 4c12cf2d3..9a71f7c11 100644
--- a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
@@ -69,7 +69,7 @@ export default {
 
                     },
                     {
-                        title: this.$t('map.startStationCode'),
+                        title: '起始区段',
                         prop: 'startSectionCode'
                     },
                     {
@@ -77,7 +77,7 @@ export default {
                         prop: 'endStationCode'
                     },
                     {
-                        title: this.$t('map.endStationCode'),
+                        title: '终到区段',
                         prop: 'endSectionCode'
                     },
                     {

From 2cbef523982e3a5e0f83b6ba957256c90a1e46ec Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 27 Apr 2020 11:33:17 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E7=89=88=E7=BB=98=E5=9B=BE=20?=
 =?UTF-8?q?=E4=BA=A4=E8=B7=AF=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

---
 .../dwellTimeOperate/dwellTime.vue            |  1 +
 .../dataRelation/routingoperate/detail.vue    | 10 ++++----
 .../dataRelation/routingoperate/route.vue     | 23 +++++++++++--------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
index fa48621c2..b750df237 100644
--- a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
@@ -13,6 +13,7 @@
               />
             </el-select>
             <el-button
+              :disabled="editShow"
               :type=" field === 'parkStationCode' ? 'danger' : 'primary'"
               @click="hover('parkStationCode')"
             >{{ $t('map.activate') }}</el-button>
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
index 93b48808e..baf51699c 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
@@ -74,7 +74,7 @@ export default {
 
                     },
                     {
-                        title: this.$t('map.startStationCode'),
+                        title: '起始区段',
                         prop: 'startSectionCode'
                     },
                     {
@@ -82,7 +82,7 @@ export default {
                         prop: 'endStationCode'
                     },
                     {
-                        title: this.$t('map.endStationCode'),
+                        title: '终到区段',
                         prop: 'endSectionCode'
                     },
                     {
@@ -240,9 +240,9 @@ export default {
                     this.$message.success(this.$t('map.generateStationRunDataSuccess'));
                     //  站间运行数据生成成功
                     this.reloadTable();
-                }).catch(() => {
+                }).catch((error) => {
                     // 站间运行数据生成失败
-                    this.$messageBox(this.$t('map.generateStationRunDataFailed'));
+                    this.$messageBox(this.$t('map.generateStationRunDataFailed') + ': ' + error.message);
                 });
             }
         },
@@ -262,7 +262,7 @@ export default {
                     items: [
                         { prop: 'stationCode', label: this.$t('map.stationCodeClomn'), type: 'text' },
                         {
-                            prop: 'stationCode', label: this.$t('map.sectionName'), type: 'select', options: stationDict
+                            prop: 'stationCode', label: '车站名称', type: 'select', options: stationDict
                         },
                         { prop: 'sectionCode', label: this.$t('map.blockCodingClomn'), type: 'text' },
                         {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index d7755bc7c..d7ca4fd0e 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -36,7 +36,7 @@
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
           <el-form-item :label="$t('map.endStationColon')" prop="endStationCode">
-            <el-select v-model="addModel.endStationCode" clearable :filterable="true" @change="changeEndStation()">
+            <el-select v-model="addModel.endStationCode" clearable :filterable="true" :disabled="!isStartSelected" @change="changeEndStation()">
               <el-option
                 v-for="item in filterStationList"
                 :key="item.code"
@@ -45,12 +45,13 @@
               />
             </el-select>
             <el-button
+              :disabled="!isStartSelected"
               :type=" field === 'endStationCode' ? 'danger' : 'primary'"
               @click="hover('endStationCode')"
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
           <el-form-item :label="$t('map.endSectionColon')" prop="endSectionCode">
-            <el-select v-model="addModel.endSectionCode" clearable :filterable="true" :disabled="editShow" @change="changeEndSection()">
+            <el-select v-model="addModel.endSectionCode" clearable :filterable="true" :disabled="editShow || !isStartSelected" @change="changeEndSection()">
               <el-option
                 v-for="item in filterSectionList"
                 :key="item.code"
@@ -59,7 +60,7 @@
               />
             </el-select>
             <el-button
-              :disabled="editShow"
+              :disabled="editShow || !isStartSelected"
               :type=" field === 'endSectionCode' ? 'danger' : 'primary'"
               @click="hover('endSectionCode')"
             >{{ $t('map.activate') }}</el-button>
@@ -204,6 +205,7 @@ export default {
             ViewMode: ViewMode,
             field: '',
             allowSelect:false,
+            isStartSelected:false,
             stationCode: '',
             sectionCode: '',
             isSave: true,
@@ -320,6 +322,7 @@ export default {
         },
         addStartSectionData(isStation) {
             if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '') {
+                this.isStartSelected = true;
                 this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation);
             }
         },
@@ -375,9 +378,7 @@ export default {
                 }
                 case 'top': {
                     if (isStation) {
-                        if (index < 0) {
-                            list.splice(0, 1, data);
-                        }
+                        list.splice(0, 1, data);
                     } else {
                         if (index < 0) {
                             list.splice(0, 1, data);
@@ -394,10 +395,10 @@ export default {
                 }
                 case 'bottom': {
                     if (isStation) {
-                        if (index < 0) {
-                            if (list.length >= 2) {
-                                list.splice(list.length - 1, 1, data);
-                            } else {
+                        if (list.length >= 2) {
+                            list.splice(list.length - 1, 1, data);
+                        } else {
+                            if (index < 0) {
                                 list.push(data);
                             }
                         }
@@ -489,6 +490,8 @@ export default {
                 this.stationCode = '';
                 this.sectionCode = '';
                 this.isSave = true;
+                this.allowSelect = false;
+                this.isStartSelected = false;
             }
         }
     }

From edc17912af7db4465d5a59e5b09548183e714016 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 27 Apr 2020 13:56:08 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=9C=B0=E5=9B=BE=20?=
 =?UTF-8?q?=E7=BB=98=E5=9B=BE=20=E4=BA=A4=E8=B7=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataRelation/dwellTimeOperate/detail.vue  |  1 -
 .../dwellTimeOperate/dwellTime.vue            |  6 ++++-
 .../dataRelation/dwellTimeOperate/index.vue   |  2 +-
 .../dataRelation/routingoperate/detail.vue    | 24 +++++++++++++++++++
 .../dataRelation/routingoperate/index.vue     |  2 +-
 .../dataRelation/routingoperate/route.vue     |  9 +++++--
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
index 644f959df..96eb52808 100644
--- a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
@@ -13,7 +13,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { listMap } from '@/api/jmap/mapdraft';
 import { getStationParkTimeList, deleteStationParkTime, getStationParkTime } from '@/api/jmap/mapdraft';
 
 export default {
diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
index b750df237..8369adb81 100644
--- a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
@@ -163,7 +163,6 @@ export default {
                     this.sectionCode = val.parkingTimeVOList[0].sectionCode;
                     this.parkingTime = val.parkingTimeVOList[0].parkingTime;
                 }
-                this.editShow = true;
             }
         }
     },
@@ -176,6 +175,10 @@ export default {
         formatName(code) {
             return formatName(code);
         },
+        editData() {
+            this.isSave = false;
+            this.editShow = true;
+        },
         pushSection(list, data) {
             const index = list.findIndex(elem => { return elem.sectionCode == data.sectionCode; });
             if (index < 0) {
@@ -248,6 +251,7 @@ export default {
                 this.parkingTime = 30;
                 this.addModel.code = '';
                 this.isSave = true;
+                this.editShow = false;
             }
         }
     }
diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/index.vue
index f83cbd2e2..bb764d82c 100644
--- a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/index.vue
@@ -60,7 +60,7 @@ export default {
         autoMaticoSelected: function (data) {
             this.routeData = data;
             if (this.$refs && this.$refs.routeEdit) {
-                this.$refs.routeEdit.isSave = false;
+                this.$refs.routeEdit.editData();
             }
         },
         previewRouteEvent: function () {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
index baf51699c..e767f988e 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
@@ -55,6 +55,20 @@ export default {
                         config: {
                             data: []
                         }
+                    },
+                    startSectionCode: {
+                        type: 'select',
+                        label: '起始区段',
+                        config: {
+                            data: []
+                        }
+                    },
+                    endSectionCode: {
+                        type: 'select',
+                        label: '终到区段',
+                        config: {
+                            data: []
+                        }
                     }
                 }
             },
@@ -151,6 +165,16 @@ export default {
                 this.queryForm.queryObject.startStationCode.config.data = list;
                 this.queryForm.queryObject.endStationCode.config.data = list;
             }
+        },
+        sectionList: function (val, old) {
+            const list = [];
+            if (val && val.length) {
+                val.forEach(elem => {
+                    list.push({ label: this.formatName(elem.code), value: elem.code });
+                });
+                this.queryForm.queryObject.startSectionCode.config.data = list;
+                this.queryForm.queryObject.endSectionCode.config.data = list;
+            }
         }
     },
     mounted() {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/index.vue
index 888de5cee..1d0c726f9 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/index.vue
@@ -60,7 +60,7 @@ export default {
         routingSelected: function (data) {
             this.routeData = data;
             if (this.$refs && this.$refs.routeEdit) {
-                this.$refs.routeEdit.isSave = false;
+                this.$refs.routeEdit.editData();
             }
         },
         previewRouteEvent: function () {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index d7ca4fd0e..1cf92db16 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -276,7 +276,6 @@ export default {
         routeData(val, old) {
             if (val) {
                 this.addModel = val;
-                this.editShow = true;
             }
         }
     },
@@ -297,6 +296,12 @@ export default {
         // 		});
         // 	}
         // },
+        editData() {
+            this.isSave = false;
+            this.allowSelect = true;
+            this.isStartSelected = true;
+            this.editShow = true;
+        },
         changeStartStation() {
             this.judgeAllowSelected();
             this.addStartSectionData(true);
@@ -418,7 +423,6 @@ export default {
                             }
                         }
                     }
-
                     break;
                 }
                 default: {
@@ -492,6 +496,7 @@ export default {
                 this.isSave = true;
                 this.allowSelect = false;
                 this.isStartSelected = false;
+                this.editShow = false;
             }
         }
     }