From 05aef03ad133da81c2a07f8caaade1bc3a0b79f4 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sat, 25 May 2024 12:50:41 +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/WjxCswjStuList.vue       |  2 +-
 src/views/kc/wjxDcwj/WjxDcwjList.vue          |  2 +-
 src/views/kc/wjxDcwj/WjxDcwjStuList.vue       |  2 +-
 src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue  | 14 +++++++++++--
 src/views/kc/wjxWjxxTmlb/TikuList.vue         | 20 +++++++++++++-----
 src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts   |  5 +++--
 src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts  | 21 +++++++++++++++++++
 src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue  |  4 ++--
 .../checkKecheng/dqxqkcMenu.vue               |  2 +-
 9 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/views/kc/wjxCswj/WjxCswjStuList.vue b/src/views/kc/wjxCswj/WjxCswjStuList.vue
index ab14975..b9b61c4 100644
--- a/src/views/kc/wjxCswj/WjxCswjStuList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjStuList.vue
@@ -14,7 +14,7 @@
               <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="0">待评分</a-select-option> -->
                 <a-select-option value="1">已完成</a-select-option>
               </a-select>
             </a-form-item>
diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue
index 73f24fd..c28f0f8 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :lg="7">
             <a-form-item label="问卷名称">
-              <j-input placeholder="请输入问卷名称" v-model:value="queryParam.title"></j-input>
+              <a-input placeholder="请输入问卷名称" v-model:value="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="7">
diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
index 9e8894e..1b5460a 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
@@ -14,7 +14,7 @@
               <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="0">待评分</a-select-option> -->
                 <a-select-option value="1">已完成</a-select-option>
               </a-select>
             </a-form-item>
diff --git a/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue b/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
index fa4bba8..bfa8916 100644
--- a/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
+++ b/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
@@ -9,6 +9,16 @@
               <j-input placeholder="请输入问题标题" v-model:value="queryParam.wjTitle"></j-input>
             </a-form-item>
           </a-col>
+          <a-col :lg="6">
+            <a-form-item label="题目类型">
+              <a-select placeholder="请选择题目类型" ref="select" v-model:value="queryParam.wjType">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="3">单选</a-select-option>
+                <a-select-option value="4">多选</a-select-option>
+                <a-select-option value="5">填空</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <!-- <a-col :lg="7">
             <a-form-item label="是否公有">
               <JDictSelectTag placeholder="请选择" v-model:value="queryParam.wjSytype" dictCode="yn" />
@@ -59,7 +69,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue'
   import {columns, searchFormSchema} from './WjxWjxxTmlb.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './WjxWjxxTmlb.api';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,distinctList} from './WjxWjxxTmlb.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
   import { JInput,JDictSelectTag } from '/@/components/Form';
   
@@ -71,7 +81,7 @@
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
           //  title: '题目信息',
-           api: list,
+           api: distinctList,
            columns,
            canResize:false,
            useSearchForm: false,
diff --git a/src/views/kc/wjxWjxxTmlb/TikuList.vue b/src/views/kc/wjxWjxxTmlb/TikuList.vue
index 21a2ddf..d7b3800 100644
--- a/src/views/kc/wjxWjxxTmlb/TikuList.vue
+++ b/src/views/kc/wjxWjxxTmlb/TikuList.vue
@@ -4,17 +4,27 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="7">
+          <a-col :lg="6">
             <a-form-item label="问题标题">
               <j-input placeholder="请输入问题标题" v-model:value="queryParam.wjTitle"></j-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="7">
+          <a-col :lg="6">
+            <a-form-item label="题目类型">
+              <a-select placeholder="请选择题目类型" ref="select" v-model:value="queryParam.wjType">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="3">单选</a-select-option>
+                <a-select-option value="4">多选</a-select-option>
+                <a-select-option value="5">填空</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
             <a-form-item label="是否公有">
               <JDictSelectTag placeholder="请选择" v-model:value="queryParam.wjSytype" dictCode="yn" />
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <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>
@@ -59,7 +69,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue'
   import {columns, searchFormSchema} from './WjxWjxxTmlb.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './WjxWjxxTmlb.api';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,distinctList} from './WjxWjxxTmlb.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
   import { JInput,JDictSelectTag } from '/@/components/Form';
   import { useUserStore } from '/@/store/modules/user';
@@ -74,7 +84,7 @@
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
           //  title: '题目信息',
-           api: list,
+           api: distinctList,
            columns,
            canResize:false,
            useSearchForm: false,
diff --git a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts
index 107d0b9..e3117c9 100644
--- a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts
+++ b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts
@@ -5,6 +5,7 @@ const { createConfirm } = useMessage();
 
 enum Api {
   list = '/wjxWjxxTmlb/wjxWjxxTmlb/list',
+  distinctList = '/wjxWjxxTmlb/wjxWjxxTmlb/distinctList',
   save='/wjxWjxxTmlb/wjxWjxxTmlb/add',
   edit='/wjxWjxxTmlb/wjxWjxxTmlb/edit',
   deleteOne = '/wjxWjxxTmlb/wjxWjxxTmlb/delete',
@@ -36,8 +37,8 @@ export const queryWjxWjxxTmxxListByMainId = (id) => defHttp.get({url: Api.wjxWjx
  * 列表接口
  * @param params
  */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
+export const list = (params) => defHttp.get({url: Api.list, params});
+export const distinctList = (params) => defHttp.get({url: Api.distinctList, params});
 
 /**
  * 删除单个
diff --git a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
index 0b06df5..d1055e1 100644
--- a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
+++ b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
@@ -5,6 +5,22 @@ import { render } from '/@/utils/common/renderUtils';
 import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: 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",
@@ -48,6 +64,11 @@ export const columnsYytk: BasicColumn[] = [
    align:"center",
    dataIndex: 'wjScore'
   },
+  {
+   title: '是否公有',
+   align:"center",
+   dataIndex: 'wjSytype_dictText'
+  },
 ];
 
 //查询数据
diff --git a/src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue b/src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue
index 74c2da7..54481e9 100644
--- a/src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue
+++ b/src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue
@@ -65,7 +65,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue'
   import {columnsYytk} from './WjxWjxxTmlb.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './WjxWjxxTmlb.api';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,distinctList} from './WjxWjxxTmlb.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
   import { JInput,JDictSelectTag } from '/@/components/Form';
   import { useUserStore } from '/@/store/modules/user';
@@ -80,7 +80,7 @@
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
           //  title: '题目信息',
-           api: list,
+           api: distinctList,
            columns: columnsYytk,
            canResize:false,
            useSearchForm: false,
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index 6dcb9f9..5780829 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -22,7 +22,7 @@
                   <a-sub-menu key="sub3">
                     <template #title>教学工具</template>
                     <a-menu-item key="6" @click="getGzt('dcwj')">问卷调查</a-menu-item>
-                    <a-menu-item key="7" @click="getGzt('gongju')">到课率识别</a-menu-item>
+                    <a-menu-item key="7" @click="getGzt('gongju')">到课识别率</a-menu-item>
                     <a-menu-item key="8" @click="getGzt('zycd')">作业存档</a-menu-item>
                   </a-sub-menu>
                   <a-menu-item key="sub4">