添加题库功能

src/views/kc/wjxCswj/WjxCswjList.vue

@@ -24,8 +24,9 @@
             <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: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:plus-outlined" @click="handleAdd" style="margin-left: 8px">新增</a-button>
+                <a-button type="primary" @click="handleTiku('6')" style="margin-left: 8px">题库</a-button>
               </a-col>
             </span>
           </a-col>
@@ -94,6 +95,7 @@
     <WjxWjxxTmlbDjModal ref="WjxWjxxTmlbDjModalPage" @success="handleSuccess"></WjxWjxxTmlbDjModal>
     <WjxWjxxTmlbDjjgsModal ref="WjxWjxxTmlbDjjgsModalPage" @success="handleSuccess"></WjxWjxxTmlbDjjgsModal>
     <XxhbbksListModal ref="XxhbbksListModalPage"></XxhbbksListModal>
+    <TikuListModal ref="TikuListModalPage"></TikuListModal>
   </div>
 </template>
 
@@ -102,13 +104,14 @@
   import { defHttp } from '/@/utils/http/axios';
   import { Input, Popover, Pagination, Empty } from 'ant-design-vue';
   import { list ,deleteOne } from '/@/views/kc/wjxWjxx/WjxWjxx.api';
+  import {useRouter} from "vue-router";
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import WjxWjxxModal from '/@/views/kc/wjxWjxx/components/WjxWjxxModal.vue'
   import WjxWjxxTmlbModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbModal.vue'
   import WjxWjxxTmlbDjModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjModal.vue'
   import WjxWjxxTmlbDjjgsModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue'
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
-  import {useRouter} from "vue-router";
+  import TikuListModal from '/@/views/kc/wjxWjxxTmlb/TikuListModal.vue';
 
   //当前路由信息
   const { currentRoute } = useRouter();
@@ -129,6 +132,7 @@
   const WjxWjxxTmlbDjjgsModalPage = ref()
   const WjxWjxxTmlbDjjgsDcModalPage = ref();
   const XxhbbksListModalPage = ref();
+  const TikuListModalPage = ref();
 
   const labelCol = reactive({
     xs: { span: 24 },
@@ -139,6 +143,14 @@
     sm: { span: 16 },
   });
 
+
+  //题库类型（6作业，1问卷）
+  function handleTiku(wjLeixing){
+    var record = {wjLeixing}
+    TikuListModalPage.value.disableSubmit = true;
+    TikuListModalPage.value.init(record);
+  }
+
   /**
    * 新增事件
    */
@@ -279,11 +291,11 @@
 
   function classFun(type){
     if(type == '0'){
-      return "background: #a7a6a6";
+      return "background: #fe1a1a";
     }else if(type == '1'){
-      return "background: #18a689";
+      return "background: #c6c209";
     }else if(type == '2'){
-      return "background: #6583f8";
+      return "background: #18a689";
     }
   }
 

src/views/kc/wjxCswj/WjxCswjStuList.vue

