diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 05e32be8d..5472e1d28 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -246,7 +246,7 @@ function handle(state, data) {
case 'SIMULATION_CTC_MANAGER_RUN_PLAN_EDIT_CHANGE':
msg.forEach(element => {
const code = element.stationCode + '' + element.tripNumber;
- state.railCtcStationManageRpMsg[code] = copyAssign(state.railCtcStationManageRpMsg[code], element);
+ state.railCtcStationManageRpMsg[code] = copyAssign(state.railCtcStationManageRpMsg[code] || {}, element);
});
state.railCtcStationManageRpChange++;
break;
diff --git a/src/utils/stomp.js b/src/utils/stomp.js
index 9608de56d..208d283f7 100644
--- a/src/utils/stomp.js
+++ b/src/utils/stomp.js
@@ -32,10 +32,11 @@ export function getTopic(type, group, stationCode) {
topic = `/queue/simulation/${group}/iscs/pis`;
break;
case 'CTC':
- topic = `/queue/simulation/${group}/ctc`;
+ topic = `/user/queue/simulation/${group}/ctc`;
break;
case 'CTC_MANAGE':
- topic = `/queue/simulation/${group}/ctc/manage`;
+ // topic = `/user/queue/simulation/${group}/ctc/manage`;
+ topic = `/user/queue/simulation/${group}/ctcManage`;
break;
}
diff --git a/src/views/bigTrainRunplanManage/addRunplan.vue b/src/views/bigTrainRunplanManage/addRunplan.vue
index b84669c30..d89447462 100644
--- a/src/views/bigTrainRunplanManage/addRunplan.vue
+++ b/src/views/bigTrainRunplanManage/addRunplan.vue
@@ -166,7 +166,6 @@ export default {
},
computed: {
...mapGetters('map', [
- 'sectionList',
'stationList'
]),
show() {
@@ -183,12 +182,9 @@ export default {
}
},
methods:{
- doShow({stationCode}) {
- this.mapStationDirectionList = Object.values(this.$store.state.map.mapStationDirectionData);
- this.filterSectionList = [];
- this.filterSectionList = this.sectionList.filter(section=>{
- return section.standTrack && section.belongStation == stationCode;
- });
+ doShow({stationCode, filterSectionMap, mapStationDirectionMap}) {
+ this.mapStationDirectionList = Object.values(mapStationDirectionMap);
+ this.filterSectionList = Object.values(filterSectionMap);
this.dialogShow = true;
this.addModel.stationCode = stationCode;
this.$nextTick(function () {
diff --git a/src/views/bigTrainRunplanManage/index.vue b/src/views/bigTrainRunplanManage/index.vue
index 6472a3181..63e450986 100644
--- a/src/views/bigTrainRunplanManage/index.vue
+++ b/src/views/bigTrainRunplanManage/index.vue
@@ -38,7 +38,7 @@ import { getToken } from '@/utils/auth';
import StationTrack from './stationTrack';
import TrainFixedPath from './trainFixedPath';
import { loadMapDataById } from '@/utils/loaddata';
-import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
+import { creatSubscribe, clearSubscribe, getTopic, displayTopic } from '@/utils/stomp';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
export default {
name:'BigTrainRunplanManage',
@@ -119,10 +119,13 @@ export default {
this.clearSubscribe();
const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
// creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
+ // creatSubscribe(getTopic('CTC', this.$route.query.group), header);
creatSubscribe(getTopic('CTC_MANAGE', this.$route.query.group), header);
// await this.$store.dispatch('training/setHasSubscribed');
},
clearSubscribe() {
+ // clearSubscribe(`${displayTopic}\/${this.groupModel}`);
+ // clearSubscribe(getTopic('CTC', this.groupModel));
clearSubscribe(getTopic('CTC_MANAGE', this.groupModel));
},
noticeInfo() {
diff --git a/src/views/bigTrainRunplanManage/trainFixedPath.vue b/src/views/bigTrainRunplanManage/trainFixedPath.vue
index b7f5cf17c..8779ea66e 100644
--- a/src/views/bigTrainRunplanManage/trainFixedPath.vue
+++ b/src/views/bigTrainRunplanManage/trainFixedPath.vue
@@ -51,52 +51,80 @@
prop="stationCode"
label="车站"
width="100"
- />
+ >
+
+ {{ stationMap[scope.row.stationCode].name }}
+
+
+ width="70"
+ >
+
+ {{ scope.row.arriveTime }}
+
+
+ width="75"
+ >
+
+ {{ filterSectionMap[scope.row.trackSectionCode].name }}
+
+
+ >
+
+ {{ stationMap[scope.row.departStationCode].name }}
+
+
+ width="155"
+ >
+
+ {{ mapStationDirectionData[scope.row.arriveDirectionCode].name }}
+
+
+ width="155"
+ >
+
+ {{ mapStationDirectionData[scope.row.departDirectionCode].name }}
+
+
+ >
+
+ {{ stationMap[scope.row.arriveStationCode].name }}
+
+