From 224bbc01771ed9bea53ab5da103e71d2519af219 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 28 May 2021 18:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=9B=E8=B7=AF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=BB=B6=E7=BB=AD=E4=BF=9D=E6=8A=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                          |  4 +--
 .../dataRelation/routeoperate/detail.vue      | 25 +++++++---------
 .../dataRelation/routeoperate/index.vue       | 20 +++++++++++--
 .../dataRelation/routeoperate/route.vue       | 30 +++++++++++--------
 4 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 11702c286..aa7bf7e1b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
+        BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
         // BASE_API = 'http://192.168.3.120:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
index 0b40542ec..535044ea7 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
@@ -18,11 +18,11 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { listMap, getRouteNewList, delRouteNew, putRouteNew, putSetDraftMapRouteById, getOverlapAllList } from '@/api/jmap/mapdraft';
+import { listMap, getRouteNewList, delRouteNew, putRouteNew, putSetDraftMapRouteById } from '@/api/jmap/mapdraft';
 // import ProtectDetail from './protectDetail';
 import PreViewField from './preview';
 import Related from './related';
-import { EventBus } from '@/scripts/event-bus';
+// import { EventBus } from '@/scripts/event-bus';
 
 export default {
     name: 'RouteDetail',
@@ -37,6 +37,12 @@ export default {
             default() {
                 return null;
             }
+        },
+        overlapList: {
+            type: Array,
+            default() {
+                return [];
+            }
         }
     },
     data() {
@@ -49,7 +55,7 @@ export default {
             RouteAutoTypeList: [],
             SwitchLocateTypeList: [],
             ContinueProtectList: [],
-            overlapList: [], // 延续保护列表
+            // overlapList: [], // 延续保护列表
             turnBackList: [
                 { label: '是', value: true },
                 { label: '否', value: false }
@@ -257,15 +263,12 @@ export default {
             this.SwitchLocateTypeList = list;
         });
         this.acquireMapList();
-        this.initProtectData();
-        EventBus.$on('successCI', () => {
-            this.initProtectData();
-        });
     },
     methods: {
         doShow(showType, codeType) {
             this.show = true;
-            this.reloadTable();
+            // this.reloadTable();
+            this.$refs.queryListPage.commitQuery();
             if (showType && codeType) {
                 this.showType = showType;
                 this.codeType = codeType;
@@ -274,12 +277,6 @@ export default {
         doClose() {
             this.show = false;
         },
-        initProtectData() {
-            // debugger;
-            getOverlapAllList(this.$route.params.mapId).then(resp => {
-                this.overlapList = resp.data;
-            });
-        },
         queryFunction(params) {
             if (this.mapInfo && this.mapInfo.id) {
                 return getRouteNewList(this.mapInfo.id, params);
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
index 061284271..13e29d6ee 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
@@ -5,14 +5,17 @@
       :selected="selected"
       :map-info="mapInfo"
       :route-data="routeData"
+      :overlap-list="overlapList"
       @setCenter="setCenter"
     />
-    <route-detail ref="routeDetail" :map-info="mapInfo" @routeSelected="routeSelected" />
+    <route-detail ref="routeDetail" :map-info="mapInfo" :overlap-list="overlapList" @routeSelected="routeSelected" />
   </div>
 </template>
 <script>
 import RouteDraft from './route';
 import RouteDetail from './detail';
+import { getOverlapAllList } from '@/api/jmap/mapdraft';
+import { EventBus } from '@/scripts/event-bus';
 
 export default {
     name: 'RouteOperate',
@@ -37,10 +40,23 @@ export default {
     data() {
         return {
             enabledTab: 'Route',
-            routeData: null
+            routeData: null,
+            overlapList: []
         };
     },
+    mounted() {
+        this.initProtectData();
+        EventBus.$on('successCI', () => {
+            this.initProtectData();
+        });
+    },
     methods: {
+        initProtectData() {
+            debugger;
+            getOverlapAllList(this.$route.params.mapId).then(resp => {
+                this.overlapList = resp.data;
+            });
+        },
         clickEvent(e, model) {
             this.onSelect(model);
         },
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index dc916c965..9cb5a212e 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -164,9 +164,9 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getRouteNewList, getFlankProtectionList, getOverlapAllList, putSetDraftMapRouteById } from '@/api/jmap/mapdraft';
+import { getRouteNewList, getFlankProtectionList, putSetDraftMapRouteById } from '@/api/jmap/mapdraft';
 import HostileData from './hostileData';
-import { EventBus } from '@/scripts/event-bus';
+// import { EventBus } from '@/scripts/event-bus';
 
 export default {
     name: 'RouteOperation',
@@ -191,6 +191,12 @@ export default {
             default() {
                 return null;
             }
+        },
+        overlapList: {
+            type: Array,
+            default() {
+                return [];
+            }
         }
     },
     data() {
@@ -228,7 +234,7 @@ export default {
                 overlapCode:'',
                 conflictingSignalList: [] // 敌对信号数据列表
             },
-            overlapList: [], // 延续保护列表
+            // overlapList: [], // 延续保护列表
             routeList: [] // 进路列表
         };
     },
@@ -337,10 +343,10 @@ export default {
     mounted() {
         this.getRouteList();
         this.getFlankProtectList();
-        this.initProtectData();
-        EventBus.$on('successCI', () => {
-            this.initProtectData();
-        });
+        // this.initProtectData();
+        // EventBus.$on('successCI', () => {
+        //     this.initProtectData();
+        // });
     },
     methods: {
         initLoad() { // 加载联锁车站列表
@@ -426,11 +432,11 @@ export default {
                 // this.addModel.delayReleaseTime = this.routeList[this.routeList.length - 1].delayReleaseTime;
             }
         },
-        initProtectData() {
-            getOverlapAllList(this.$route.params.mapId).then(resp => {
-                this.overlapList = resp.data;
-            });
-        },
+        // initProtectData() {
+        //     getOverlapAllList(this.$route.params.mapId).then(resp => {
+        //         this.overlapList = resp.data;
+        //     });
+        // },
         batchSectionListFocus(flag) {
             this.changeSectionSelected(this.addModel.routeSectionList, flag, 'routePhysicalSection');
             this.changeSignalSelected(this.addModel.startSignalCode, flag, 'routeSignal');