@@ -183,9 +183,9 @@
 
   function classFun(type){
     if(type == '-1'){
-      return "background: #a7a6a6";
+      return "background: #fe1a1a";
     }else if(type == '0'){
-      return "background: #1c84c6";
+      return "background: #c6c209";
     }else if(type == '1'){
       return "background: #18a689";
     }

src/views/kc/wjxDcwj/WjxDcwjList.vue

@@ -282,11 +282,11 @@
 
   function classFun(type){
     if(type == '0'){
-      return "background: #a7a6a6";
+      return "background: #fe1a1a";
     }else if(type == '1'){
-      return "background: #18a689";
+      return "background: #c6c209";
     }else if(type == '2'){
-      return "background: #6583f8";
+      return "background: #18a689";
     }
   }
 

src/views/kc/wjxDcwj/WjxDcwjStuList.vue

@@ -13,8 +13,8 @@
             <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="-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>
@@ -51,7 +51,7 @@
             </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.flag=='-1'">答卷</a-button>
-              <a-button type="primary" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='0'" disabled>正在批卷</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>
             </a-col>
           </a-row>
@@ -183,9 +183,9 @@
 
   function classFun(type){
     if(type == '-1'){
-      return "background: #a7a6a6";
+      return "background: #fe1a1a";
     }else if(type == '0'){
-      return "background: #1c84c6";
+      return "background: #c6c209";
     }else if(type == '1'){
       return "background: #18a689";
     }

src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue

@@ -127,6 +127,7 @@ const isShow = ref<boolean>(false);
 const confirmLoading = ref<boolean>(false);
 const tiganData = ref<any>([]);
 const tmxxPar = ref<any>({});
+const wjLeixing = ref<string>('');
 const { createMessage } = useMessage();
 
 const emit = defineEmits(['register', 'success']);
@@ -140,6 +141,7 @@ function addTigan(type){
       mainId:mainId,
       wjTitle:null,
       wjScore:null,
+      wjLeixing,
       // itemSelected:'1',
       wjxWjxxTmxxList:[{itemTitle:null,itemIndex:'1'},{itemTitle:null,itemIndex:'2'}],
     }
@@ -152,6 +154,7 @@ function addTigan(type){
       mainId:mainId,
       wjTitle:null,
       wjScore:null,
+      wjLeixing,
       // itemSelected:['1'],
       wjxWjxxTmxxList:[{itemTitle:null,itemIndex:'1'},{itemTitle:null,itemIndex:'2'}],
     }
@@ -164,6 +167,7 @@ function addTigan(type){
       mainId:mainId,
       wjTitle:null,
       wjScore:null,
+      wjLeixing,
       wjAnswer:null,
     }
     list.push(params);
@@ -195,6 +199,7 @@ function getType(value,type){
 }
 //初始化
 function edit(record,type){
+  wjLeixing.value=type;
   tiganData.value = [];
   title.value = record.title;
   mainId.value = record.id;

src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue

@@ -0,0 +1,192 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <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-form-item label="问题标题">
+              <j-input placeholder="请输入问题标题" v-model:value="queryParam.wjTitle"></j-input>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="7">
+            <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">
+            <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">
+     <!--插槽:table标题-->
+      <!-- <template #tableTitle>
+      </template> -->
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <WjxWjxxTmlbModal @register="registerModal" @success="handleSuccess"></WjxWjxxTmlbModal>
+  </div>
+</template>
+
+<script lang="ts" name="wjxWjxxTmlb-gongyou" setup>
+  import {ref, reactive, computed, unref,onMounted} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  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 {downloadFile} from '/@/utils/common/renderUtils';
+  import { JInput,JDictSelectTag } from '/@/components/Form';
+  
+  const checkedKeys = ref<Array<string | number>>([]);
+    const wjLeixing = ref<string>('');
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+          //  title: '题目信息',
+           api: list,
+           columns,
+           canResize:false,
+           useSearchForm: false,
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam.value);
+           },
+        },
+        exportConfig: {
+            name:"题目信息",
+            url: getExportUrl,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+    return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }
+       ]
+   }
+
+  
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const queryParam = ref<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  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();
+  }
+
+  function init(record){
+  console.log(`🚀 ~ init ~ record:`, record)
+    wjLeixing.value = record.wjLeixing;
+    queryParam.value.wjLeixing = record.wjLeixing;
+    reload();
+  }
+  
+  // defineExpose({
+  //   init,
+  // });
+
+  onMounted(() => {
+    wjLeixing.value = "1";
+    queryParam.value.wjLeixing = "1";
+    queryParam.value.wjSytype = "1";
+    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>

src/views/kc/wjxWjxxTmlb/TikuList.vue

@@ -0,0 +1,256 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <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-form-item label="问题标题">
+              <j-input placeholder="请输入问题标题" v-model:value="queryParam.wjTitle"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="7">
+            <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">
+            <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">
+     <!--插槽:table标题-->
+      <!-- <template #tableTitle>
+      </template> -->
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <WjxWjxxTmlbModal @register="registerModal" @success="handleSuccess"></WjxWjxxTmlbModal>
+  </div>
+</template>
+
+<script lang="ts" name="wjxWjxxTmlb-siyou" setup>
+  import {ref, reactive, computed, unref,onMounted} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  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 {downloadFile} from '/@/utils/common/renderUtils';
+  import { JInput,JDictSelectTag } from '/@/components/Form';
+  import { useUserStore } from '/@/store/modules/user';
+  
+  //用户相关
+  const userStore = useUserStore();
+  const checkedKeys = ref<Array<string | number>>([]);
+    const wjLeixing = ref<string>('');
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+          //  title: '题目信息',
+           api: list,
+           columns,
+           canResize:false,
+           useSearchForm: false,
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam.value);
+           },
+        },
+        exportConfig: {
+            name:"题目信息",
+            url: getExportUrl,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable,wjSytype) {
+    defHttp.post({url:'/wjxWjxxTmlb/wjxWjxxTmlb/editSwgysy',params:{id:record.id,wjSytype}}).then(res=>{
+      reload();
+    })
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+    if(record.wjSytype == '0'){
+      return [
+         {
+           label: '设为公有',
+           onClick: handleEdit.bind(null, record,'1'),
+         },
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }
+       ]
+    }else{
+      return [
+         {
+           label: '设为私有',
+           onClick: handleEdit.bind(null, record,'0'),
+         },
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }
+       ]
+    }
+       
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+           }
+         }
+       ]
+   }
+
+  
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const queryParam = ref<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  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();
+  }
+
+  function init(record){
+  console.log(`🚀 ~ init ~ record:`, record)
+    wjLeixing.value = record.wjLeixing;
+    queryParam.value.wjLeixing = record.wjLeixing;
+    reload();
+  }
+  
+  
+  onMounted(() => {
+    wjLeixing.value = "1";
+    queryParam.value.wjLeixing = "1";
+    queryParam.value.createBy = userStore.getUserInfo.username;
+    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>

src/views/kc/wjxWjxxTmlb/TikuListMain.vue

@@ -0,0 +1,45 @@
+<template>
+  <div style="padding: 20px;">
+    <a-tabs v-model:activeKey="activeKey">
+    <a-tab-pane key="1" tab="我的题库"><TikuList /></a-tab-pane>
+    <a-tab-pane key="2" tab="公有题库"><TikuGongyouList /></a-tab-pane>
+  </a-tabs>
+  </div>
+</template>
+
+<script lang="ts" name="wjxWjxxTmlb-main" setup>
+  import {ref, reactive, computed, unref,defineExpose} from 'vue';
+  import TikuList from '/@/views/kc/wjxWjxxTmlb/TikuList.vue'
+  import TikuGongyouList from '/@/views/kc/wjxWjxxTmlb/TikuGongyouList.vue'
+
+  const activeKey = ref('1');
+  const wjLeixing = ref<string>('');
+
+  function init(record){
+  console.log(`🚀 ~ init ~ record:`, record)
+    wjLeixing.value = record.wjLeixing;
+  }
+  
+  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>

src/views/kc/wjxWjxxTmlb/TikuListModal.vue

@@ -0,0 +1,64 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <TikuListMain ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></TikuListMain>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import TikuListMain from './TikuListMain.vue'
+  
+  const title = ref<string>('');
+  const width = ref<string>('80%');
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function init(record) {
+    title.value = '题库';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.init(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    init,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>

src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts

@@ -5,26 +5,21 @@ import { render } from '/@/utils/common/renderUtils';
 import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: BasicColumn[] = [
-   {
-    title: '题目编号',
-    align:"center",
-    dataIndex: 'wjIndex'
-   },
    {
     title: '问题标题',
     align:"center",
     dataIndex: 'wjTitle'
    },
-   {
-    title: '是否必填',
-    align:"center",
-    dataIndex: 'isRequir'
-   },
    {
     title: '问题分值',
     align:"center",
     dataIndex: 'wjScore'
    },
+   {
+    title: '是否公有',
+    align:"center",
+    dataIndex: 'wjSytype_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -62,21 +57,21 @@ export const formSchema: FormSchema[] = [
 //子表单数据
 //子表表格配置
 export const wjxWjxxTmxxColumns: JVxeColumn[] = [
+    // {
+    //   title: '选项编号',
+    //   key: 'itemIndex',
+    //   type: JVxeTypes.inputNumber,
+    //   width:"200px",
+    //   placeholder: '请输入${title}',
+    //   defaultValue:'',
+    //     validateRules: [
+    //       { required: true, message: '${title}不能为空' },
+    //     ],
+    // },
     {
-      title: '选项编号',
+      title: '选项',
-      key: 'itemIndex',
-      type: JVxeTypes.inputNumber,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-        validateRules: [
-          { required: true, message: '${title}不能为空' },
-        ],
-    },
-    {
-      title: '选项标题',
       key: 'itemTitle',
-      type: JVxeTypes.input,
+      type: JVxeTypes.text,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
@@ -87,7 +82,7 @@ export const wjxWjxxTmxxColumns: JVxeColumn[] = [
     {
       title: '正确答案',
       key: 'itemSelected',
-      type: JVxeTypes.input,
+      type: JVxeTypes.text,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',

src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue

@@ -2,22 +2,22 @@
   <a-spin :spinning="loading">
     <a-form v-bind="formItemLayout">
       <a-row>
-        <a-col :span="24">
+        <!-- <a-col :span="24">
           <a-form-item label="题目编号" v-bind="validateInfos.wjIndex">
 	          <a-input-number v-model:value="formData.wjIndex" placeholder="请输入题目编号" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
-        </a-col>
+        </a-col> -->
-        <a-col :span="24">
+        <a-col :span="12">
           <a-form-item label="问题标题" v-bind="validateInfos.wjTitle">
             <a-input v-model:value="formData.wjTitle" placeholder="请输入问题标题" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <!-- <a-col :span="24">
           <a-form-item label="是否必填" v-bind="validateInfos.isRequir">
             <a-input v-model:value="formData.isRequir" placeholder="请输入是否必填" :disabled="disabled"></a-input>
           </a-form-item>
-        </a-col>
+        </a-col> -->
-        <a-col :span="24">
+        <a-col :span="12">
           <a-form-item label="问题分值" v-bind="validateInfos.wjScore">
 	          <a-input-number v-model:value="formData.wjScore" placeholder="请输入问题分值" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
@@ -39,7 +39,7 @@
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
-          :toolbar="true"/>
+          :toolbar="false"/>
       </a-tab-pane>
     </a-tabs>
   </a-spin>
@@ -80,9 +80,7 @@
       const activeKey = ref('wjxWjxxTmxx');
       const formData = reactive<Record<string, any>>({
         id: '',
-        wjIndex: '',
         wjTitle: '',
-        isRequir: '',
         wjScore: '',
       });
 

src/views/zy/zyInfo/StudentZyInfoList.vue

@@ -120,11 +120,11 @@
 
   function classFun(record){
     if(record.score){
-      return "background: #1f77f8";
-    }else if(record.stuFilePath){
       return "background: #18a689";
+    }else if(record.stuFilePath){
+      return "background: #c6c209"; 
     }else{
-      return "background: #ff0000";
+      return "background: #fe1a1a";
     }
   }
   function callText(record){

src/views/zy/zyInfo/ZyInfoList.vue

@@ -125,11 +125,11 @@ import dayjs from 'dayjs';
 
   function classFun(type){
     if(type == '0'){
-      return "background: #a7a6a6";
+      return "background: #fe1a1a";
     }else if(type == '1'){
-      return "background: #18a689";
+      return "background: #c6c209";
     }else if(type == '2'){
-      return "background: #6583f8";
+      return "background: #18a689";
     }
   }
   /**