From a358b9cdd6ba11d6e643712a93573d4fc3726641 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 11 Dec 2019 09:42:33 +0800
Subject: [PATCH 1/3] =?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

---
 .../newMap/newMapdraft/dataRelation/signaloperate/detail.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/signaloperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/signaloperate/detail.vue
index 6b14def52..76a8f3a2a 100644
--- a/src/views/newMap/newMapdraft/dataRelation/signaloperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/signaloperate/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-dialogDrag :title="$t('map.signal')" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag :title="$t('map.signalApprochSection')" :visible.sync="show" width="85%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"

From cd15b3737c8f91558109ff9f2f6b65a0b4d69d57 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 11 Dec 2019 13:56:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=98=E8=BF=94?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=B7=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/mapdraft.js                      |  68 ++++++++++++
 .../newMap/newMapdraft/dataRelation/index.vue |  27 +++--
 .../dataRelation/protectoperate/detail.vue    |   3 +-
 .../dataRelation/protectoperate/route.vue     |   2 +-
 .../dataRelation/routeoperate/detail.vue      |  83 +++++++++-----
 .../dataRelation/routeoperate/route.vue       |  27 +++--
 .../dataRelation/turnedoperate/detail.vue     |  80 +++++---------
 .../dataRelation/turnedoperate/index.vue      |   4 +-
 .../dataRelation/turnedoperate/route.vue      | 101 +++++++++++++-----
 9 files changed, 261 insertions(+), 134 deletions(-)

diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index 03150f211..713de12ef 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -358,3 +358,71 @@ export function getContinueProtectList(mapId, params) {
         params
     });
 }
+// 自动折返相关接口 创建，修改，删除，根据id查询,
+export function postAutoReentry(data) {
+    return request({
+        url: `/api/mapBuild/autoReentry`,
+        method: 'post',
+        data:data
+    });
+}
+export function putAutoReentry(data) {
+    return request({
+        url: `/api/mapBuild/autoReentry/${data.id}`,
+        method: 'put',
+        data:data
+    });
+}
+export function delAutoReentry(id) {
+    return request({
+        url: `/api/mapBuild/autoReentry/${id}`,
+        method: 'delete'
+    });
+}
+export function getAutoReentryById(id) {
+    return request({
+        url: `/api/mapBuild/autoReentry/${id}`,
+        method: 'get'
+    });
+}
+export function getAutoReentryList(mapId, params) {
+    return request({
+        url: `/api/mapBuild/${mapId}/autoReentry/paging`,
+        method: 'get',
+        params
+    });
+}
+// 新版地图进路相关接口 创建，修改，删除，根据id查询,
+export function postRouteNew(data) {
+    return request({
+        url: `/api/mapBuild/routeNew`,
+        method: 'post',
+        data:data
+    });
+}
+export function putRouteNew(data) {
+    return request({
+        url: `/api/mapBuild/routeNew/${data.id}`,
+        method: 'put',
+        data:data
+    });
+}
+export function delRouteNew(id) {
+    return request({
+        url: `/api/mapBuild/routeNew/${id}`,
+        method: 'delete'
+    });
+}
+export function getRouteNewById(id) {
+    return request({
+        url: `/api/mapBuild/routeNew/${id}`,
+        method: 'get'
+    });
+}
+export function getRouteNewList(mapId, params) {
+    return request({
+        url: `/api/mapBuild/${mapId}/routeNew`,
+        method: 'get',
+        params
+    });
+}
diff --git a/src/views/newMap/newMapdraft/dataRelation/index.vue b/src/views/newMap/newMapdraft/dataRelation/index.vue
index c514d7ee5..f64894deb 100644
--- a/src/views/newMap/newMapdraft/dataRelation/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/index.vue
@@ -13,14 +13,6 @@
           <el-button type="text" class="mapEdit_box" @click="showMap">{{ $t('map.viewLayer') }}</el-button>
         </div>
         <el-tabs v-model="enabledTab" type="card" class="map_card" @tab-click="changePane">
-          <el-tab-pane :label="$t('map.continueProtect')" class="tab_pane_box" name="protect">
-            <protect-operate
-              ref="protectOperate"
-              :map-info="mapInfo"
-              :selected="selected"
-              @setCenter="setCenter"
-            />
-          </el-tab-pane>
           <el-tab-pane :label="$t('map.routeID')" class="tab_pane_box" name="route">
             <route-operate
               ref="routeOperate"
