From 663bf5005397b80394042b8199680d6f6e80e1cf Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 15 May 2024 21:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/detection/zyZhjsList.vue         |   6 +-
 src/views/kc/wjxCswj/WjxCswjList.vue          |   4 +-
 .../kc/wjxWjxx/components/WjxWjxxForm.vue     |  14 ++-
 .../components/WjxWjxxTmlbAllDjjgsList.vue    | 114 ++++++++++++++++++
 .../components/WjxWjxxTmlbDjjgs.data.ts       |  48 ++++----
 .../components/WjxWjxxTmlbDjjgsModal.vue      |  17 ++-
 .../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue |  25 +++-
 .../site/pjjgPage/studentPjjgTeaList.vue      |   4 +-
 .../checkKecheng/dqxqkcDetail.vue             |   4 +-
 src/views/zy/zyInfo/StudentZyInfoList.vue     |   4 +-
 .../zy/zyInfoStudent/ZyInfoStudent.data.ts    |   6 +-
 11 files changed, 201 insertions(+), 45 deletions(-)
 create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue

diff --git a/src/views/kc/detection/zyZhjsList.vue b/src/views/kc/detection/zyZhjsList.vue
index 0584d83..5a257a4 100644
--- a/src/views/kc/detection/zyZhjsList.vue
+++ b/src/views/kc/detection/zyZhjsList.vue
@@ -37,8 +37,12 @@ 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 { useRouter } from 'vue-router';
+  const { currentRoute } = useRouter();
+  const { query } = unref(currentRoute);
+  const { rwbh,xqxn } = query;//获取传递参数
 const checkedKeys = ref<Array<string | number>>([]);
-const queryParam = ref<any>({});
+const queryParam = ref<any>({rwbh});
 //注册model
 const [registerModal, { openModal }] = useModal();
 //注册table数据
diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue
index 12ef182..3a50f54 100644
--- a/src/views/kc/wjxCswj/WjxCswjList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: 600px;padding: 10px 0;overflow-y: auto;overflow-x: hidden;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -68,7 +68,7 @@
               <a-button type="primary" @click="handleDelete(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">删除</a-button>
               <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">详情</a-button>
               <a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">配置</a-button>
-<!--              <a-button type="primary" @click="handleDjjgs(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">结果</a-button>-->
+             <a-button type="primary" @click="handleDjjgs(item,'')" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">结果</a-button>
             </a-col>
 <!--            <a-col :span="24" style="text-align:center;margin-top:20px;">-->
 <!--              <a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">答卷</a-button>-->
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
index 677859f..8817a90 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
@@ -9,12 +9,12 @@
         </a-col>
         <a-col :span="24">
           <a-form-item label="开始时间" v-bind="validateInfos.startTime">
-            <a-date-picker placeholder="请选择开始时间" v-model:value="formData.startTime" value-format="YYYY-MM-DD HH:mm:ss" :show-time="true" style="width: 100%" :disabled="disabled"/>
+            <a-date-picker placeholder="请选择开始时间" v-model:value="formData.startTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
           <a-form-item label="结束时间" v-bind="validateInfos.endTime">
-            <a-date-picker placeholder="请选择结束时间" v-model:value="formData.endTime" value-format="YYYY-MM-DD HH:mm:ss" :show-time="true" style="width: 100%" :disabled="disabled"/>
+            <a-date-picker placeholder="请选择结束时间" v-model:value="formData.endTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
@@ -22,7 +22,7 @@
 	          <a-textarea v-model:value="formData.content" rows="4" placeholder="请输入问卷描述" :disabled="disabled"/>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <a-col :span="24" hidden>
           <a-form-item label="学年学期">
             <a-input v-model:value="formData.xqxn" disabled></a-input>
           </a-form-item>
@@ -32,7 +32,7 @@
             <a-input v-model:value="formData.kcmc" disabled></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <a-col :span="24" hidden>
           <a-form-item label="选课人数">
             <a-input v-model:value="formData.xkrs" disabled></a-input>
           </a-form-item>
@@ -72,6 +72,8 @@ import {ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted,
     title: '',
     atype: '',
     content: '',
+    startTime: '',
+    endTime: '',
     // qpublish: '',
   });
   const { createMessage } = useMessage();
