Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx

src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue

@@ -263,6 +263,7 @@ for(var i=0;i<record.length;i++){
     tiganData.value = [...list];
   }else if(type==5){
     var huida = record[i].wjAnswer
+    console.log(`🚀 ~ handleYytkSuccess ~ wjLeixing:`, wjLeixing)
     if(wjLeixing=='1'){
       huida = "";
     }

src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts

@@ -143,3 +143,16 @@ export const wjxWjxxTmxxColumns: JVxeColumn[] = [
       ],
     },
   ]
+  
+  export const wjxWjdcColumns: JVxeColumn[] = [
+      {
+        title: '选项',
+        key: 'itemTitle',
+        type: JVxeTypes.text,
+        placeholder: '请输入${title}',
+        defaultValue:'',
+          validateRules: [
+            { required: true, message: '${title}不能为空' },
+          ],
+      },
+    ]

src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue

@@ -7,7 +7,7 @@
             <a-input v-model:value="formData.wjTitle" placeholder="请输入题干" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="12">
+        <a-col :span="12" v-if="formData.wjLeixing == '6'">
           <a-form-item label="问题分值" v-bind="validateInfos.wjScore">
 	          <a-input-number v-model:value="formData.wjScore" placeholder="请输入问题分值" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
@@ -46,7 +46,7 @@
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
   import { queryWjxWjxxTmxxListByMainId, queryDataById, saveOrUpdate } from '../WjxWjxxTmlb.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
-  import {wjxWjxxTmxxColumns} from '../WjxWjxxTmlb.data';
+  import {wjxWjxxTmxxColumns,wjxWjdcColumns} from '../WjxWjxxTmlb.data';
   import { Form } from 'ant-design-vue';
   const useForm = Form.useForm;
 
@@ -67,11 +67,6 @@
     setup(props, {emit}) {
       const loading = ref(false);
       const wjxWjxxTmxxTableRef = ref();
-      const wjxWjxxTmxxTable = reactive<Record<string, any>>({
-        loading: false,
-        columns: wjxWjxxTmxxColumns,
-        dataSource: []
-      });
       const activeKey = ref('wjxWjxxTmxx');
       const formData = reactive<Record<string, any>>({
         id: '',
@@ -79,6 +74,12 @@
         wjScore: '',
       });
 
+      console.log(`🚀 ~ setup ~ formData.wjLeixing:`, formData.wjLeixing)
+      const wjxWjxxTmxxTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: formData.wjLeixing=='1'?wjxWjdcColumns:wjxWjxxTmxxColumns,
+        dataSource: []
+      });
       //表单验证
       const validatorRules = reactive({
       });

src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue

@@ -123,7 +123,7 @@ const baseApiUrl = globSetting.domainUrl;
   //教学大纲提交附件
   function jxdgChange(record){
     console.log(`🚀 ~ jxdgChange ~ record:`, record)
-    var model = {id:jxdgInfo.value.id,filePath:record,rwbh:rwbh,xqxn:xqxn}
+    var model = {id:jxdgInfo.value.id,filePath:record,rwbh,xqxn}
     defHttp.post({ url: '/zyJxdg/zyJxdg/jxdgScfj', params: model }).then((res) => {
       getKcjsJxdg();
     });
@@ -131,7 +131,7 @@ const baseApiUrl = globSetting.domainUrl;
 
   function jxrlChange(record){
     console.log(`🚀 ~ jxdgChange ~ record:`, record)
-    var model = {id:jxdgInfo.value.id,jxrlFilePath:record,rwbh,xqxn:xqxn}
+    var model = {id:jxdgInfo.value.id,jxrlFilePath:record,rwbh,xqxn}
     defHttp.post({ url: '/zyJxdg/zyJxdg/jxrlScfj', params: model }).then((res) => {
       getKcjsJxdg();
     });

src/views/zy/zyInfo/StudentZyInfoList.vue

@@ -154,19 +154,19 @@ const baseApiUrl = globSetting.domainUrl;
     let timestamp = new Date().getTime();
     let startTimestamp = Date.parse(record.startTime);
     if(timestamp<startTimestamp){
-      createMessage.error('还未到答卷时间！');
+      createMessage.error('还未到提交作业时间！');
       return;
     }
-    let endTimestamp = Date.parse(record.endTime);
+    let endTimestamp = Date.parse(record.endTime+" 23:59:59");
     if(timestamp>endTimestamp){
-      createMessage.error('答卷时间已过！');
+      createMessage.error('提交作业时间已过！');
       return;
     }
 
     createConfirm({
       iconType: 'warning',
       title: '确认上传',
-      content: '是否确认上传作业',
+      content: '作业上传后，不可修改，请仔细检查后提交',
       okText: '确认',
       cancelText: '取消',
       onOk: () => {

src/views/zy/zyInfoStudent/components/SzybStudentForm.vue

@@ -102,7 +102,7 @@ const { createConfirm } = useMessage();
     createConfirm({
       iconType: 'warning',
       title: '确认提交',
-      content: '是否确认提交数据',
+      content: '作业上传后，不可修改，请仔细检查后提交',
       okText: '确认',
       cancelText: '取消',
       onOk: () => {