@@ -29,7 +21,15 @@
               @setCenter="setCenter"
             />
           </el-tab-pane>
-          <el-tab-pane label="折返" class="tab_pane_box" name="turned">
+          <el-tab-pane :label="$t('map.continueProtect')" class="tab_pane_box" name="protect">
+            <protect-operate
+              ref="protectOperate"
+              :map-info="mapInfo"
+              :selected="selected"
+              @setCenter="setCenter"
+            />
+          </el-tab-pane>
+          <el-tab-pane label="自动折返" class="tab_pane_box" name="turned">
             <turned-operate
               ref="trunedOperate"
               :map-info="mapInfo"
@@ -138,6 +138,9 @@ export default {
             case 'path':
                 this.$refs.pathOperate.createRouteEvent();
                 break;
+            case 'turned':
+                this.$refs.trunedOperate.createRouteEvent();
+                break;
             }
         },
         previewRouteEvent() {
@@ -160,6 +163,9 @@ export default {
             case 'path':
                 this.$refs.pathOperate.previewRouteEvent();
                 break;
+            case 'turned':
+                this.$refs.trunedOperate.previewRouteEvent();
+                break;
             }
         },
         changePane(data) {
@@ -185,6 +191,9 @@ export default {
             case 'path':
                 this.$refs.pathOperate.setSelected(selected);
                 break;
+            case 'turned':
+                this.$refs.trunedOperate.setSelected(selected);
+                break;
             }
         },
         setCenter(code) {
diff --git a/src/views/newMap/newMapdraft/dataRelation/protectoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/protectoperate/detail.vue
index 0b5610680..e3594e548 100644
--- a/src/views/newMap/newMapdraft/dataRelation/protectoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/protectoperate/detail.vue
@@ -13,7 +13,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { listMap } from '@/api/jmap/mapdraft';
 import { getContinueProtectList, delContinueProtect, getContinueProtectById } from '@/api/jmap/mapdraft';
 
 export default {
@@ -150,7 +149,7 @@ export default {
             }
         },
         selectedObj(index, row) {
-            this.$emit('setOverlapCode', row.code);
+            this.$emit('setOverlapCode', row);
             this.show = false;
         }
     }
