From 90a0f9581bb5bc8fd6e70974eead80372dbf1c5c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 28 May 2024 09:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/wjxCswj/WjxCswjList.vue          |  4 +-
 src/views/kc/wjxDcwj/WjxDcwjList.vue          |  4 +-
 src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts  | 28 +++++++++
 .../components/WjxWjxxTmlbForm.vue            |  4 +-
 .../zy/zyInfoStudent/ZyInfoStudentList.vue    | 61 ++++++++++++-------
 .../components/SzybStudentForm.vue            | 18 +++---
 src/views/zy/zyJxdg/ZyJxdgListModal.vue       |  2 +-
 7 files changed, 82 insertions(+), 39 deletions(-)

diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue
index e4a8dfe..117b82b 100644
--- a/src/views/kc/wjxCswj/WjxCswjList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjList.vue
@@ -61,10 +61,10 @@
             </a-col>
             <a-col :span="24" style="text-align:center;margin-top:8px;">
               <a-button type="primary" @click="handleEdit(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="handleFabu(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="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="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>
diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue
index 4c7ac92..27a0682 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue
@@ -91,7 +91,7 @@
     <WjxWjxxTmlbDjjgModal ref="WjxWjxxTmlbDjjgModalPage" @success="handleSuccess"></WjxWjxxTmlbDjjgModal>
     <WjxWjxxTmlbDjjgsDcModal ref="WjxWjxxTmlbDjjgsDcModalPage" @success="handleSuccess"></WjxWjxxTmlbDjjgsDcModal>
     <XxhbbksListModal ref="XxhbbksListModalPage"></XxhbbksListModal>
-    <TikuListModal ref="TikuListModalPage"></TikuListModal>
+    <WjdcTikuListModal ref="TikuListModalPage"></WjdcTikuListModal>
   </div>
 </template>
 
@@ -109,7 +109,7 @@
   import {useRouter} from "vue-router";
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import {useMessage} from "/@/hooks/web/useMessage";
-  import TikuListModal from '/@/views/kc/wjxWjxxTmlb/TikuListModal.vue';
+  import WjdcTikuListModal from '/@/views/kc/wjxWjxxTmlb/WjdcTikuListModal.vue';
   import dayjs from 'dayjs';
 
   //当前路由信息
diff --git a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
index 47ef526..4753bc4 100644
--- a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
+++ b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
@@ -37,6 +37,34 @@ export const columns: BasicColumn[] = [
     dataIndex: 'wjSytype_dictText'
    },
 ];
+export const wjdccolumns: BasicColumn[] = [
+  {
+   title: '题目类型',
+   align:"center",
+   dataIndex: 'wjType',
+   customRender:({text}) =>{
+    var rt = "";
+    if(text == '3'){
+      rt = "单选";
+    }else if(text == '4'){
+      rt = "多选";
+    }else if(text == '5'){
+      rt = "填空";
+    }
+     return rt;
+   },
+  },
+   {
+    title: '问题标题',
+    align:"center",
+    dataIndex: 'wjTitle'
+   },
+   {
+    title: '是否公有',
+    align:"center",
+    dataIndex: 'wjSytype_dictText'
+   },
+];
 export const columnsYytk: BasicColumn[] = [
   {
    title: '题目类型',
diff --git a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
index 3522a0a..f70a023 100644
--- a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
+++ b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
@@ -73,11 +73,9 @@
         wjTitle: '',
         wjScore: '',
       });
-
-      console.log(`🚀 ~ setup ~ formData.wjLeixing:`, formData.wjLeixing)
       const wjxWjxxTmxxTable = reactive<Record<string, any>>({
         loading: false,
-        columns: formData.wjLeixing=='1'?wjxWjdcColumns:wjxWjxxTmxxColumns,
+        columns: wjxWjxxTmxxColumns,
         dataSource: []
       });
       //表单验证
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
index 6a8fcda..f18ffdb 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
@@ -22,9 +22,12 @@
     </div> -->
     <!--引用表格-->
     <BasicTable @register="registerTable" style="margin-top: 20px;">
