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

src/views/contestDataManage/contestTaskManage/AddEditTask.vue

@@ -70,7 +70,8 @@ export default {
             }
             if (!creatSonTask && row) {
                 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.standards = row.standards;
             } else {
@@ -85,9 +86,6 @@ export default {
                 if (creatSonTask) {
                     this.formModel.parentId = row.id;
                 }
-                this.$nextTick(() => {
-                    this.$refs.ruleForm.resetFields();
-                });
             }
         },
         handleClose() {
@@ -99,7 +97,6 @@ export default {
                 standards:'',
                 parentId:''
             };
-            this.$refs.ruleForm.resetFields();
             this.creatSonTask = false;
             this.dialogVisible = false;
             this.loading = false;

src/views/contestDataManage/contestTaskManage/BindTask.vue

@@ -59,7 +59,7 @@ export default {
             });
             this.dialogVisible = true;
             this.formModel.taskId = row.id;
-            this.formModel.name = row.label;
+            this.formModel.name = row.name;
             this.formModel.sceneId = row.sceneId;
             this.formModel.ruleId = row.ruleId;
         },

src/views/contestDataManage/contestTaskManage/ContestTaskManage.vue

@@ -106,7 +106,9 @@ export default {
             });
         },
         bindTask(data) {
-            this.$refs.bindTask.doShow(data);
+            getTaskDetail(data.id).then((res) => {
+                this.$refs.bindTask.doShow(res.data);
+            });
         },
         deleteTaskById(data) {
             this.$confirm('确定删除该任务吗?', this.$t('global.tips'), {