Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue

@@ -260,31 +260,24 @@ const data = reactive({
     craftPost: [{ required: true, message: "工种岗位不能为空", trigger: "change" }],
     singleNum: [
       { required: true, message: "单选题数量不能为空", trigger: "blur" },
-      { type: "number", message: "请输入数字类型", trigger: "blur" },
     ],
     singleMark: [
       { required: true, message: "单选题分数不能为空", trigger: "blur" },
-      { type: "number", message: "请输入数字类型", trigger: "blur" },
     ],
     multipleNum: [
       { required: true, message: "多选题数量不能为空", trigger: "blur" },
-      { type: "number", message: "请输入数字类型", trigger: "blur" },
     ],
     multipleMark: [
       { required: true, message: "多选题分数不能为空", trigger: "blur" },
-      { type: "number", message: "请输入数字类型", trigger: "blur" },
     ],
     estimateNum: [
       { required: true, message: "判断题数量不能为空", trigger: "blur" },
-      { type: "number", message: "请输入数字类型", trigger: "blur" },
     ],
     estimateMark: [
       { required: true, message: "判断题分数不能为空", trigger: "blur" },
-      { type: "number", message: "请输入数字类型", trigger: "blur" },
     ],
     passMark: [
       { required: true, message: "合格分数不能为空", trigger: "blur" },
-      { type: "number", message: "请输入数字类型", trigger: "blur" },
     ]
   }
 });

yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue

@@ -368,6 +368,9 @@ function handleUpdate(row) {
   initPost();
   const _id = row.id || ids.value
   getBusTrainingVideo(_id).then(response => {
+    if(response.data.remark){
+      response.data.craftPost = JSON.parse(response.data.remark);
+    }
     form.value = response.data;
     open.value = true;
     title.value = "修改培训视频";
@@ -397,6 +400,9 @@ function trainLevelChange(){
 function submitForm() {
   proxy.$refs["busTrainingVideoRef"].validate(valid => {
     if (valid) {
+      if(!form.value.craftPost){
+        proxy.$modal.msgWarning("请选择工种岗位！！！");
+      }
       form.value.remark = JSON.stringify(form.value.craftPost);
       let craftTypeValues = [];
       let craftPostValues = [];