修改bug

This commit is contained in:
yangjun 2024-05-25 12:50:41 +08:00
parent 70d97857c1
commit 05aef03ad1
9 changed files with 57 additions and 15 deletions

View File

@ -14,7 +14,7 @@
<a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.flag"> <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.flag">
<a-select-option value="">全部</a-select-option> <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-option value="1">已完成</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>

View File

@ -6,7 +6,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="7"> <a-col :lg="7">
<a-form-item label="问卷名称"> <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-form-item>
</a-col> </a-col>
<a-col :lg="7"> <a-col :lg="7">

View File

@ -14,7 +14,7 @@
<a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.flag"> <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.flag">
<a-select-option value="">全部</a-select-option> <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-option value="1">已完成</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>

View File

@ -9,6 +9,16 @@
<j-input placeholder="请输入问题标题" v-model:value="queryParam.wjTitle"></j-input> <j-input placeholder="请输入问题标题" v-model:value="queryParam.wjTitle"></j-input>
</a-form-item> </a-form-item>
</a-col> </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-col :lg="7">
<a-form-item label="是否公有"> <a-form-item label="是否公有">
<JDictSelectTag placeholder="请选择" v-model:value="queryParam.wjSytype" dictCode="yn" /> <JDictSelectTag placeholder="请选择" v-model:value="queryParam.wjSytype" dictCode="yn" />
@ -59,7 +69,7 @@
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue' import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue'
import {columns, searchFormSchema} from './WjxWjxxTmlb.data'; 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 {downloadFile} from '/@/utils/common/renderUtils';
import { JInput,JDictSelectTag } from '/@/components/Form'; import { JInput,JDictSelectTag } from '/@/components/Form';
@ -71,7 +81,7 @@
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{ tableProps:{
// title: '', // title: '',
api: list, api: distinctList,
columns, columns,
canResize:false, canResize:false,
useSearchForm: false, useSearchForm: false,

View File

@ -4,17 +4,27 @@
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="7"> <a-col :lg="6">
<a-form-item label="问题标题"> <a-form-item label="问题标题">
<j-input placeholder="请输入问题标题" v-model:value="queryParam.wjTitle"></j-input> <j-input placeholder="请输入问题标题" v-model:value="queryParam.wjTitle"></j-input>
</a-form-item> </a-form-item>
</a-col> </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="是否公有"> <a-form-item label="是否公有">
<JDictSelectTag placeholder="请选择" v-model:value="queryParam.wjSytype" dictCode="yn" /> <JDictSelectTag placeholder="请选择" v-model:value="queryParam.wjSytype" dictCode="yn" />
</a-form-item> </a-form-item>
</a-col> </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"> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6"> <a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button> <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
@ -59,7 +69,7 @@
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue' import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue'
import {columns, searchFormSchema} from './WjxWjxxTmlb.data'; 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 {downloadFile} from '/@/utils/common/renderUtils';
import { JInput,JDictSelectTag } from '/@/components/Form'; import { JInput,JDictSelectTag } from '/@/components/Form';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
@ -74,7 +84,7 @@
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{ tableProps:{
// title: '', // title: '',
api: list, api: distinctList,
columns, columns,
canResize:false, canResize:false,
useSearchForm: false, useSearchForm: false,

View File

@ -5,6 +5,7 @@ const { createConfirm } = useMessage();
enum Api { enum Api {
list = '/wjxWjxxTmlb/wjxWjxxTmlb/list', list = '/wjxWjxxTmlb/wjxWjxxTmlb/list',
distinctList = '/wjxWjxxTmlb/wjxWjxxTmlb/distinctList',
save='/wjxWjxxTmlb/wjxWjxxTmlb/add', save='/wjxWjxxTmlb/wjxWjxxTmlb/add',
edit='/wjxWjxxTmlb/wjxWjxxTmlb/edit', edit='/wjxWjxxTmlb/wjxWjxxTmlb/edit',
deleteOne = '/wjxWjxxTmlb/wjxWjxxTmlb/delete', deleteOne = '/wjxWjxxTmlb/wjxWjxxTmlb/delete',
@ -36,8 +37,8 @@ export const queryWjxWjxxTmxxListByMainId = (id) => defHttp.get({url: Api.wjxWjx
* *
* @param params * @param params
*/ */
export const list = (params) => export const list = (params) => defHttp.get({url: Api.list, params});
defHttp.get({url: Api.list, params}); export const distinctList = (params) => defHttp.get({url: Api.distinctList, params});
/** /**
* *

View File

@ -5,6 +5,22 @@ import { render } from '/@/utils/common/renderUtils';
import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types' import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
//列表数据 //列表数据
export const columns: BasicColumn[] = [ 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: '问题标题', title: '问题标题',
align:"center", align:"center",
@ -48,6 +64,11 @@ export const columnsYytk: BasicColumn[] = [
align:"center", align:"center",
dataIndex: 'wjScore' dataIndex: 'wjScore'
}, },
{
title: '是否公有',
align:"center",
dataIndex: 'wjSytype_dictText'
},
]; ];
//查询数据 //查询数据

View File

@ -65,7 +65,7 @@
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue' import WjxWjxxTmlbModal from './components/WjxWjxxTmlbModal.vue'
import {columnsYytk} from './WjxWjxxTmlb.data'; 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 {downloadFile} from '/@/utils/common/renderUtils';
import { JInput,JDictSelectTag } from '/@/components/Form'; import { JInput,JDictSelectTag } from '/@/components/Form';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
@ -80,7 +80,7 @@
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{ tableProps:{
// title: '', // title: '',
api: list, api: distinctList,
columns: columnsYytk, columns: columnsYytk,
canResize:false, canResize:false,
useSearchForm: false, useSearchForm: false,

View File

@ -22,7 +22,7 @@
<a-sub-menu key="sub3"> <a-sub-menu key="sub3">
<template #title>教学工具</template> <template #title>教学工具</template>
<a-menu-item key="6" @click="getGzt('dcwj')">问卷调查</a-menu-item> <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-menu-item key="8" @click="getGzt('zycd')">作业存档</a-menu-item>
</a-sub-menu> </a-sub-menu>
<a-menu-item key="sub4"> <a-menu-item key="sub4">