diff --git a/src/views/newMap/newMapdraft/dataRelation/protectoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/protectoperate/route.vue
index 49c3e8245..a7bc14665 100644
--- a/src/views/newMap/newMapdraft/dataRelation/protectoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/protectoperate/route.vue
@@ -289,7 +289,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postContinueProtect(this.buildModel(getUID('protect'))).then(resp => {
+                    postContinueProtect(this.buildModel(getUID('Protect'))).then(resp => {
                         this.$message.success('创建延续保护成功！');
                         this.loading = false;
                         this.clear();
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
index eb8f0de9d..e48353195 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
@@ -14,7 +14,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { listMap, listRouteRoute, deleteRouteRoute, queryRouteRouteDetail, updateRouteRoute } from '@/api/jmap/mapdraft'; /** listRouteMapRoute*/
+import { listMap, getRouteNewList, delRouteNew, getRouteNewById, putRouteNew, getContinueProtectList } from '@/api/jmap/mapdraft'; /** listRouteMapRoute*/
 import PreViewField from './preview';
 
 export default {
@@ -33,10 +33,13 @@ export default {
     data() {
         return {
             show: false,
+            showType: '',
+            codeType: '',
             mapList: [],
             RouteNatureTypeList: [],
             RouteAutoTypeList: [],
             SwitchLocateTypeList: [],
+            ContinueProtectList: [],
             turnBackList: [
                 { label: '是', value: true },
                 { label: '否', value: false }
@@ -106,15 +109,19 @@ export default {
                         prop: 'endSignalCode'
                     },
                     {
-                        type: 'button',
-                        title: this.$t('map.continueProtectSwitchData'),
-                        buttons: [
-                            {
-                                name: this.$t('map.preview'),
-                                handleClick: this.overlapSwitchDetail
-                            }
-                        ]
+                        title: '延续保护',
+                        prop: 'overlapCode'
                     },
+                    // {
+                    //     type: 'button',
+                    //     title: this.$t('map.continueProtectSwitchData'),
+                    //     buttons: [
+                    //         {
+                    //             name: this.$t('map.preview'),
+                    //             handleClick: this.overlapSwitchDetail
+                    //         }
+                    //     ]
+                    // },
                     {
                         type: 'button',
                         title: this.$t('map.accessSideTurnoutData'),
@@ -125,16 +132,16 @@ export default {
                             }
                         ]
                     },
-                    {
-                        type: 'button',
-                        title: this.$t('map.routeProtectsData'),
-                        buttons: [
-                            {
-                                name: this.$t('map.preview'),
-                                handleClick: this.routeOverlap
-                            }
-                        ]
-                    },
+                    // {
+                    //     type: 'button',
+                    //     title: this.$t('map.routeProtectsData'),
+                    //     buttons: [
+                    //         {
+                    //             name: this.$t('map.preview'),
+                    //             handleClick: this.routeOverlap
+                    //         }
+                    //     ]
+                    // },
 
                     {
                         type: 'button',
@@ -173,12 +180,19 @@ export default {
                         buttons: [
                             {
                                 name: this.$t('map.compile'),
-                                handleClick: this.edit
+                                handleClick: this.edit,
+                                showControl: () => { return this.showType !== 'select'; }
                             },
                             {
                                 name: this.$t('map.deleteObj'),
                                 handleClick: this.deleteObj,
-                                type: 'danger'
+                                type: 'danger',
+                                showControl: () => { return this.showType !== 'select'; }
+                            },
+                            {
+                                name: '选择',
+                                handleClick: this.selectedObj,
+                                showControl: () => { return this.showType === 'select'; }
                             }
                         ]
                     }
@@ -228,20 +242,24 @@ export default {
         this.$Dictionary.switchLocateType().then(list => {
             this.SwitchLocateTypeList = list;
         });
-
+        this.getProtectList();
         this.acquireMapList();
     },
     methods: {
-        doShow() {
+        doShow(showType, codeType) {
             this.show = true;
             this.reloadTable();
+            if (showType && codeType) {
+                this.showType = showType;
+                this.codeType = codeType;
+            }
         },
         doClose() {
             this.show = false;
         },
         queryFunction(params) {
             if (this.mapInfo && this.mapInfo.id) {
-                return listRouteRoute(this.mapInfo.id, params);
+                return getRouteNewList(this.mapInfo.id, params);
             }
         },
         acquireMapList() {
@@ -263,6 +281,7 @@ export default {
                         that.$convertSpecifiedField(elem, that.signalList, 'code', 'uniqueName', ['startSignalCode', 'endSignalCode']);
                         that.$convertSpecifiedField(elem, that.stationList, 'code', 'name', ['stationCode']);
                         that.$convertSpecifiedField(elem, that.sectionList, 'code', 'name', ['nearSectionCode', 'autoTriggerSectionCode', 'turnBackSectionCode']);
+                        that.$convertSpecifiedField(elem, that.ContinueProtectList, 'code', 'name', ['overlapCode']);
                     });
                 }
             }
@@ -397,7 +416,7 @@ export default {
         },
         // 保存
         saveRelated(row) {
-            updateRouteRoute(row).then(response => {
+            putRouteNew(row).then(response => {
                 this.$message.success('更新成功');
             }).catch(() => {
                 this.$messageBox('操作异常');
@@ -410,7 +429,7 @@ export default {
                         mapId: elem.id,
                         id: row.id
                     };
-                    queryRouteRouteDetail(model).then(response => {
+                    getRouteNewById(model.id).then(response => {
                         const data = response.data;
                         this.$emit('routeSelected', data);
                         this.doClose();
@@ -425,7 +444,7 @@ export default {
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-                    deleteRouteRoute(row.id).then(response => {
+                    delRouteNew(row.id).then(response => {
                         this.$message.success('删除成功');
                         this.reloadTable();
                     }).catch(() => {
@@ -440,6 +459,16 @@ export default {
             if (this.queryList && this.queryList.reload) {
                 this.queryList.reload();
             }
+        },
+        selectedObj(index, row) {
+            this.$emit('setRouteCode', row, this.codeType);
+            this.show = false;
+        },
+        // 获取延续保护list
+        getProtectList() {
+            getContinueProtectList(this.$route.params.mapId, {pageSize:9999, pageNum:1}).then((resp) => {
+                this.ContinueProtectList = resp.data.list;
+            });
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index aceeefe2f..a818207d8 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -189,7 +189,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="关联延续保护区段:" prop="overlapCode">
-          <el-input v-model="addModel.overlapCode" style="width: 178px" readonly="true" />
+          <el-input v-model="overlapName" style="width: 178px" readonly="true" />
           <el-button type="primary" @click="selectedOverlapCode">选择</el-button>
         </el-form-item>
         <el-form-item :label="$t('map.hostileApproachData') + ':'" prop="conflictingRouteList">
@@ -221,7 +221,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { getUID } from '@/jmap/utils/Uid';
-import { createRouteRoute, updateRouteRoute } from '@/api/jmap/mapdraft';
+import { postRouteNew, putRouteNew, getContinueProtectList } from '@/api/jmap/mapdraft';
 import ProtectDetail from '../protectoperate/detail';
 
 export default {
@@ -282,7 +282,8 @@ export default {
                 espList: [], // 站台紧急停车按钮数据
                 overlapCode:'',
                 conflictingRouteList: [] // 敌对进路
-            }
+            },
+            overlapName: ''
         };
     },
     computed: {
@@ -341,7 +342,7 @@ export default {
         },
         routeData(val, old) {
             if (val) {
-                this.addModel = val;
+                this.handelContinueProtectCode(val);
                 this.addModel.routeFlankProtectionList.forEach(item => {
                     item.normal ? item.switchType = '定位' : item.switchType = '反位';
                 });
@@ -375,8 +376,9 @@ export default {
         deviceChange(code) {
             this.$emit('setCenter', code);
         },
-        setOverlapCode(code) {
-            this.addModel.overlapCode = code;
+        setOverlapCode(data) {
+            this.addModel.overlapCode = data.code;
+            this.overlapName = data.name;
         },
         selectedOverlapCode() {
             this.$refs.routeDetail.doShow('select');
@@ -405,7 +407,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    createRouteRoute(this.buildModel(getUID('Route'))).then(response => {
+                    postRouteNew(this.buildModel(getUID('Route'))).then(response => {
                         this.$message.success('创建成功');
                         this.loading = false;
                         this.clear();
@@ -420,7 +422,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    updateRouteRoute(this.buildModel()).then(response => {
+                    putRouteNew(this.buildModel()).then(response => {
                         this.$message.success(this.$t('map.updateSuccessfully'));
                         this.loading = false;
                         this.clear();
@@ -438,6 +440,8 @@ export default {
                 this.addModel.mapId = this.mapInfo.id;
                 this.addModel.routeSwitchList = [];
                 this.addModel.routeFlankProtectionList = [];
+                this.overlapName = '';
+                this.addModel.overlapCode = '';
                 if (this.selected && this.selected._type.toUpperCase() === 'Station'.toUpperCase()) {
                     this.addModel.stationCode = this.selected.code;
                 }
@@ -466,6 +470,13 @@ export default {
                     this.flankCode = selected.code;
                 }
             }
+        },
+        async handelContinueProtectCode(val) {
+            if (val.overlapCode) {
+                const resp = await getContinueProtectList(this.$route.params.mapId, {pageSize:9999, pageNum:1, code:val.overlapCode});
+                this.overlapName = resp.data.list.length ? resp.data.list[0].name : '';
+            }
+            this.addModel = val;
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue
index 2913b2e14..cc93c5c25 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue
@@ -13,8 +13,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { listMap } from '@/api/jmap/mapdraft';
-import { getAutoSignalList, delAutoSignal, getAutoSignalDetail } from '@/api/jmap/mapdraft';
+import { getAutoReentryList, delAutoReentry, getAutoReentryById, getRouteNewList } from '@/api/jmap/mapdraft';
 
 export default {
     name: 'RouteDetail',
@@ -29,11 +28,11 @@ export default {
     data() {
         return {
             show: false,
-            mapList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
             },
+            routeList: [],
             queryForm: {
                 labelWidth: '120px',
                 queryObject: {
@@ -53,29 +52,20 @@ export default {
                 indexShow: true,
                 columns: [
                     {
-                        title: this.$t('map.signalCodeName'),
-                        prop: 'signalCode'
+                        title: '自动折返名称',
+                        prop: 'name'
                     },
                     {
-                        title: this.$t('map.interlockingBlocks'),
-                        prop: 'sectionList',
-                        type: 'tagMore',
-                        columnValue: (row) => { return this.$convertField(row.sectionList, this.sectionList, ['code', 'name'], true); },
-                        tagType: (row) => { return ''; }
+                        title: '折返进路',
+                        prop: 'turnBackRouteCode'
                     },
                     {
-                        title: this.$t('map.psdList'),
-                        prop: 'psdList',
-                        type: 'tagMore',
-                        columnValue: (row) => { return this.$convertField(row.psdList, this.psdList, ['code', 'name'], true); },
-                        tagType: (row) => { return ''; }
+                        title: '基础进路',
+                        prop: 'basicRouteCode'
                     },
                     {
-                        title: this.$t('map.espList'),
-                        prop: 'espList',
-                        type: 'tagMore',
-                        columnValue: (row) => { return this.$convertField(row.espList, this.espList, ['code', 'name'], true); },
-                        tagType: (row) => { return ''; }
+                        title: '折返区段',
+                        prop: 'reentryTrackCode'
                     },
                     {
                         type: 'button',
@@ -99,79 +89,52 @@ export default {
     },
     computed: {
         ...mapGetters('map', [
-            'sectionList',
-            'signalList',
-            'espList',
-            'psdList'
+            'sectionList'
         ])
     },
     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();
     },
     methods: {
         doShow() {
             this.show = true;
+            this.getRouteList();
             this.reloadTable();
         },
         doClose() {
             this.show = false;
         },
-        formatName(code) {
-            let name = '';
-            const device = this.$store.getters['map/getDeviceByCode'](code);
-            if (device) {
-                name = device.uniqueName;
-            }
-
-            return name;
-        },
         queryFunction(params) {
             if (this.mapInfo && this.mapInfo.id) {
-                return getAutoSignalList(this.mapInfo.id, params);
+                return getAutoReentryList(this.mapInfo.id, params);
             }
         },
-        acquireMapList() {
-            // 地图名称列表
-            listMap({ drawWay:'1'}).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);
+                        that.$convertSpecifiedField(elem, that.sectionList, 'code', 'name', ['reentryTrackCode']);
+                        that.$convertSpecifiedField(elem, that.routeList, 'code', 'name', ['turnBackRouteCode', 'basicRouteCode']);
                     });
                 }
             }
             return data;
         },
         editObj(index, row) {
-            getAutoSignalDetail(row.id).then(response => {
+            getAutoReentryById(row.id).then(response => {
                 const data = response.data;
-                this.$emit('autoMaticoSelected', data);
+                this.$emit('autoReentrySelected', data);
                 this.doClose();
             });
         },
         deleteObj(index, row) {
             if (this.mapInfo && this.mapInfo.id && row) {
                 // 删除
-                delAutoSignal(row.id).then(response => {
+                delAutoReentry(row.id).then(response => {
                     this.$message.success(this.$t('map.successfullyDelete'));
                     this.reloadTable();
                 }).catch(() => {
@@ -183,6 +146,11 @@ export default {
             if (this.queryList && this.queryList.reload) {
                 this.queryList.reload();
             }
+        },
+        getRouteList() {
+            getRouteNewList(this.$route.params.mapId, {pageSize:9999, pageNum:1}).then((resp) => {
+                this.routeList = resp.data.list;
+            });
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/index.vue
index 20b9c2a17..6bb0543c2 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/index.vue
@@ -6,7 +6,7 @@
       :map-info="mapInfo"
       :route-data="routeData"
     />
-    <route-detail ref="routeDetail" :map-info="mapInfo" @autoMaticoSelected="autoMaticoSelected" />
+    <route-detail ref="routeDetail" :map-info="mapInfo" @autoReentrySelected="autoReentrySelected" />
   </div>
 </template>
 <script>
@@ -57,7 +57,7 @@ export default {
                 });
             }
         },
-        autoMaticoSelected: function (data) {
+        autoReentrySelected: function (data) {
             this.routeData = data;
             if (this.$refs && this.$refs.routeEdit) {
                 this.$refs.routeEdit.isSave = false;
diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
index bfb011e20..2b1c34359 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
@@ -4,15 +4,29 @@
       <el-form ref="form" :model="addModel" :rules="rules" label-width="180px" size="mini">
         <div class="definition">
           <el-form-item label="折返名称:" prop="name">
-            <el-input v-model="addModel.name" />
+            <el-input v-model="addModel.name" style="width: 178px" />
           </el-form-item>
-          <el-form-item label="折返进路" prop="turnBackRouteCode">
-            <el-input v-model="addModel.turnBackRouteName" />
-            <el-button type="primary">选择</el-button>
+          <el-form-item label="折返进路:" prop="turnBackRouteName">
+            <el-input v-model="addModel.turnBackRouteName" readonly="true" style="width: 178px" />
+            <el-button type="primary" @click="selectedRoute('turnBackRoute')">选择</el-button>
           </el-form-item>
-          <el-form-item label="基础进路" prop="basicRouteCode">
-            <el-input v-model="addModel.basicRouteName" />
-            <el-button type="primary">选择</el-button>
+          <el-form-item label="基础进路:" prop="basicRouteName">
+            <el-input v-model="addModel.basicRouteName" readonly="true" style="width: 178px" />
+            <el-button type="primary" @click="selectedRoute('basicRoute')">选择</el-button>
+          </el-form-item>
+          <el-form-item label="折返区段:" prop="reentryTrackCode">
+            <el-select v-model="addModel.reentryTrackCode">
+              <el-option
+                v-for="item in sectionList"
+                :key="item.code"
+                :label="item.name + ' (' + item.code+ ')'"
+                :value="item.code"
+              />
+            </el-select>
+            <el-button
+              :type=" field === 'reentryTrackCode' ? 'danger' : 'primary'"
+              @click="hover('reentryTrackCode')"
+            >{{ $t('map.activate') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button-group>
@@ -25,17 +39,23 @@
         </div>
       </el-form>
     </el-scrollbar>
+    <route-detail ref="routeDetail" :map-info="mapInfo" @setRouteCode="setRouteCode" />
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import { getUID } from '@/jmap/utils/Uid';
-import { postAutoSignal, putAutoSignal } from '@/api/jmap/mapdraft';
+import { postAutoReentry, putAutoReentry, getRouteNewList } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
+import RouteDetail from '../routeoperate/detail';
+import { deepAssign } from '@/utils/index';
 
 export default {
     name: 'RouteOperation',
+    components: {
+        RouteDetail
+    },
     props: {
         selected: {
             type: Object,
@@ -70,25 +90,29 @@ export default {
                 turnBackRouteName: '',
                 basicRouteName:'',
                 turnBackRouteCode: '',
-                basicRouteCode:''
+                basicRouteCode:'',
+                priority: '',
+                reentryTrackCode: ''
             },
             editShow: false,
             rules: {
                 name: [
                     { required: true, message: '请输入折返名称', trigger: 'blur' }
                 ],
-                turnBackRouteCode: [
+                turnBackRouteName: [
                     { required: true, message: '请选择折返进路', trigger: 'blur' }
                 ],
-                basicRouteCode: [
+                basicRouteName: [
                     { required: true, message: '请选择基础进路', trigger: 'blur'}
+                ],
+                reentryTrackCode: [
+                    { required: true, message: '请选择折返区段', trigger: 'change'}
                 ]
             }
         };
     },
     computed: {
         ...mapGetters('map', [
-            'signalList',
             'sectionList'
         ])
     },
@@ -100,7 +124,7 @@ export default {
         },
         routeData(val, old) {
             if (val) {
-                this.addModel = val;
+                this.handelRouteName(val);
                 this.editShow = true;
             }
         }
@@ -115,14 +139,13 @@ export default {
         formatName(code) {
             return formatName(code);
         },
+        selectedRoute(codeType) {
+            this.$refs.routeDetail.doShow('select', codeType);
+        },
         setSelected(selected) {
             if (selected) {
-                if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'signalCode'.toUpperCase()) {
-                    this.addModel.signalCode = selected.code;
-                } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'sectionList'.toUpperCase()) {
-                    if (this.addModel.sectionList.indexOf(selected.code) === -1) {
-                        this.addModel.sectionList.push(selected.code);
-                    }
+                if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'reentryTrackCode'.toUpperCase()) {
+                    this.addModel.reentryTrackCode = selected.code;
                 }
             }
         },
@@ -130,19 +153,18 @@ export default {
             const model = Object.assign({}, this.addModel);
             if (code) { model['code'] = code; }
             model['mapId'] = this.mapInfo.id;
-            model['autoSignalId'] = this.addModel.id;
             return model;
         },
         save() {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postAutoSignal(this.buildModel(getUID('autoSingle'))).then(resp => {
-                        this.$message.success(this.$t('map.automaticSignalSuccessful'));
+                    postAutoReentry(this.buildModel(getUID('TurnedAround'))).then(resp => {
+                        this.$message.success('创建折返成功！');
                         this.loading = false;
                         this.clear();
                     }).catch(() => {
-                        this.$messageBox(this.$t('map.failedCreateSignal'));
+                        this.$messageBox('创建折返失败！');
                         this.loading = false;
                     });
                 }
@@ -152,12 +174,12 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    putAutoSignal(this.buildModel()).then(resp => {
-                        this.$message.success(this.$t('map.automaticSignalUpdateSucceeded'));
+                    putAutoReentry(this.buildModel()).then(resp => {
+                        this.$message.success('更新折返成功！');
                         this.loading = false;
                         this.clear();
                     }).catch(() => {
-                        this.$messageBox(this.$t('map.automaticSignalUpdateFailed'));
+                        this.$messageBox('更新折返失败！');
                         this.loading = false;
                     });
                 }
@@ -166,13 +188,34 @@ export default {
         clear() {
             if (this.$refs && this.$refs.form && this.mapInfo) {
                 delete this.addModel.id;
-                this.$refs.form.resetFields();
+                this.addModel.basicRouteName = '';
+                this.addModel.basicRouteCode = '';
+                this.addModel.turnBackRouteName = '';
+                this.addModel.turnBackRouteCode = '';
                 this.addModel.mapId = this.mapInfo.id;
-                this.addModel.sectionList = [];
-                this.addModel.signalCode = '';
                 this.addModel.code = '';
+                this.$refs.form.resetFields();
                 this.isSave = true;
             }
+        },
+        setRouteCode(data, type) {
+            if (type === 'basicRoute') {
+                this.addModel.basicRouteName = data.name;
+                this.addModel.basicRouteCode = data.code;
+            } else if (type === 'turnBackRoute') {
+                this.addModel.turnBackRouteName = data.name;
+                this.addModel.turnBackRouteCode = data.code;
+            }
+        },
+        async handelRouteName(data) {
+            const model = {};
+            const resp1 = await getRouteNewList(this.$route.params.mapId, {pageSize:10, pageNum:1, code: data.basicRouteCode});
+            model.basicRouteName = resp1.data.list.length ? resp1.data.list[0].name : '';
+
+            const resp2 = await getRouteNewList(this.$route.params.mapId, {pageSize:10, pageNum:1, code: data.turnBackRouteCode});
+            model.turnBackRouteName = resp2.data.list.length ? resp2.data.list[0].name : '';
+
+            this.addModel = deepAssign(model, data);
         }
     }
 };

From eafb83a886cdb4f176e45fc6068585075dbc0152 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 11 Dec 2019 14:10:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=98=E8=BF=94?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/dataRelation/turnedoperate/detail.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue
index cc93c5c25..bee89fee2 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-dialogDrag :title="$t('map.automaticSignalList')" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag title="自动折返列表" :visible.sync="show" width="85%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"
@@ -36,12 +36,9 @@ export default {
             queryForm: {
                 labelWidth: '120px',
                 queryObject: {
-                    signalCode: {
-                        type: 'select',
-                        label: this.$t('map.signal'),
-                        config: {
-                            data: []
-                        }
+                    name: {
+                        type: 'text',
+                        label: '自动折返名称'
                     }
                 }
             },