+      <template #tableTitle>
+        <span>检测时间提醒： 非高峰期预计30分钟内返回检测结果，高峰期预计时间会更长，请您耐心等待！</span>
+      </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" />
+        <TableAction :actions="getTableAction(record)"  :dropDownActions="getDropDownAction(record)"/>
       </template>
       <!--字段回显插槽-->
       <template #htmlSlot="{text}">
@@ -240,10 +243,10 @@
     if(record.filePath){
       if(record.scoreFabu=='1'){
         var list = [
-          {
-            label: '详情',
-            onClick: handleDetail.bind(null, record),
-          },
+          // {
+          //   label: '详情',
+          //   onClick: handleDetail.bind(null, record),
+          // },
           {
             label: '设置样本',
             onClick: handleSzyb.bind(null, record),
@@ -272,10 +275,10 @@
           label: '发布评分',
           onClick: handleScoreFabu.bind(null, record),
         },
-        {
-          label: '详情',
-          onClick: handleDetail.bind(null, record),
-        },
+        // {
+        //   label: '详情',
+        //   onClick: handleDetail.bind(null, record),
+        // },
         {
             label: '下载',
             onClick: handleDown.bind(null, record),
@@ -288,11 +291,11 @@
       }
 
     }else{
-      var list = [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      },];
+      // var list = [
+      // {
+      //   label: '详情',
+      //   onClick: handleDetail.bind(null, record),
+      // },];
       return list;
     }
 
@@ -304,15 +307,29 @@
   function getDropDownAction(record) {
     return [
       {
-        label: '详情',
+        label: '外网结果下载',
         onClick: handleDetail.bind(null, record),
-      }, {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-        }
-      }
+      }, 
+      {
+        label: '外网结果预览',
+        onClick: handleDetail.bind(null, record),
+      }, 
+      {
+        label: '内网结果下载',
+        onClick: handleDetail.bind(null, record),
+      }, 
+      {
+        label: '内网结果预览',
+        onClick: handleDetail.bind(null, record),
+      }, 
+      {
+        label: 'aigc结果下载',
+        onClick: handleDetail.bind(null, record),
+      }, 
+      {
+        label: 'aigc结果预览',
+        onClick: handleDetail.bind(null, record),
+      }, 
     ]
   }
 
diff --git a/src/views/zy/zyInfoStudent/components/SzybStudentForm.vue b/src/views/zy/zyInfoStudent/components/SzybStudentForm.vue
index 4c30557..dca358f 100644
--- a/src/views/zy/zyInfoStudent/components/SzybStudentForm.vue
+++ b/src/views/zy/zyInfoStudent/components/SzybStudentForm.vue
@@ -99,13 +99,13 @@ const { createConfirm } = useMessage();
         }
       }
     }
-    createConfirm({
-      iconType: 'warning',
-      title: '确认提交',
-      content: '作业上传后，不可修改，请仔细检查后提交',
-      okText: '确认',
-      cancelText: '取消',
-      onOk: () => {
+    // createConfirm({
+    //   iconType: 'warning',
+    //   title: '确认提交',
+    //   content: '作业上传后，不可修改，请仔细检查后提交',
+    //   okText: '确认',
+    //   cancelText: '取消',
+    //   onOk: () => {
         editCdlx(model, isUpdate.value)
           .then((res) => {
             if (res.success) {
@@ -118,8 +118,8 @@ const { createConfirm } = useMessage();
           .finally(() => {
             confirmLoading.value = false;
           });
-      }
-    });
+    //   }
+    // });
 
   }
 
diff --git a/src/views/zy/zyJxdg/ZyJxdgListModal.vue b/src/views/zy/zyJxdg/ZyJxdgListModal.vue
index 3815d88..488268b 100644
--- a/src/views/zy/zyJxdg/ZyJxdgListModal.vue
+++ b/src/views/zy/zyJxdg/ZyJxdgListModal.vue
@@ -20,7 +20,7 @@ ZyJxdgList<template>
    * @param record
    */
   function init(record) {
-    title.value = '课程简介引用';
+    title.value = '课程简介引用（说明：可引用以往学年学期的课程简介）';
     visible.value = true;
     nextTick(() => {
       registerForm.value.init(record);