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

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

Browse Source
This commit is contained in:
fan 2022-06-17 13:22:55 +08:00
commit 82e1378870
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jmapNew/theme/datie_02/menus/runplanPane.vue
View File

@ -557,7 +557,7 @@ export default {
loadData() {
this.tableData = [];
const railCtcRunplanInitMsg = copyAssign({}, this.$store.state.socket.railCtcRunplanInitMsg);
const tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{
this.tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{
if (data.departRunPlan) {
// data.departRunPlan.planTime = this.coverTime(data.departRunPlan.planTime);
if (data.departRunPlan.adjacentDepart) { data.departRunPlan.adjacentDepart = this.coverTime(data.departRunPlan.adjacentDepart); }
@ -570,7 +570,7 @@ export default {
}
return data.stationCode == this.$store.state.training.roleDeviceCode;
});
this.tableData = tableData.sort((prev, next)=>{
this.tableData.sort((prev, next)=>{
const prevPlanTime = prev.departRunPlan ? prev.departRunPlan.planTime : prev.arriveRunPlan ? prev.arriveRunPlan.planTime : '00:00:00';
const nextPlanTime = next.departRunPlan ? next.departRunPlan.planTime : next.arriveRunPlan ? next.arriveRunPlan.planTime : '00:00:00';
return new Date('2000-06-18 ' + prevPlanTime).getTime() - new Date('2000-06-18 ' + nextPlanTime).getTime();
@ -755,11 +755,11 @@ export default {
},
noticeInfo() {
this.$refs.noticeInfo.doShow();
},
coverTime(time) {
const date = new Date(time);
return date.getHours() + ':' + date.getMinutes();
}
// coverTime(time) {
// const date = new Date(time);
// return date.getHours() + ':' + date.getMinutes();
// }
}
};

2
src/views/bigTrainRunplanManage/addRunplan.vue
View File

@ -112,7 +112,7 @@ export default {
if (value) {
const judge = /^[a-zA-Z0-9]*[\d]$/.test(value);
if (judge) {
if (value.toString().length > 2 || value.toString().length < 6) {
if (value.toString().length > 6 || value.toString().length < 2) {
callback('车次长度2-6位');
} else {
callback();