joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

调整进路更新延续保护配置

Browse Source
This commit is contained in:
zyy 2021-05-28 18:12:35 +08:00
parent 5678498fa6
commit 224bbc0177
4 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/baseUrl.js
View File

@ -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'; // 杜康

25
src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
View File

@ -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);

20
src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
View File

@ -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);
},

30
src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
View File

@ -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');