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:
joylink_cuiweidong 2021-01-26 11:25:06 +08:00
parent ebcd6b9bd9
commit c8986b3a4e
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/planMonitor/editTool/menus/addPlanningTrain.vue
View File

@ -71,7 +71,8 @@ export default {
} else { } else {
const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
if (serviceNumberList.includes(value)) { if (serviceNumberList.includes(value)) {
return callback(new Error('该服务号已存在')); // new Error('该服务号已存在')
return callback();
} else { } else {
return callback(); return callback();
} }
@ -91,7 +92,8 @@ export default {
this.formModel.serviceNumber = newValue; this.formModel.serviceNumber = newValue;
const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
if (serviceNumberList.includes(value)) { if (serviceNumberList.includes(value)) {
return callback(new Error('该服务号已存在')); // new Error('该服务号已存在')
return callback();
} else { } else {
return callback(); return callback();
} }

26
src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue
View File

@ -59,7 +59,8 @@ export default {
rules: { rules: {
serviceNumber:[ serviceNumber:[
{required: true, validator: this.validateServiceNumber, trigger: 'blur'}, {required: true, validator: this.validateServiceNumber, trigger: 'blur'},
{required: true, validator: this.validateServiceNumber, trigger: 'change'} // {required: true, validator: this.validateServiceNumber, trigger: 'change'}
{required: true, validator: this.validateServiceNo, trigger: 'change'}
], ],
beginTime: [ beginTime: [
{ required: true, message: '请填写开始时间', trigger: 'blur' } { required: true, message: '请填写开始时间', trigger: 'blur' }
@ -138,14 +139,17 @@ export default {
if (typeof value == 'string' && value.trim().length == 0) { if (typeof value == 'string' && value.trim().length == 0) {
return callback(new Error('请填写服务号')); return callback(new Error('请填写服务号'));
} else { } else {
const newValue = parseInt(value); let newValue = parseInt(value);
if (newValue) { if (newValue) {
if (newValue.toString() != value) { if (newValue > 0 & newValue < 9) {
this.formModel.serviceNumber = newValue; newValue = '00' + newValue;
} else if (newValue > 10 & newValue < 99) {
newValue = '0' + newValue;
} }
this.formModel.serviceNumber = newValue;
const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
if (serviceNumberList.includes(value)) { if (serviceNumberList.includes(value)) {
return callback(new Error('该服务号已存在,请重新填写')); return callback(new Error('该服务号已存在'));
} else { } else {
return callback(); return callback();
} }
@ -155,6 +159,18 @@ export default {
} }
}, },
validateServiceNo(rule, value, callback) {
if (typeof value == 'string' && value.trim().length == 0) {
return callback(new Error('请填写服务号'));
} else {
const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
if (serviceNumberList.includes(value)) {
return callback(new Error('该服务号已存在'));
} else {
return callback();
}
}
},
validateRunningRouting(rule, value, callback) { validateRunningRouting(rule, value, callback) {
if (value.trim().length == 0) { if (value.trim().length == 0) {
return callback(new Error('请选择环路')); return callback(new Error('请选择环路'));

6
src/views/planMonitor/newEditTool/menus/addPlanningTrain.vue
View File

@ -77,7 +77,8 @@ export default {
} else { } else {
const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
if (serviceNumberList.includes(value)) { if (serviceNumberList.includes(value)) {
return callback(new Error('该服务号已存在')); // new Error('该服务号已存在');
return callback();
} else { } else {
return callback(); return callback();
} }
@ -97,7 +98,8 @@ export default {
this.formModel.serviceNumber = newValue; this.formModel.serviceNumber = newValue;
const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
if (serviceNumberList.includes(value)) { if (serviceNumberList.includes(value)) {
return callback(new Error('该服务号已存在')); // new Error('该服务号已存在')
return callback();
} else { } else {
return callback(); return callback();
} }