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

Merge branch 'thailand' of https://git.code.tencent.com/lian-cbtc/jl-client into thailand

Browse Source
This commit is contained in:
fan 2023-07-11 11:23:02 +08:00
commit 617aa98149
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/theme/datie_02/menus/ctcWorkMenuBar.vue
View File

@ -55,16 +55,6 @@ export default {
title: 'Signal Device Control',
operate: '',
children: []
},
{
title: 'Operation Plan',
operate: '',
children: []
},
{
title: 'Plan Details:',
operate: '',
children: []
}
]
};

14
src/jmapNew/theme/datie_02/menus/localWorkMenuBar.vue
View File

@ -7,6 +7,7 @@
<train-operation ref="trainOperation" />
<switch-control ref="switchControl" />
<signal-control ref="signalControl" />
<operation-plan-detail ref="operationPlanDetail" />
</div>
</template>
<script>
@ -14,6 +15,7 @@ import { mapGetters } from 'vuex';
import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import TrainFixedPathPane from './menuDialog/trainFixedPathPane';
import OperationPlanDetail from './menuDialog/operationPlanDetail.vue';
import { EventBus } from '@/scripts/event-bus';
import { destroySimulationByAdmin, exitSimulation} from '@/api/simulation';
import ViewName from './menuDialog/viewName';
@ -32,7 +34,8 @@ export default {
StationControlConvert,
TrainOperation,
SwitchControl,
SignalControl
SignalControl,
OperationPlanDetail
},
data() {
return {
@ -120,14 +123,10 @@ export default {
}
]
},
{
title: 'Operation Plan',
operate: '',
children: []
},
{
title: 'Plan Details',
operate: '',
click: this.openPlanDetail,
children: []
}
]
@ -320,6 +319,9 @@ export default {
callback: action => {
}
});
},
openPlanDetail() {
this.$refs.operationPlanDetail.doShow();
}
}
};

36
src/jmapNew/theme/datie_02/menus/menuDialog/operationPlanDetail.vue
View File

@ -5,7 +5,7 @@
title="Operation Plan Detail"
:visible.sync="show"
width="660px"
height="500px"
height="500px"
:before-close="doClose"
:z-index="2000"
:modal="false"
@ -15,6 +15,7 @@
ref="detailTable"
class="table"
:data="detailData"
:row-class-name="tableRowClassName"
border
style="width: 100%"
size="mini"
@ -29,32 +30,43 @@
</el-dialog>
</template>
<script>
import { getSandTableRunPlanDetail } from '@/api/simulation'
import { getSandTableRunPlanDetail } from '@/api/simulation';
export default {
data() {
return {
dialogShow: false,
detailData: [],
}
};
},
computed: {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break
return this.dialogShow && !this.$store.state.menuOperation.break;
},
},
methods: {
async doShow() {
this.dialogShow = true
const resp = await getSandTableRunPlanDetail(this.$route.query.group)
this.detailData = resp.data
console.log(resp)
this.dialogShow = true;
const resp = await getSandTableRunPlanDetail(this.$route.query.group);
this.detailData = resp.data;
console.log(resp);
},
doClose() {
this.dialogShow = false
this.$store.dispatch('training/emitTipFresh')
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
},
tableRowClassName({ row }) {
if (row.finished) {
return 'finished';
}
},
},
}
};
</script>
<style scoped></style>
<style lang="scss" scoped>
/deep/ {
.el-table .finished {
color: green;
}
}
</style>

7
src/jmapNew/theme/datie_02/menus/menuDialog/setOperationPlan.vue
View File

@ -43,7 +43,7 @@
</template>
<script>
import { sandTableRunAsPlan, setOccupy } from '@/api/simulation';
import { sandTableRunAsPlan } from '@/api/simulation';
import { mapGetters } from 'vuex';
export default {
name: 'SetOperationPlanDialog',
@ -99,11 +99,6 @@ export default {
const sectionCodes = this.formData.map(_ => _.trackCode);
const runData = this.formData;
try {
const res = await setOccupy(simulationId, sectionCodes.join(','));
if (res.code !== 200) {
console.err(res);
return;
}
await sandTableRunAsPlan(simulationId, runData);
this.doClose();
} catch (err) {

2
src/utils/baseUrl.js
View File

@ -29,7 +29,7 @@ export function handlerUrl() {
// BASE_API = 'http://114.116.51.125/jlcloud';
// BASE_API = 'http://192.168.3.47:9000'; // 周寅
// BASE_API = 'http://192.168.3.94:9000'; // 旭强
BASE_API = 'http://192.168.3.15:9000'; // 张赛
BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
// BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
// BASE_API = 'http://b29z135112.zicp.vip';

2
src/views/newMap/display/simulationMenu/simulationMenu.vue
View File

@ -68,7 +68,7 @@ export default {
{ label: 'Exam', name: 'exam', click: this.goExam, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasExam && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
// { label: 'Driving on schedule', name: 'drivingPlan', click: this.drivingPlan, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; },
// isShow: () => this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$store.state.map.picture !== 'diagramEdit' },
{ label: 'Initialisation', name: 'initialize', click: this.initializeSim, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; },
{ label: 'Initialization', name: 'initialize', click: this.initializeSim, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; },
isShow: () => this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$store.state.map.picture !== 'diagramEdit' },
{ label: 'Exit', name: 'quit', click: this.exitSim, isDisabled: () => { return false; }, isShow: () => { return !this.$route.query.newOpen; } },
{ label: 'Close', name: 'close', click: () => { window.close(); }, isDisabled: () => { return false; }, isShow: () => { return this.$route.query.newOpen; } }