diff --git a/src/router/routes/modules/stuzy/stuzy.ts b/src/router/routes/modules/stuzy/stuzy.ts
index 219104f..c017578 100644
--- a/src/router/routes/modules/stuzy/stuzy.ts
+++ b/src/router/routes/modules/stuzy/stuzy.ts
@@ -28,7 +28,7 @@ const stuzy: AppRouteModule = {
       meta: {
         title: '当前作业',
       },
-      component: () => import('/@/views/zy/zyInfo/StudentZyInfoList.vue'),
+      component: () => import('/@/views/zy/zyInfo/StudentZyInfoMainList.vue'),
     },
     {
       path: 'studentLszy',
@@ -41,7 +41,7 @@ const stuzy: AppRouteModule = {
     {
       path: 'stuCeshiWenjuan',
       name: 'stuCeshiWenjuan',
-      component: () => import('/@/views/kc/wjxCswj/WjxCswjStuList.vue'),
+      component: () => import('/@/views/kc/wjxCswj/WjxCswjStuMainList.vue'),
       meta: {
         title: '测试问卷',
       },
@@ -49,7 +49,7 @@ const stuzy: AppRouteModule = {
     {
       path: 'stuDcwjWenjuan',
       name: 'stuDcwjWenjuan',
-      component: () => import('/@/views/kc/wjxDcwj/WjxDcwjStuList.vue'),
+      component: () => import('/@/views/kc/wjxDcwj/WjxDcwjStuMainList.vue'),
       meta: {
         title: '调查问卷',
       },
diff --git a/src/views/kc/wjxCswj/WjxCswjStuLiebiaoList.vue b/src/views/kc/wjxCswj/WjxCswjStuLiebiaoList.vue
new file mode 100644
index 0000000..72fa88a
--- /dev/null
+++ b/src/views/kc/wjxCswj/WjxCswjStuLiebiaoList.vue
@@ -0,0 +1,205 @@
+<template>
+  <div style="margin-top:20px;">
+    <!--查询区域-->
+    <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="7">
+            <a-form-item label="测验名称">
+              <a-input placeholder="请输入测验名称" v-model:value="queryParam.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="7">
+            <a-form-item label="测验类型">
+              <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.flag">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="-1">待提交</a-select-option>
+                <!-- <a-select-option value="0">待评分</a-select-option> -->
+                <a-select-option value="1">已完成</a-select-option>
+              </a-select>
+            </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">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" style="margin-top:-20px;">
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"  />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+
+    </BasicTable>
+    <!-- 表单区域 -->
+    <WjxWjxxTmlbDjModal ref="WjxWjxxTmlbDjModalPage" @success="handleSuccess"></WjxWjxxTmlbDjModal>
+    <WjxWjxxTmlbDjjgModal ref="WjxWjxxTmlbDjjgModalPage" @success="handleSuccess"></WjxWjxxTmlbDjjgModal>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfoStudent-zyInfoStudent" setup>
+  import { ref, reactive,defineExpose,unref } from 'vue';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columnsKccyStu } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.data';
+  import { stuKccyList } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.api';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+
+  import WjxWjxxTmlbDjModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjModal.vue'
+  import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
+  import { useGlobSetting } from '/@/hooks/setting';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import {  JInput } from '/@/components/Form';
+  import { useRouter } from 'vue-router';
+
+  const { currentRoute } = useRouter();
+  const { query } = unref(currentRoute);
+  const { rwbh,xqxn,type,teano } = query;//获取传递参数
+
+  const { createMessage } = useMessage();
+
+  const queryParam = ref<any>({rwbh,xqxn,teano,atype:'6'});
+
+  const WjxWjxxTmlbDjModalPage = ref();
+  const WjxWjxxTmlbDjjgModalPage = ref();
+
+  //注册table数据
+  const { prefixCls, tableContext} = useListPage({
+    tableProps: {
+      api: stuKccyList,
+      columns:columnsKccyStu,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: '150px',
+        fixed: 'right',
+      },
+        showTableSetting: true,
+        defSort: {
+          field: 'name',
+          order: 'ascend',
+        },
+      beforeFetch: (params) => {
+        params.column = 'createTime',params.order = 'desc';//新生成的默认不带排序
+        return Object.assign(params, queryParam.value);
+      },
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  
+ /**
+   * 答卷详情
+   */
+  function handleDj(record: Recordable) {
+    let timestamp = new Date().getTime();
+    let startTimestamp = Date.parse(record.startTime);
+    if(timestamp<startTimestamp){
+      createMessage.error('还未到答卷时间！');
+      return;
+    }
+    let endTimestamp = Date.parse(record.endTime+" 23:59:59");
+    if(timestamp>endTimestamp){
+      createMessage.error('答卷时间已过！');
+      return;
+    }
+    WjxWjxxTmlbDjModalPage.value.disableSubmit = false;
+    WjxWjxxTmlbDjModalPage.value.edit(record,false,"6",'xs');
+  }
+
+  /**
+   * 答卷详情
+   */
+  function handleDjjg(record: Recordable) {
+    WjxWjxxTmlbDjjgModalPage.value.disableSubmit = true;
+    WjxWjxxTmlbDjjgModalPage.value.edit(record.djId,false);
+  }
+
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+
+
+    // <a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='-1'">开始测验</a-button>
+    //           <a-button type="primary" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);color:#ffffff" v-if="item.flag=='0'" disabled>正在批卷</a-button>
+    //           <a-button type="primary" @click="handleDjjg(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='1'">查看结果</a-button>
+    if(record.flag == '-1'){
+      var list = [
+          {
+            label: '开始测验',
+            onClick: handleDj.bind(null, record),
+          },
+        ];
+        return list;
+    }else if(record.flag == '0'){
+        return null;
+    }else{
+      var list = [
+          {
+            label: '查看结果',
+            onClick: handleDjjg.bind(null, record),
+          },
+      ];
+      return list;
+    }
+
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+
+</script>
+
+<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>
diff --git a/src/views/kc/wjxCswj/WjxCswjStuList.vue b/src/views/kc/wjxCswj/WjxCswjStuList.vue
index 4d7a3ba..0804deb 100644
--- a/src/views/kc/wjxCswj/WjxCswjStuList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjStuList.vue
@@ -23,7 +23,6 @@
             <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-col>
             </span>
           </a-col>
diff --git a/src/views/kc/wjxCswj/WjxCswjStuMainList.vue b/src/views/kc/wjxCswj/WjxCswjStuMainList.vue
new file mode 100644
index 0000000..736a2f5
--- /dev/null
+++ b/src/views/kc/wjxCswj/WjxCswjStuMainList.vue
@@ -0,0 +1,27 @@
+<template>
+  <div style="background: #fff;height: 97%;margin: 10px 0;">
+    <div style="text-align:right;width:100%;">
+      <a-switch v-model:checked="checked1" checkedChildren="卡片" unCheckedChildren="列表" @change="onChange1"/>
+    </div>
+    <div v-if="checked1">
+      <WjxCswjStuList/>
+    </div>
+    <div v-if="!checked1">
+      <WjxCswjStuLiebiaoList/>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfo-zyInfo" setup>
+  import { ref, reactive, onMounted,unref } from 'vue';
+  import WjxCswjStuLiebiaoList from '/@/views/kc/wjxCswj/WjxCswjStuLiebiaoList.vue'
+  import WjxCswjStuList from '/@/views/kc/wjxCswj/WjxCswjStuList.vue'
+
+  const checked1 = ref(true);
+
+  function onChange1(record){
+  }
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuLiebiaoList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuLiebiaoList.vue
new file mode 100644
index 0000000..0937901
--- /dev/null
+++ b/src/views/kc/wjxDcwj/WjxDcwjStuLiebiaoList.vue
@@ -0,0 +1,205 @@
+<template>
+  <div style="margin-top:20px;">
+    <!--查询区域-->
+    <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="7">
+            <a-form-item label="测验名称">
+              <a-input placeholder="请输入测验名称" v-model:value="queryParam.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="7">
+            <a-form-item label="测验类型">
+              <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.flag">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="-1">待提交</a-select-option>
+                <!-- <a-select-option value="0">待评分</a-select-option> -->
+                <a-select-option value="1">已完成</a-select-option>
+              </a-select>
+            </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">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" style="margin-top:-20px;">
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"  />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+
+    </BasicTable>
+    <!-- 表单区域 -->
+    <WjxWjxxTmlbDjModal ref="WjxWjxxTmlbDjModalPage" @success="handleSuccess"></WjxWjxxTmlbDjModal>
+    <WjxWjxxTmlbDjjgModal ref="WjxWjxxTmlbDjjgModalPage" @success="handleSuccess"></WjxWjxxTmlbDjjgModal>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfoStudent-zyInfoStudent" setup>
+  import { ref, reactive,defineExpose,unref } from 'vue';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columnsKccyStu } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.data';
+  import { stuKccyList } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.api';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+
+  import WjxWjxxTmlbDjModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjModal.vue'
+  import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
+  import { useGlobSetting } from '/@/hooks/setting';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import {  JInput } from '/@/components/Form';
+  import { useRouter } from 'vue-router';
+
+  const { currentRoute } = useRouter();
+  const { query } = unref(currentRoute);
+  const { rwbh,xqxn,type,teano } = query;//获取传递参数
+
+  const { createMessage } = useMessage();
+
+  const queryParam = ref<any>({rwbh,xqxn,teano,atype:'1'});
+
+  const WjxWjxxTmlbDjModalPage = ref();
+  const WjxWjxxTmlbDjjgModalPage = ref();
+
+  //注册table数据
+  const { prefixCls, tableContext} = useListPage({
+    tableProps: {
+      api: stuKccyList,
+      columns:columnsKccyStu,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: '150px',
+        fixed: 'right',
+      },
+        showTableSetting: true,
+        defSort: {
+          field: 'name',
+          order: 'ascend',
+        },
+      beforeFetch: (params) => {
+        params.column = 'createTime',params.order = 'desc';//新生成的默认不带排序
+        return Object.assign(params, queryParam.value);
+      },
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  
+ /**
+   * 答卷详情
+   */
+  function handleDj(record: Recordable) {
+    let timestamp = new Date().getTime();
+    let startTimestamp = Date.parse(record.startTime);
+    if(timestamp<startTimestamp){
+      createMessage.error('还未到答卷时间！');
+      return;
+    }
+    let endTimestamp = Date.parse(record.endTime+" 23:59:59");
+    if(timestamp>endTimestamp){
+      createMessage.error('答卷时间已过！');
+      return;
+    }
+    WjxWjxxTmlbDjModalPage.value.disableSubmit = false;
+    WjxWjxxTmlbDjModalPage.value.edit(record,false,"6",'xs');
+  }
+
+  /**
+   * 答卷详情
+   */
+  function handleDjjg(record: Recordable) {
+    WjxWjxxTmlbDjjgModalPage.value.disableSubmit = true;
+    WjxWjxxTmlbDjjgModalPage.value.edit(record.djId,false);
+  }
+
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+
+
+    // <a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='-1'">开始测验</a-button>
+    //           <a-button type="primary" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);color:#ffffff" v-if="item.flag=='0'" disabled>正在批卷</a-button>
+    //           <a-button type="primary" @click="handleDjjg(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='1'">查看结果</a-button>
+    if(record.flag == '-1'){
+      var list = [
+          {
+            label: '开始答卷',
+            onClick: handleDj.bind(null, record),
+          },
+        ];
+        return list;
+    }else if(record.flag == '0'){
+        return null;
+    }else{
+      var list = [
+          {
+            label: '查看结果',
+            onClick: handleDjjg.bind(null, record),
+          },
+      ];
+      return list;
+    }
+
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+
+</script>
+
+<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>
diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuMainList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuMainList.vue
new file mode 100644
index 0000000..249e78a
--- /dev/null
+++ b/src/views/kc/wjxDcwj/WjxDcwjStuMainList.vue
@@ -0,0 +1,27 @@
+<template>
+  <div style="background: #fff;height: 97%;margin: 10px 0;">
+    <div style="text-align:right;width:100%;">
+      <a-switch v-model:checked="checked1" checkedChildren="卡片" unCheckedChildren="列表" @change="onChange1"/>
+    </div>
+    <div v-if="checked1">
+      <WjxDcwjStuList/>
+    </div>
+    <div v-if="!checked1">
+      <WjxDcwjStuLiebiaoList/>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfo-zyInfo" setup>
+  import { ref, reactive, onMounted,unref } from 'vue';
+  import WjxDcwjStuLiebiaoList from '/@/views/kc/wjxDcwj/WjxDcwjStuLiebiaoList.vue'
+  import WjxDcwjStuList from '/@/views/kc/wjxDcwj/WjxDcwjStuList.vue'
+
+  const checked1 = ref(true);
+
+  function onChange1(record){
+  }
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue
index 41ddf62..09aac40 100644
--- a/src/views/site/studentWdkc/studentMenu.vue
+++ b/src/views/site/studentWdkc/studentMenu.vue
@@ -16,21 +16,23 @@
                     <!-- <a-menu-item key="2" @click="getGzt('tzgg')">通知公告</a-menu-item> -->
                     <a-menu-item key="3" @click="getGzt('stuJiaoXueDanYuanNeiRong')">教学单元</a-menu-item>
                   </a-sub-menu>
-                  <a-sub-menu key="sub4">
+                  <a-menu-item key="sub4">
+                    <span @click="getGzt('dqzy')">课程作业</span>
+                  </a-menu-item>
+                  <a-menu-item key="sub7">
+                    <span @click="getGzt('kcjc')">课程测验</span>
+                  </a-menu-item>
+                  <!-- <a-sub-menu key="sub4">
                     <template #title>作业/测验</template>
                     <a-menu-item key="4" @click="getGzt('dqzy')">课程作业</a-menu-item>
                     <a-menu-item key="5" @click="getGzt('kcjc')">课程测验</a-menu-item>
-                  </a-sub-menu>
+                  </a-sub-menu> -->
                   <a-menu-item key="sub5">
                     <span @click="getGzt('dcwj')">问卷调查</span>
                   </a-menu-item>
                   <a-menu-item key="sub6">
                     <span @click="getGzt('tlq')">讨论区</span>
                   </a-menu-item>
-                  <!-- <a-menu-item key="sub6">
-                    <span>讨论区</span>
-                  </a-menu-item>
-                  -->
                 </a-menu>
               </a-col>
               <a-col :lg="0" :xs="{ span: 24 }" style="text-align: right;">
diff --git a/src/views/zy/zyInfo/StudentZyInfoLiebiaoList.vue b/src/views/zy/zyInfo/StudentZyInfoLiebiaoList.vue
new file mode 100644
index 0000000..f694b20
--- /dev/null
+++ b/src/views/zy/zyInfo/StudentZyInfoLiebiaoList.vue
@@ -0,0 +1,365 @@
+<template>
+  <div style="margin-top:20px;">
+    <!--查询区域-->
+    <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="8">
+            <a-form-item label="作业名称">
+              <j-input placeholder="请输入作业名称" v-model:value="queryParam.title"></j-input>
+            </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">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form> -->
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" style="margin-top:-20px;">
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"  />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+
+      <template #wwsftgaction="{text,record}">
+        <span v-if="record.wwcc=='0'">-</span>
+        <span v-else>
+          <template v-if="record.wwfilestateid=='3'">
+            <span :title="record.wwmessage?record.wwmessage:'暂无原因，请联系管理员'" style="color:red;">检测失败</span>
+          </template>
+          <template v-else>
+            <span v-if="text=='通过'" style="color: green;padding: 5px 15px;cursor:pointer" title="通过(点击可查看对比结果)" @click="handleYulan(record.wwpaperviewurl)">{{record.wwxsl}}%</span>
+            <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;cursor:pointer" title="未通过(点击可查看对比结果)" @click="handleYulan(record.wwpaperviewurl)">{{record.wwxsl}}%</span>
+            <span v-else-if="text&&text.indexOf('失败')>-1" style="color: red;padding: 5px 15px;cursor:pointer" :title="text">{{text}}</span>
+            <span v-else>
+              <span v-if="record.filePath">检测中</span>
+              <span v-else>未提交</span>
+            </span>
+          </template>
+        </span>
+      </template>
+      <template #nwsftgaction="{text,record}">
+        <span v-if="record.nwcc=='0'">-</span>
+        <span v-else>
+          <template v-if="record.zyfilestateid=='3'">
+            <span :title="record.zymessage?record.zymessage:'暂无原因，请联系管理员'" style="color:red;">检测失败</span>
+          </template>
+          <template v-else>
+            <span v-if="text=='通过'" style="color: green;padding: 5px 15px;cursor:pointer" title="通过(点击可查看对比结果)" @click="handleYulan(record.zypaperviewurl)">{{record.nwxsl}}%</span>
+            <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;cursor:pointer" title="未通过(点击可查看对比结果)" @click="handleYulan(record.zypaperviewurl)">{{record.nwxsl}}%</span>
+            <span v-else-if="text&&text.indexOf('失败')>-1" style="color: red;padding: 5px 15px;cursor:pointer" :title="text">{{text}}</span>
+            <span v-else>
+              <span v-if="record.filePath">检测中</span>
+              <span v-else>未提交</span>
+            </span>
+          </template>
+        </span>
+      </template>
+      <template #aigcsftgaction="{text,record}">
+        <span v-if="record.aigccc=='0'">-</span>
+        <span v-else>
+          <template v-if="record.aigcfilestateid=='3'">
+            <span :title="record.aigcmessage?record.aigcmessage:'暂无原因，请联系管理员'" style="color:red;">检测失败</span>
+          </template>
+          <template v-else>
+            <span v-if="text=='通过'" style="color: green;padding: 5px 15px;cursor:pointer" title="通过(点击可查看对比结果)" @click="handleYulan(record.aigcpaperviewurl)">{{record.aigcxsl}}%</span>
+            <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;cursor:pointer" title="未通过(点击可查看对比结果)" @click="handleYulan(record.aigcpaperviewurl)">{{record.aigcxsl}}%</span>
+            <span v-else-if="text&&text.indexOf('失败')>-1" style="color: red;padding: 5px 15px;cursor:pointer" :title="text">{{text}}</span>
+            <span v-else>
+              <span v-if="record.filePath">检测中</span>
+              <span v-else>未提交</span>
+            </span>
+          </template>
+        </span>
+      </template>
+      <template #xnsftgaction="{text,record}">
+        <span v-if="record.xncc=='0'">-</span>
+        <span v-else>
+          <template v-if="record.xxfilestateid=='3'">
+            <span :title="record.xxmessage?record.xxmessage:'暂无原因，请联系管理员'" style="color:red;">检测失败</span>
+          </template>
+          <template v-else>
+            <span v-if="text=='通过'" style="color: green;padding: 5px 15px;cursor:pointer" title="通过(点击可查看对比结果)" @click="handleYulan(record.xxpaperviewurl)">{{record.xnxsl}}%</span>
+            <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;cursor:pointer" title="未通过(点击可查看对比结果)" @click="handleYulan(record.xxpaperviewurl)">{{record.xnxsl}}%</span>
+            <span v-else-if="text&&text.indexOf('失败')>-1" style="color: red;padding: 5px 15px;cursor:pointer" :title="text">{{text}}</span>
+            <span v-else>
+              <span v-if="record.filePath">检测中</span>
+              <span v-else>未提交</span>
+            </span>
+          </template>
+        </span>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ZyInfoDetailModal ref="registerModal" @success="handleSuccess"></ZyInfoDetailModal>
+    <ZyInfoStudentListModal ref="ZyInfoStudentListModalPage"></ZyInfoStudentListModal>
+    <ZyInfoStudentModal ref="ZyInfoStudentModalPage" @success="handleSuccess"></ZyInfoStudentModal>
+    <XxhbbksListModal ref="XxhbbksListModalPage"></XxhbbksListModal>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfoStudent-zyInfoStudent" setup>
+  import { ref, reactive,defineExpose,unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columnsStu } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.data';
+  import { stuList, deleteOne, batchDelete, getImportUrl, getExportUrl,batchFabu } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+
+  // import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue'
+  // import SzybStudentModal from '/@/views/zy/zyInfoStudent/components/SzybStudentModal.vue';
+  // import ZyInfoStudentScoreModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue'
+
+  import ZyInfoDetailModal from './components/ZyInfoDetailModal.vue';
+  import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue';
+  import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue';
+  import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
+  import { useGlobSetting } from '/@/hooks/setting';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import {  JInput } from '/@/components/Form';
+  import { useRouter } from 'vue-router';
+
+  const { currentRoute } = useRouter();
+  const { query } = unref(currentRoute);
+  const { rwbh,xqxn,type,teano } = query;//获取传递参数
+
+  const { createMessage } = useMessage();
+
+  const globSetting = useGlobSetting();
+  const baseApiUrl = globSetting.domainUrl;
+
+  const queryParam = ref<any>({rwbh,xqxn,teano,zyStatus:'1,2,3,4'});
+  const mainId = ref<string>('');
+
+  const toggleSearchStatus = ref<boolean>(false);
+  // const registerModal = ref();
+  // const registerScoreModal = ref();
+  // const SzybStudentModalpage = ref();
+
+
+  const registerModal = ref();
+  const ZyInfoStudentListModalPage = ref();
+  const ZyInfoStudentModalPage = ref();
+  const XxhbbksListModalPage = ref();
+
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      api: stuList,
+      columns:columnsStu,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: '150px',
+        fixed: 'right',
+      },
+        showTableSetting: true,
+        defSort: {
+          field: 'name',
+          order: 'ascend',
+        },
+      beforeFetch: (params) => {
+        params.column = 'createTime',params.order = 'desc';//新生成的默认不带排序
+        return Object.assign(params, queryParam.value);
+      },
+    },
+    exportConfig: {
+      name: "学生作业信息",
+      url: getExportUrl,
+      params: () => {
+        return Object.assign({},queryParam.value);
+      }
+    },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  
+  /**
+   * 详情
+   */
+   function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  //上传作业附件
+  function handleShangchuan(record){
+    let timestamp = new Date().getTime();
+    let startTimestamp = Date.parse(record.startTime);
+    if(timestamp<startTimestamp){
+      createMessage.error('还未到提交作业时间！');
+      return;
+    }
+    let endTimestamp = Date.parse(record.endTime+" 23:59:59");
+    if(timestamp>endTimestamp){
+      createMessage.error('提交作业时间已过！');
+      return;
+    }
+
+    ZyInfoStudentModalPage.value.disableSubmit = false;
+    var param = {id:record.stuId,zyfj:record.filePath}
+    ZyInfoStudentModalPage.value.edit(param);
+    // createConfirm({
+    //   iconType: 'warning',
+    //   title: '确认上传',
+    //   content: '作业上传后，不可修改，请仔细检查后提交',
+    //   okText: '确认',
+    //   cancelText: '取消',
+    //   onOk: () => {
+    //     ZyInfoStudentModalPage.value.disableSubmit = false;
+    //     var param = {id:record.stuId,zyfj:record.filePath}
+    //     ZyInfoStudentModalPage.value.edit(param);
+    //   }
+    // });
+  }
+
+  //预览
+  function handlePreview(record){
+    var url2 = getFileAccessHttpUrl(record.stuPdfPath)
+    let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
+    window.open(url,"_blank")
+  }
+
+  function handleDownload(record){
+    downloadFile(record.stuFilePath)
+  }
+
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+  function handleDown(text){
+    downloadFile(text);
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+
+
+    // <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;background:rgb(28, 132, 198);">详情</a-button>
+    // <a-button type="primary" @click="handleShangchuan(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="!item.stuFilePath">上传</a-button>
+    // <a-button type="primary" @click="handleDownload(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="item.stuFilePath">下载</a-button>
+    // <a-button type="primary" @click="handlePreview(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="item.stuFilePath">预览</a-button>
+
+    if(record.filePath){
+      var list = [
+          {
+            label: '详情',
+            onClick: handleDetail.bind(null, record),
+          },
+          {
+            label: '下载',
+            onClick: handleDownload.bind(null, record),
+          },
+          {
+            label: '预览',
+            onClick: handlePreview.bind(null, record),
+          },
+        ];
+        return list;
+    }else{
+      var list = [
+          {
+            label: '详情',
+            onClick: handleDetail.bind(null, record),
+          },
+          {
+            label: '上传',
+            onClick: handleShangchuan.bind(null, record),
+          },
+      ];
+      return list;
+    }
+
+  }
+function handleYulan(text){
+  window.open(text,"_blank")
+}
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    queryParam.value.mainId = mainId;
+    //刷新数据
+    reload();
+  }
+
+  function init(record){
+    selectedRowKeys.value = [];
+    queryParam.value = {};
+    queryParam.value.mainId = record.id;
+    queryParam.value.queryType = record.queryType;
+    mainId.value = record.id;
+      reload();
+  }
+
+
+  defineExpose({
+    init,
+  });
+
+
+
+</script>
+
+<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>
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 78d251e..f2c0dc4 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
     <!--查询区域-->
-    <div class="jeecg-basic-table-form-container">
+    <!-- <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="8">
@@ -9,16 +9,6 @@
               <j-input placeholder="请输入作业名称" v-model:value="queryParam.title"></j-input>
             </a-form-item>
           </a-col>
-          <!-- <a-col :lg="8">
-            <a-form-item label="类型">
-              <j-dict-select-tag placeholder="请选择类型" v-model:value="queryParam.zyType" dictCode="zy_type"/>
-            </a-form-item>
-          </a-col> -->
-          <!-- <a-col :lg="8">
-            <a-form-item label="学年学期">
-              <a-input placeholder="请输入学年学期" v-model:value="queryParam.xnxq"></a-input>
-            </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">
@@ -29,7 +19,7 @@
           </a-col>
         </a-row>
       </a-form>
-    </div>
+    </div> -->
     <a-row>
       <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
@@ -138,8 +128,10 @@ const baseApiUrl = globSetting.domainUrl;
         }else if(record.stuFilePath){
           text = "检测中";
         }else{
-          text = "-";
+          text = "待提交";
         }
+      }else{
+        text = "不查重";
       }
     }else if(type=='2'){
       if(record.nwcc=='1'){
@@ -150,8 +142,10 @@ const baseApiUrl = globSetting.domainUrl;
         }else if(record.stuFilePath){
           text = "检测中";
         }else{
-          text = "-";
+          text = "待提交";
         }
+      }else{
+        text = "不查重";
       }
     }else if(type=='3'){
       if(record.aigccc=='1'){
@@ -162,8 +156,10 @@ const baseApiUrl = globSetting.domainUrl;
         }else if(record.stuFilePath){
           text = "检测中";
         }else{
-          text = "-";
+          text = "待提交";
         }
+      }else{
+        text = "不查重";
       }
     }else if(type=='4'){
       if(record.xncc=='1'){
@@ -174,15 +170,17 @@ const baseApiUrl = globSetting.domainUrl;
         }else if(record.stuFilePath){
           text = "检测中";
         }else{
-          text = "-";
+          text = "待提交";
         }
+      }else{
+        text = "不查重";
       }
     }
     return text;
   }
 
   function classFun(record){
-    if(record.score){
+    if(record.stuscore){
       return "background: #18a689";
     }else if(record.stuFilePath){
       return "background: #c6c209";
diff --git a/src/views/zy/zyInfo/StudentZyInfoMainList.vue b/src/views/zy/zyInfo/StudentZyInfoMainList.vue
new file mode 100644
index 0000000..ac950d0
--- /dev/null
+++ b/src/views/zy/zyInfo/StudentZyInfoMainList.vue
@@ -0,0 +1,27 @@
+<template>
+  <div style="background: #fff;height: 97%;margin: 10px 0;">
+    <div style="text-align:right;width:100%;">
+      <a-switch v-model:checked="checked1" checkedChildren="卡片" unCheckedChildren="列表" @change="onChange1"/>
+    </div>
+    <div v-if="checked1">
+      <StudentZyInfoList/>
+    </div>
+    <div v-if="!checked1">
+      <StudentZyInfoLiebiaoList/>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfo-zyInfo" setup>
+  import { ref, reactive, onMounted,unref } from 'vue';
+  import StudentZyInfoLiebiaoList from '/@/views/zy/zyInfo/StudentZyInfoLiebiaoList.vue'
+  import StudentZyInfoList from '/@/views/zy/zyInfo/StudentZyInfoList.vue'
+
+  const checked1 = ref(true);
+
+  function onChange1(record){
+  }
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
index 1355f1f..e0faa7b 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
@@ -5,7 +5,9 @@ const { createConfirm } = useMessage();
 
 enum Api {
   list = '/zyInfoStudent/zyInfoStudent/list',
+  stuList = '/zyInfo/zyInfo/stuList',
   cdxxlist = '/zyInfoStudent/zyInfoStudent/cdxxlist',
+  stuKccyList = '/wjxWjxx/wjxWjxx/stuList',
   save='/zyInfoStudent/zyInfoStudent/add',
   edit='/zyInfoStudent/zyInfoStudent/edit',
   zyscStu='/zyInfoStudent/zyInfoStudent/zyscStu',
@@ -34,6 +36,8 @@ export const getImportUrl = Api.importExcel;
  * @param params
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
+export const stuList = (params) => defHttp.get({ url: Api.stuList, params });
+export const stuKccyList = (params) => defHttp.get({ url: Api.stuKccyList, params });
 export const cdxxlist = (params) => defHttp.get({ url: Api.cdxxlist, params });
 export const getQuaList = (params) => defHttp.get({ url: Api.getQuaList, params });
 
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
index f5a6825..f495f2a 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
@@ -66,6 +66,91 @@ export const columns: BasicColumn[] = [
 ];
 
 
+//列表数据
+export const columnsStu: BasicColumn[] = [
+  {
+    title: '作业名称',
+    align: "center",
+    dataIndex: 'title',
+    // sorter: true,
+  },
+  {
+    title: '开始时间',
+    align: "center",
+    dataIndex: 'startTime',
+    // sorter: true,
+  },
+  {
+    title: '结束时间',
+    align: "center",
+    dataIndex: 'endTime',
+    // sorter: true,
+  },
+  {
+    title: '评分',
+    align: "center",
+    dataIndex: 'stuscore',
+    // sorter: true,
+  },
+  {
+    title: '存档类型',
+    align: "center",
+    dataIndex: 'cdlx_dictText',
+    // sorter: true,
+  },
+  {
+    title: '网络查重',
+    align: "center",
+    dataIndex: 'wwsftg',
+    slots: { customRender: 'wwsftgaction' },
+    // sorter: true,
+  },
+  {
+    title: '作业查重',
+    align: "center",
+    dataIndex: 'nwsftg',
+    slots: { customRender: 'nwsftgaction' },
+    // sorter: true,
+  },
+  {
+    title: 'Aigc查重',
+    align: "center",
+    dataIndex: 'aigcsftg',
+    slots: { customRender: 'aigcsftgaction' },
+    // sorter: true,
+  },
+  {
+    title: '校内查重',
+    align: "center",
+    dataIndex: 'xnsftg',
+    slots: { customRender: 'xnsftgaction' },
+    // sorter: true,
+  },
+];
+
+//列表数据
+export const columnsKccyStu: BasicColumn[] = [
+  {
+    title: '测验名称',
+    align: "center",
+    dataIndex: 'title',
+    // sorter: true,
+  },
+  {
+    title: '开始时间',
+    align: "center",
+    dataIndex: 'startTime',
+    // sorter: true,
+  },
+  {
+    title: '结束时间',
+    align: "center",
+    dataIndex: 'endTime',
+    // sorter: true,
+  },
+];
+
+
 export const htcxcolumns: BasicColumn[] = [
   {
     title: '作业名称',