diff --git a/src/views/kc/detection/KcDetectionMain.data.ts b/src/views/kc/detection/KcDetectionMain.data.ts
index 93e15cc..bd8f1ec 100644
--- a/src/views/kc/detection/KcDetectionMain.data.ts
+++ b/src/views/kc/detection/KcDetectionMain.data.ts
@@ -17,6 +17,11 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'kcmc'
   },
+  {
+    title: '授课教师',
+    align: "center",
+    dataIndex: ['ketangbiaoInfo', 'skjs']
+  },
   {
     title: '授课日期',
     align: "center",
@@ -182,16 +187,16 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '累计抓取人数',
-    field: 'allNum',
+    label: '迟到人数',
+    field: 'cdrs',
     component: 'InputNumber',
     colProps: {
       span: 8,
     },
   },
   {
-    label: '平均抓取人数',
-    field: 'averageNum',
+    label: '早退人数',
+    field: 'ztrs',
     component: 'InputNumber',
     colProps: {
       span: 8,
diff --git a/src/views/kc/detection/KcDetectionMainList.vue b/src/views/kc/detection/KcDetectionMainList.vue
index 5db570e..097cfd9 100644
--- a/src/views/kc/detection/KcDetectionMainList.vue
+++ b/src/views/kc/detection/KcDetectionMainList.vue
@@ -1,29 +1,46 @@
 <template>
   <div>
+    <div class="jeecg-basic-table-form-container">
+      <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item label="学期学年">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="课程名称">
+              <j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc"/>
+            </a-form-item>
+          </a-col>
+            <a-col :lg="8">
+              <a-form-item label="授课日期">
+                <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择授课日期'" style="width:100%;" v-model:value="queryParam.searchSkrq"></a-date-picker>
+              </a-form-item>
+            </a-col>
+          <a-col :lg="6">
+            <a-form-item label="授课教师">
+              <a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="6" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <!-- <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleAdd" style="margin-left: 8px"> 新增</a-button> -->
+                <!-- <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
-        <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-              </a-dropdown> -->
-      </template>
+    <BasicTable @register="registerTable" >
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        <TableAction :actions="getTableAction(record)"/>
       </template>
       <!--字段回显插槽-->
       <template #htmlSlot="{ text }">
@@ -44,7 +61,7 @@
 </template>
 
 <script lang="ts" name="detection-kcDetectionMain" setup>
-import { ref, computed, unref } from 'vue';
+import { ref, computed, unref,reactive } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useModal } from '/@/components/Modal';
 import { useListPage } from '/@/hooks/system/useListPage'
@@ -52,6 +69,7 @@ import KcDetectionMainModal from './components/KcDetectionMainModal.vue'
 import { columns, searchFormSchema } from './KcDetectionMain.data';
 import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcDetectionMain.api';
 import { downloadFile } from '/@/utils/common/renderUtils';
+  import { JInput, JDictSelectTag } from '/@/components/Form';
 const checkedKeys = ref<Array<string | number>>([]);
 const queryParam = ref<any>({});
 //注册model
@@ -59,20 +77,10 @@ const [registerModal, { openModal }] = useModal();
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-    title: '教室人数检测-主表',
     api: list,
     columns,
     canResize: false,
-    formConfig: {
-      //labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-      showAdvancedButton: true,
-      fieldMapToNumber: [
-      ],
-      fieldMapToTime: [
-      ],
-    },
+    useSearchForm: false,
     actionColumn: {
       width: 120,
       fixed: 'right'
@@ -94,7 +102,31 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
 })
 
 const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext
+const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
 
+  /**
+   * 查询
+   */
+   function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 /**
  * 新增事件
  */
@@ -147,36 +179,29 @@ function handleSuccess() {
    */
 function getTableAction(record) {
   return [
-    // {
-    //   label: '编辑',
-    //   onClick: handleEdit.bind(null, record),
-    // }
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
     }
   ]
 }
