Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
0dd4837960
@ -70,7 +70,8 @@ export default {
|
|||||||
}
|
}
|
||||||
if (!creatSonTask && row) {
|
if (!creatSonTask && row) {
|
||||||
this.formModel.id = row.id;
|
this.formModel.id = row.id;
|
||||||
this.formModel.name = row.label;
|
this.formModel.name = row.name;
|
||||||
|
this.formModel.desc = row.desc;
|
||||||
this.formModel.contest = row.contest;
|
this.formModel.contest = row.contest;
|
||||||
this.formModel.standards = row.standards;
|
this.formModel.standards = row.standards;
|
||||||
} else {
|
} else {
|
||||||
@ -85,9 +86,6 @@ export default {
|
|||||||
if (creatSonTask) {
|
if (creatSonTask) {
|
||||||
this.formModel.parentId = row.id;
|
this.formModel.parentId = row.id;
|
||||||
}
|
}
|
||||||
this.$nextTick(() => {
|
|
||||||
this.$refs.ruleForm.resetFields();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleClose() {
|
handleClose() {
|
||||||
@ -99,7 +97,6 @@ export default {
|
|||||||
standards:'',
|
standards:'',
|
||||||
parentId:''
|
parentId:''
|
||||||
};
|
};
|
||||||
this.$refs.ruleForm.resetFields();
|
|
||||||
this.creatSonTask = false;
|
this.creatSonTask = false;
|
||||||
this.dialogVisible = false;
|
this.dialogVisible = false;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
@ -59,7 +59,7 @@ export default {
|
|||||||
});
|
});
|
||||||
this.dialogVisible = true;
|
this.dialogVisible = true;
|
||||||
this.formModel.taskId = row.id;
|
this.formModel.taskId = row.id;
|
||||||
this.formModel.name = row.label;
|
this.formModel.name = row.name;
|
||||||
this.formModel.sceneId = row.sceneId;
|
this.formModel.sceneId = row.sceneId;
|
||||||
this.formModel.ruleId = row.ruleId;
|
this.formModel.ruleId = row.ruleId;
|
||||||
},
|
},
|
||||||
|
@ -106,7 +106,9 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
bindTask(data) {
|
bindTask(data) {
|
||||||
this.$refs.bindTask.doShow(data);
|
getTaskDetail(data.id).then((res) => {
|
||||||
|
this.$refs.bindTask.doShow(res.data);
|
||||||
|
});
|
||||||
},
|
},
|
||||||
deleteTaskById(data) {
|
deleteTaskById(data) {
|
||||||
this.$confirm('确定删除该任务吗?', this.$t('global.tips'), {
|
this.$confirm('确定删除该任务吗?', this.$t('global.tips'), {
|
||||||
|
Loading…
Reference in New Issue
Block a user