@@ -80,7 +82,9 @@ import {ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted,
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = {
-    title: [{ required: true, message: '请输入问卷名称!'},]
+    title: [{ required: true, message: '请输入问卷名称!'},],
+    startTime: [{ required: true, message: '请选择开始时间!'},],
+    endTime: [{ required: true, message: '请选择结束时间!'},]
   };
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
 
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue
new file mode 100644
index 0000000..95c0564
--- /dev/null
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue
@@ -0,0 +1,114 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" >
+      <!--操作栏-->
+      <template #action="{ record }" >
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <WjxWjxxTmlbDjjgModal ref="WjxWjxxTmlbDjjgModalPage" @success="handleSuccess"></WjxWjxxTmlbDjjgModal>
+  </div>
+</template>
+
+<script lang="ts" name="wjxWjxx-wjxWjxx" setup>
+import {ref, reactive, defineExpose, unref} from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './WjxWjxxTmlbDjjgs.data';
+  import { list } from './WjxWjxxTmlbDjjgs.api';
+  import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
+
+  const queryParam = ref<any>({});
+  const isFinished = ref<string>('');
+  const toggleSearchStatus = ref<boolean>(false);
+  const WjxWjxxTmlbDjjgModalPage = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
+        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 handlePeizhiDjjg(record: Recordable) {
+    WjxWjxxTmlbDjjgModalPage.value.disableSubmit = true;
+    WjxWjxxTmlbDjjgModalPage.value.edit(record.id,false);
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    console.log(`🚀 ~ getTableAction ~ record:`, record.totalScore)
+    if(record.totalScore>0){
+      return [
+        {
+          label: '答卷结果',
+          onClick: handlePeizhiDjjg.bind(null, record),
+        }
+      ]
+    }else{
+      return [];
+    }
+    
+  }
+
+  function init(record,flag){
+    queryParam.value.id = record.id;
+    queryParam.value.rwbh = record.rwbh;
+    queryParam.value.isFinished = flag;
+    isFinished.value = flag;
+    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/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
index 72d5476..e828fda 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
@@ -58,30 +58,30 @@ export const columns: BasicColumn[] = [
     dataIndex: 'xqxn',
     width: 80
   },
-  {
-    title: '课程名称',
-    align: "center",
-    dataIndex: 'kcmc',
-    width: 200
-  },
-  {
-    title: '开始时间',
-    align: "center",
-    dataIndex: 'startTime',
-    width: 150
-  },
-  {
-    title: '结束时间',
-    align: "center",
-    dataIndex: 'endTime',
-    width: 150
-  },
-  {
-    title: '问卷描述',
-    align: "center",
-    dataIndex: 'content',
-    width: 200
-  },
+  // {
+  //   title: '课程名称',
+  //   align: "center",
+  //   dataIndex: 'kcmc',
+  //   width: 200
+  // },
+  // {
+  //   title: '作答开始时间',
+  //   align: "center",
+  //   dataIndex: 'startTime',
+  //   width: 150
+  // },
+  // {
+  //   title: '作答结束时间',
+  //   align: "center",
+  //   dataIndex: 'endTime',
+  //   width: 150
+  // },
+  // {
+  //   title: '问卷描述',
+  //   align: "center",
+  //   dataIndex: 'content',
+  //   width: 200
+  // },
 ];
 
 export const dccolumns: BasicColumn[] = [
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue
index 5f3db4b..a9cf908 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue
@@ -1,18 +1,25 @@
 <template>
   <a-modal :title="title" :width="width" centered :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <WjxWjxxTmlbDjjgsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></WjxWjxxTmlbDjjgsList>
+    <div v-if="showDiv">
+      <WjxWjxxTmlbDjjgsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></WjxWjxxTmlbDjjgsList>
+    </div>
+    <div v-else>
+      <WjxWjxxTmlbAllDjjgsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></WjxWjxxTmlbAllDjjgsList>
+    </div>
   </a-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
   import WjxWjxxTmlbDjjgsList from './WjxWjxxTmlbDjjgsList.vue'
+  import WjxWjxxTmlbAllDjjgsList from './WjxWjxxTmlbAllDjjgsList.vue'
 
   const title = ref<string>('');
   const width = ref<string>('90%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();
+  const showDiv = ref<boolean>(true);
   const emit = defineEmits(['register', 'success']);
 
   /**
@@ -20,10 +27,14 @@
    * @param record
    */
   function edit(record,flag) {
+    showDiv.value = true;
     if(flag == '1'){
       title.value = '已完成答卷学生列表';
-    }else{
-      title.value = '已完成答卷学生列表';
+    }else if(flag == '0'){
+      title.value = '未完成答卷学生列表';
+    }else if(flag == ''){
+      showDiv.value = false;
+      title.value = '全部答卷学生列表';
     }
     visible.value = true;
     nextTick(() => {
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
index facc6b8..53782ac 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
@@ -225,13 +225,36 @@ async function submitForm(){
   // console.log(`🚀 ~ submitForm ~ data:`, data)
   const values = Object.assign([], data);
   if(values.length>0){
+    var sfjx = "1";
     for(let i=0;i<values.length;i++){
       let param = values[i];
+      console.log(`🚀 ~ submitForm ~ param:`, param)
       values[i].itemSelected = param.itemSelected+"";
+      if(!param.wjScore){
+        createMessage.error('请填写题目分数');
+        sfjx = "0";
+        return;
+      }
+      if(!param.wjTitle){
+        createMessage.error('请填写题目信息');
+        sfjx = "0";
+        return;
+      }
+      var itemlist = param.wjxWjxxTmxxList;
+      for(let j=0;j < itemlist.length; j++){
+        if(!itemlist[j].itemTitle){
+          createMessage.error('请填写选项信息');
+          sfjx = "0";
+          return;
+        }
+      }
+    }
+    if(sfjx=='0'){
+      return;
     }
     const isUpdate = false
     await saveOrUpdate(values, isUpdate);
-    //关闭弹窗
+    // 关闭弹窗
     emit('ok');
   }else{
     createMessage.error('至少创建一个试题');
diff --git a/src/views/site/pjjgPage/studentPjjgTeaList.vue b/src/views/site/pjjgPage/studentPjjgTeaList.vue
index 9974c15..06dc060 100644
--- a/src/views/site/pjjgPage/studentPjjgTeaList.vue
+++ b/src/views/site/pjjgPage/studentPjjgTeaList.vue
@@ -1,8 +1,8 @@
 <template>
   
   <div style="width:100%;text-align: right;line-height:40px;">
-    <a style="padding-right: 0.5rem;" @click="init()">刷新</a>
-    <RouterLink to="/site/xspjjgore">查看更多</RouterLink>
+    <!-- <a style="padding-right: 0.5rem;" @click="init()">刷新</a>
+    <RouterLink to="/site/xspjjgore">查看更多</RouterLink> -->
   </div>
   <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 12, xs: 2, sm: 3, md: 3, lg: 3, xl: 3, xxl: 3, xxxl: 3 }">
     <template #renderItem="{ item }">
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
index d486747..2ceb2d9 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
@@ -104,7 +104,7 @@ const baseApiUrl = globSetting.domainUrl;
   const { createMessage } = useMessage();
   const jxdgInfo = ref({
     id:'',
-    filePath:'',
+    filePath:null,
     kcjs:''
   });
   
@@ -135,7 +135,7 @@ const baseApiUrl = globSetting.domainUrl;
   }
 
   function openPdf(record){
-    var url2 = getFileAccessHttpUrl(record.filePath)
+    var url2 = getFileAccessHttpUrl(record.pdfPath)
     console.log(`🚀 ~ openPdf ~ url2:`, url2)
     let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
     window.open(url,"_blank")
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 4cc53eb..0440e67 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -61,7 +61,7 @@
 
     <ZyInfoModal ref="registerModal" @success="handleSuccess"></ZyInfoModal>
     <ZyInfoStudentListModal ref="ZyInfoStudentListModalPage"></ZyInfoStudentListModal>
-    <ZyInfoStudentModal ref="ZyInfoStudentModalPage"></ZyInfoStudentModal>
+    <ZyInfoStudentModal ref="ZyInfoStudentModalPage" @success="handleSuccess"></ZyInfoStudentModal>
     <XxhbbksListModal ref="XxhbbksListModalPage"></XxhbbksListModal>
   </div>
 </template>
@@ -147,7 +147,7 @@
   //获取选课人数
   function openXkrs(record){
     console.log(`🚀 ~ openXkrs ~ record:`, record)
-    ZyInfoStudentModalPage.value.disableSubmit = false;
+    XxhbbksListModalPage.value.disableSubmit = false;
     XxhbbksListModalPage.value.init(record);
   }
    
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
index cb97f7a..fc83e81 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
@@ -37,7 +37,7 @@ export const columns: BasicColumn[] = [
   //   slots: { customRender: 'fileZxSlot' },
   // },
   {
-    title: '外网相似律',
+    title: '外网相似率',
     align: "center",
     dataIndex: 'wwxsl'
   },
@@ -47,7 +47,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'wwsftg'
   },
   {
-    title: '内网相似律',
+    title: '内网相似率',
     align: "center",
     dataIndex: 'nwxsl'
   },
@@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'nwsftg'
   },
   {
-    title: 'aigc相似律',
+    title: 'aigc相似率',
     align: "center",
     dataIndex: 'aigcxsl'
   },