-/**
-   * 下拉操作栏
-   */
-function getDropDownAction(record) {
-  return [
-    // {
-      // label: '详情',
-      // onClick: handleDetail.bind(null, record),
-    // },
-    // {
-    //   label: '删除',
-    //   popConfirm: {
-    //     title: '是否确认删除',
-    //     confirm: handleDelete.bind(null, record),
-    //   }
-    // }
-  ]
-}
-
-
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+  .query-group-cust{
+    width: calc(50% - 15px);
+    min-width: 100px !important;
+  }
+  .query-group-split-cust{
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/kc/detection/components/KcDetectionMainModal.vue b/src/views/kc/detection/components/KcDetectionMainModal.vue
index 5f03b6f..ea49918 100644
--- a/src/views/kc/detection/components/KcDetectionMainModal.vue
+++ b/src/views/kc/detection/components/KcDetectionMainModal.vue
@@ -10,7 +10,7 @@
             </template>
             <template #skkd>{{ getFieldsValue('ketangbiaoInfo')?.ketangbiaoInfo?.skdd }}</template>
             <template #xkrs>{{ getFieldsValue('ketangbiaoInfo')?.ketangbiaoInfo?.xkrs }}</template>
-            <template #dksbl="{ record }">{{ calcAverageNum(record) }}</template>
+            <template #dksbl="{ record }"><div v-html="calcAverageNum(record)"></div></template>
           </a-table>
         </div>
       </template>
@@ -75,7 +75,11 @@ function calcAverageNum(record){
   let xkrsNum = Number(xkrs);
   if(!isNaN(xkrsNum) && xkrsNum != 0 && averageNum != 0) {
     let num = averageNum / xkrsNum * 100;
-    return num.toFixed(2) + '%';
+    if(num > 100){
+      return `<span style="color:red;">`+num.toFixed(2) + `%</sapn>`;
+    }else{
+      return num.toFixed(2) + '%';
+    }
   }else{
     if(averageNum == 0){
       return '0.00' + '%';
diff --git a/src/views/kc/ketang/KcKetangbiaoList.vue b/src/views/kc/ketang/KcKetangbiaoList.vue
index efa0713..ee93647 100644
--- a/src/views/kc/ketang/KcKetangbiaoList.vue
+++ b/src/views/kc/ketang/KcKetangbiaoList.vue
@@ -29,6 +29,11 @@
               <j-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></j-input>
             </a-form-item>
           </a-col>
+          <a-col :lg="8">
+            <a-form-item label="学期学年">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
@@ -43,8 +48,6 @@
     <!--引用表格-->
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
-      <template #tableTitle>
-      </template>
       <!-- 不显示【未选中任何数据】栏 -->
       <template #tableTop><span></span></template>
       <!--操作栏-->
@@ -86,8 +89,9 @@
   import { downloadFile } from '/@/utils/common/renderUtils';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import {JInput } from '/@/components/Form';
+  import { getSysConfig } from '/@/views/site/utils/index';
 
-  const queryParam = ref<any>({});
+  const queryParam = ref<any>({xnxq : getSysConfig().flag1});
   const toggleSearchStatus = ref<boolean>(false);
   const { createMessage } = useMessage();
   const registerModal = ref();
@@ -95,7 +99,6 @@
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
-      title: '课堂管理-子表',
       api: list,
       columns,
       canResize:false,
diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue
index 59b1c44..e6893ee 100644
--- a/src/views/kc/wjxCswj/WjxCswjList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjList.vue
@@ -65,7 +65,7 @@
               <a-button type="primary" @click="handleDelete(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">删除试卷</a-button>
               <a-button type="primary" @click="handlePeizhi(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">编辑题目</a-button>
               <a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">预览题目</a-button>
-              <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">试卷详情</a-button>
+              <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">测验详情</a-button>
               <a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">预览题目</a-button>
               <a-button type="primary" @click="handleDjjgs(item,'')" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">测验结果</a-button>
               <a-button type="primary" @click="handleTjfx(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">统计分析</a-button>
@@ -155,7 +155,7 @@
   }
   //下载答卷
   function handleXzdj(record){
-    defHttp.get({ url: '/wjxWjxx/wjxWjxx/wjxxDownLoad', params: { id: record.id } }).then(res => {
+    defHttp.get({ url: '/wjxWjxx/wjxWjxx/wjxxDownLoad', params: { id: record.id } },{timeout: 60 * 60 * 1000}).then(res => {
       console.log(`🚀 ~ defHttp.get ~ res:`, res)
       if(res.result){
         var downUrl = res.data.download_url;
diff --git a/src/views/kc/wjxCswj/WjxWjxxTjfxForm.vue b/src/views/kc/wjxCswj/WjxWjxxTjfxForm.vue
index 7f83d7b..a84d18d 100644
--- a/src/views/kc/wjxCswj/WjxWjxxTjfxForm.vue
+++ b/src/views/kc/wjxCswj/WjxWjxxTjfxForm.vue
@@ -12,17 +12,17 @@
             <a-input v-model:value="formData.total_count" placeholder="请输入名称" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <a-col :span="24" v-show="formData.atype=='6'">
           <a-form-item label="问卷总分数" >
             <a-input v-model:value="formData.total_score" placeholder="请输入名称" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <a-col :span="24" v-show="formData.atype=='6'">
           <a-form-item label="问卷得分" >
             <a-input v-model:value="formData.score" placeholder="请输入名称" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <a-col :span="24" v-show="formData.atype=='6'">
           <a-form-item label="问卷平均分数" >
             <a-input v-model:value="formData.average_score" placeholder="请输入名称" :disabled="disabled"></a-input>
           </a-form-item>
@@ -107,12 +107,14 @@ import {ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted,
   function edit(record) {
     nextTick(() => {
       resetFields();
+      console.log(`🚀 ~ edit ~ record:`, record)
 
 
     defHttp.get({ url: '/wjxWjxx/wjxWjxx/wjxxTjfx', params: { id: record.id } }).then(res => {
       console.log(`🚀 ~ defHttp.get ~ res:`, res.data)
       //赋值
       Object.assign(formData, res.data);
+      formData.atype = record.atype;
     });
 
 
diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue
index db38a41..13452e7 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue
@@ -153,7 +153,7 @@
   }
   //下载答卷
   function handleXzdj(record){
-    defHttp.get({ url: '/wjxWjxx/wjxWjxx/wjxxDownLoad', params: { id: record.id } }).then(res => {
+    defHttp.get({ url: '/wjxWjxx/wjxWjxx/wjxxDownLoad', params: { id: record.id } },{timeout: 60 * 60 * 1000}).then(res => {
       console.log(`🚀 ~ defHttp.get ~ res:`, res)
       if(res.result){
         var downUrl = res.data.download_url;
@@ -216,21 +216,6 @@
     WjxWjxxTmlbDjModalPage.value.edit(record,true,"1",'ls');
   }
 
-  // /**
-  //  * 答卷详情
-  //  */
-  // function handleDj(record: Recordable) {
-  //   WjxWjxxTmlbDjModalPage.value.disableSubmit = false;
-  //   WjxWjxxTmlbDjModalPage.value.edit(record,false);
-  // }
-
-  /**
-   * 答卷详情
-   */
-  // function handleDjjg(record: Recordable) {
-  //   WjxWjxxTmlbDjjgModalPage.value.disableSubmit = true;
-  //   WjxWjxxTmlbDjjgModalPage.value.edit(record,false);
-  // }
 
   /**
    * 学生答卷列表
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue
index a1cc929..e91e249 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue
@@ -146,7 +146,7 @@ async function submitForm(){
       }
       values[i].itemSelected = param.itemSelected+"";
     }else if(param.wjType == 5){
-      if(param.wjAnswer == null){
+      if(param.wjAnswer == null||param.wjAnswer == ""){
         emit('closeLoading');
         createMessage.warning("有题目没有作答，请检查试卷，完成所有作答！");
         return;
@@ -155,7 +155,6 @@ async function submitForm(){
     // values[i].openTime = openTime.value;
   }
   const isUpdate = false
-  console.log(`🚀 ~ submitForm ~ values:`, values)
   await djtj(values, isUpdate);
   //关闭弹窗
   emit('ok');
diff --git a/src/views/zy/sysZy/jxnr/ZyJxdgList.vue b/src/views/zy/sysZy/jxnr/ZyJxdgList.vue
index 123a1e7..8cce73d 100644
--- a/src/views/zy/sysZy/jxnr/ZyJxdgList.vue
+++ b/src/views/zy/sysZy/jxnr/ZyJxdgList.vue
@@ -11,7 +11,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="开课单位">
-              <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/>
+              <!-- <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/> -->
+              <JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
diff --git a/src/views/zy/sysZy/kccygl/Kccygl.data.ts b/src/views/zy/sysZy/kccygl/Kccygl.data.ts
index 15a6eff..a2cb3c1 100644
--- a/src/views/zy/sysZy/kccygl/Kccygl.data.ts
+++ b/src/views/zy/sysZy/kccygl/Kccygl.data.ts
@@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'xkrs',
   },
   {
-    title: '作业数量',
+    title: '测验数量',
     align: "center",
     dataIndex: 'num',
   },
diff --git a/src/views/zy/sysZy/kccygl/KccyglList.vue b/src/views/zy/sysZy/kccygl/KccyglList.vue
index cf07e5d..2b78adf 100644
--- a/src/views/zy/sysZy/kccygl/KccyglList.vue
+++ b/src/views/zy/sysZy/kccygl/KccyglList.vue
@@ -11,7 +11,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="开课单位">
-              <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/>
+              <!-- <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/> -->
+              <JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
diff --git a/src/views/zy/sysZy/kccygl/components/KccyglForm.vue b/src/views/zy/sysZy/kccygl/components/KccyglForm.vue
index 04c49d1..507f9ed 100644
--- a/src/views/zy/sysZy/kccygl/components/KccyglForm.vue
+++ b/src/views/zy/sysZy/kccygl/components/KccyglForm.vue
@@ -48,11 +48,11 @@
               </a-row>
             </a-col>
             <a-col :span="24" style="text-align:center;margin-top:8px;">
-              <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" >试卷详情</a-button>
+              <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" >测验详情</a-button>
               <a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" >预览题目</a-button>
-              <a-button type="primary" @click="handleDjjgs(item,'')" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" >测验结果</a-button>
-              <a-button type="primary" @click="handleTjfx(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" >统计分析</a-button>
-              <a-button type="primary" @click="handleXzdj(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" >下载答卷</a-button>
+              <a-button type="primary" @click="handleDjjgs(item,'')" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">测验结果</a-button>
+              <a-button type="primary" @click="handleTjfx(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">统计分析</a-button>
+              <a-button type="primary" @click="handleXzdj(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">下载答卷</a-button>
             </a-col>
           </a-row>
         </a-card>
@@ -67,7 +67,8 @@
       </a-col>
     </a-row>
 
-    <ZyInfoModal ref="registerModal" ></ZyInfoModal>
+
+    <WjxWjxxModal ref="registerModal"></WjxWjxxModal>
     <ZyInfoStudentListModal ref="ZyInfoStudentListModalPage" ></ZyInfoStudentListModal>
     <WjxWjxxTmlbDjModal ref="WjxWjxxTmlbDjModalPage" ></WjxWjxxTmlbDjModal>
     <WjxWjxxTmlbDjjgsModal ref="WjxWjxxTmlbDjjgsModalPage" ></WjxWjxxTmlbDjjgsModal>
@@ -83,7 +84,7 @@
   import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../Kczygl.api';
   import { Form } from 'ant-design-vue';
-  import ZyInfoModal from '/@/views/zy/zyInfo/components/ZyInfoModal.vue';
+  import WjxWjxxModal from '/@/views/kc/wjxWjxx/components/WjxWjxxModal.vue'
   import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue';
   import dayjs from 'dayjs';
   import { JInput,JDictSelectTag } from '/@/components/Form';
@@ -175,7 +176,7 @@ function handleTjfx(record){
   }
   //下载答卷
   function handleXzdj(record){
-    defHttp.get({ url: '/wjxWjxx/wjxWjxx/wjxxDownLoad', params: { id: record.id } }).then(res => {
+    defHttp.get({ url: '/wjxWjxx/wjxWjxx/wjxxDownLoad', params: { id: record.id } },{timeout: 60 * 60 * 1000}).then(res => {
       console.log(`🚀 ~ defHttp.get ~ res:`, res)
       if(res.result){
         var downUrl = res.data.download_url;
diff --git a/src/views/zy/sysZy/kczygl/KczyglList.vue b/src/views/zy/sysZy/kczygl/KczyglList.vue
index 49e6613..7a0f089 100644
--- a/src/views/zy/sysZy/kczygl/KczyglList.vue
+++ b/src/views/zy/sysZy/kczygl/KczyglList.vue
@@ -11,7 +11,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="开课单位">
-              <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/>
+              <!-- <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/> -->
+              <JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
diff --git a/src/views/zy/sysZy/studentcygl/StudentcyglList.vue b/src/views/zy/sysZy/studentcygl/StudentcyglList.vue
index c7ba631..529c691 100644
--- a/src/views/zy/sysZy/studentcygl/StudentcyglList.vue
+++ b/src/views/zy/sysZy/studentcygl/StudentcyglList.vue
@@ -11,7 +11,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="开课单位">
-              <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/>
+              <!-- <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/> -->
+              <JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -31,12 +32,12 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="学生姓名">
-              <a-input placeholder="请输入课程编号" v-model:value="queryParam.stuName"/>
+              <a-input placeholder="请输入学生姓名" v-model:value="queryParam.stuName"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item label="学号">
-              <a-input placeholder="请输入授课教师" v-model:value="queryParam.stuNo"/>
+              <a-input placeholder="请输入学号" v-model:value="queryParam.stuNo"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="6" :md="8" :sm="24">
@@ -95,7 +96,7 @@
   const globSetting = useGlobSetting();
   const baseApiUrl = globSetting.domainUrl;
   const { createMessage } = useMessage();
-  const queryParam = ref<any>({});
+  const queryParam = ref<any>({atype:'6'});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   //注册table数据
@@ -116,7 +117,7 @@
       },
     },
     exportConfig: {
-      name: "课程作业管理",
+      name: "课程测验管理",
       url: getExportUrl,
       params: () => {
         return Object.assign({},queryParam.value);
diff --git a/src/views/zy/sysZy/studentzygl/Studentzygl.data.ts b/src/views/zy/sysZy/studentzygl/Studentzygl.data.ts
index 22cc45c..6373cf0 100644
--- a/src/views/zy/sysZy/studentzygl/Studentzygl.data.ts
+++ b/src/views/zy/sysZy/studentzygl/Studentzygl.data.ts
@@ -39,6 +39,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'status',
   },
+  {
+    title: '作业上传时间',
+    align: 'center',
+    dataIndex: 'publishTime',
+  },
   {
     title: '网络是否通过',
     align: 'center',
@@ -64,7 +69,7 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'xnsftgaction' },
   },
   {
-    title: '成绩',
+    title: '评分',
     align: "center",
     dataIndex: 'score',
   },
diff --git a/src/views/zy/sysZy/studentzygl/StudentzyglList.vue b/src/views/zy/sysZy/studentzygl/StudentzyglList.vue
index c2f21ce..ea0736c 100644
--- a/src/views/zy/sysZy/studentzygl/StudentzyglList.vue
+++ b/src/views/zy/sysZy/studentzygl/StudentzyglList.vue
@@ -11,7 +11,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="开课单位">
-              <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/>
+              <!-- <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"/> -->
+              <JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -31,12 +32,12 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="学生姓名">
-              <a-input placeholder="请输入课程编号" v-model:value="queryParam.stuName"/>
+              <a-input placeholder="请输入学生姓名" v-model:value="queryParam.stuName"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item label="学号">
-              <a-input placeholder="请输入授课教师" v-model:value="queryParam.stuNo"/>
+              <a-input placeholder="请输入学号" v-model:value="queryParam.stuNo"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -125,7 +126,10 @@
           <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过" @click="handleYulan(record.wwpaperviewurl)">{{record.wwxsl}}%</span>
           <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过" @click="handleYulan(record.wwpaperviewurl)">{{record.wwxsl}}%</span>
           <span v-else>
-            <span v-if="record.filePath">检测中</span>
+            <span v-if="record.wwcc=='1'">
+              <span v-if="record.filePath">检测中</span>
+              <span v-else>-</span>
+            </span>
             <span v-else>-</span>
           </span>
         </span>
@@ -136,7 +140,10 @@
           <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过" @click="handleYulan(record.zypaperviewurl)">{{record.nwxsl}}%</span>
           <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过" @click="handleYulan(record.zypaperviewurl)">{{record.nwxsl}}%</span>
           <span v-else>
-            <span v-if="record.filePath">检测中</span>
+            <span v-if="record.nwcc=='1'">
+              <span v-if="record.filePath">检测中</span>
+              <span v-else>-</span>
+            </span>
             <span v-else>-</span>
           </span>
         </span>
@@ -147,7 +154,10 @@
           <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过" @click="handleYulan(record.aigcpaperviewurl)">{{record.aigcxsl}}%</span>
           <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过" @click="handleYulan(record.aigcpaperviewurl)">{{record.aigcxsl}}%</span>
           <span v-else>
-            <span v-if="record.filePath">检测中</span>
+            <span v-if="record.aigccc=='1'">
+              <span v-if="record.filePath">检测中</span>
+              <span v-else>-</span>
+            </span>
             <span v-else>-</span>
           </span>
         </span>
@@ -158,8 +168,11 @@
           <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过" @click="handleYulan(record.xxpaperviewurl)">{{record.xnxsl}}%</span>
           <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过" @click="handleYulan(record.xxpaperviewurl)">{{record.xnxsl}}%</span>
           <span v-else>
+            <span v-if="record.xncc=='1'">
             <span v-if="record.filePath">检测中</span>
             <span v-else>-</span>
+            </span>
+            <span v-else>-</span>
           </span>
         </span>
       </template>
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index ab76038..76e2f76 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -220,10 +220,6 @@ const baseApiUrl = globSetting.domainUrl;
 
   //预览
   function handlePreview(record){
-    // record.isYl = true;
-    // ZyInfoStudentModalPage.value.disableSubmit = true;
-    // ZyInfoStudentModalPage.value.edit(record);
-    
     var url2 = getFileAccessHttpUrl(record.stuPdfPath)
     let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
     window.open(url,"_blank")
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
index 7a059de..32be81b 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
@@ -17,7 +17,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
-                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">刷新</a-button>
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
                 <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
               </a-col>