修改bug

This commit is contained in:
yangjun 2024-11-12 17:51:20 +08:00
parent cb0956983e
commit ea0acda5a2
5 changed files with 334 additions and 96 deletions

View File

@ -0,0 +1,251 @@
<template>
<div>
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item label="学期学年">
<j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item label="开课单位">
<JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item label="授课教师">
<a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item label="是否完成">
<a-select v-model:value="queryParam.sfwc" placeholder="是否完成" >
<a-select-option value="">全部</a-select-option>
<a-select-option :value="2"></a-select-option>
<a-select-option :value="1"></a-select-option>
</a-select>
</a-form-item>
</a-col>
<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>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
</a-col>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" >
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
</BasicTable>
<!-- 表单区域 -->
<ZyJxdgModal ref="registerModal" @success="handleSuccess"></ZyJxdgModal>
</div>
</template>
<script lang="ts" name="zyJxdg-zyJxdg" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns3 } from './Kczygl.data';
import { sysStaticCyList, deleteOne, batchDelete, getImportUrl, getStaticCyExportUrl } from './Kczygl.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { JInput, JDictSelectTag } from '/@/components/Form';
import ZyJxdgModal from './components/KczyglModal.vue'
import { useMessage } from '/@/hooks/web/useMessage';
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
import { useGlobSetting } from '/@/hooks/setting';
const globSetting = useGlobSetting();
const baseApiUrl = globSetting.domainUrl;
const { createMessage } = useMessage();
const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const activeKey = ref('1');
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
api: sysStaticCyList,
columns: columns3,
canResize:false,
useSearchForm: false,
showActionColumn: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: (params) => {
params.column = '',params.order = '';//
return Object.assign(params, queryParam.value);
},
},
exportConfig: {
name: "课程测验情况统计",
url: getStaticCyExportUrl,
params: () => {
return Object.assign({},queryParam.value);
}
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
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 handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
if(record.filePath){
if(!record.pdfPath){
createMessage.warning("正在向文件服务器进行传输请稍等10秒刷新后进行编辑")
return;
}
}
if(record.jxrlFilePath){
if(!record.jxrlPdfPath){
createMessage.warning("正在向文件服务器进行传输请稍等10秒刷新后进行编辑")
return;
}
}
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
function openPdf(record){
if(record){
var url2 = getFileAccessHttpUrl(record)
let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
window.open(url,"_blank")
}else{
createMessage.warning("正在向文件服务器进行传输请稍等10秒刷新后进行预览")
}
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
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) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
queryParam.value = {};
selectedRowKeys.value = [];
//
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>

View File

@ -6,12 +6,15 @@ const { createConfirm } = useMessage();
enum Api {
list = '/zyInfo/zyInfo/sysList',
list2 = '/zyInfo/zyInfo/sysStaticList',
sysStaticZyList = '/zyInfo/zyInfo/sysStaticZyList',
sysStaticCyList = '/zyInfo/zyInfo/sysStaticCyList',
save='/zyInfo/zyInfo/sysUpdateJxnr',
edit='/zyInfo/zyInfo/sysUpdateJxnr',
deleteOne = '/zyInfo/zyInfo/delete',
deleteBatch = '/zyInfo/zyInfo/deleteBatch',
importExcel = '/zyInfo/zyInfo/importExcel',
exportXls = '/zyInfo/zyInfo/exportSysXls',
getStaticCyExportUrl = '/zyInfo/zyInfo/getStaticCyExportUrl',
}
/**
@ -19,6 +22,7 @@ enum Api {
* @param params
*/
export const getExportUrl = Api.exportXls;
export const getStaticCyExportUrl = Api.getStaticCyExportUrl;
/**
* api
@ -31,6 +35,8 @@ export const getImportUrl = Api.importExcel;
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
export const list2 = (params) => defHttp.get({ url: Api.list2, params });
export const sysStaticZyList = (params) => defHttp.get({ url: Api.sysStaticZyList, params });
export const sysStaticCyList = (params) => defHttp.get({ url: Api.sysStaticCyList, params });
/**
*

View File

@ -91,61 +91,6 @@ export const columns: BasicColumn[] = [
},
// {
// title: '作业名称',
// align: 'center',
// dataIndex: 'zymc',
// },
// {
// title: '是否完成',
// align: 'center',
// dataIndex: 'sfwc',
// },
// {
// title: '是否发布',
// align: 'center',
// dataIndex: 'sffb',
// },
// {
// title: '是否互评',
// align: 'center',
// dataIndex: 'sfhp',
// },
// {
// title: '开课任务编号',
// align: 'center',
// dataIndex: 'rwbh',
// },
// {
// title: '上课时间',
// align: 'center',
// dataIndex: 'sksj',
// },
// {
// title: '上课地点',
// align: 'center',
// dataIndex: 'skdd',
// },
// {
// title: '作业数量',
// align: "center",
// dataIndex: 'num',
// },
// {
// title: '课程简介',
// align: 'center',
// dataIndex: 'kcjs',
// },
// {
// title: '教学日历',
// align: "center",
// dataIndex: 'jxrlFilePath',
// slots: { customRender: 'fileSlot2' },
// width: '300'
// },
];
export const columns2: BasicColumn[] = [
@ -168,17 +113,11 @@ export const columns2: BasicColumn[] = [
title: '课程性质',
align: 'center',
dataIndex: 'kcxz',
customRender: function ({ text }) {
return "通识教育必修课";
},
},
{
title: '选课学生',
align: 'center',
dataIndex: 'xkrs',
customRender: function ({ text }) {
return "25";
},
},
{
title: '授课教师',
@ -189,37 +128,70 @@ export const columns2: BasicColumn[] = [
title: '职称',
align: 'center',
dataIndex: 'zc',
customRender: function ({ text }) {
return "讲师";
},
},
{
title: '发布测验次数',
align: 'center',
dataIndex: 'fbzycs',
customRender: function ({ text }) {
return "3";
},
},
{
title: '测验完成次数',
title: '作业名称',
align: 'center',
dataIndex: 'zywccs',
customRender: function ({ text }) {
return "2";
},
dataIndex: 'title',
},
{
title: '超时未完成次数',
title: '是否完成',
align: 'center',
dataIndex: 'cswwc',
customRender: function ({ text }) {
return "1";
},
dataIndex: 'sfwc',
},
{
title: '是否互评',
align: 'center',
dataIndex: 'sfhp',
},
];
export const columns3: BasicColumn[] = [
{
title: '学期学年',
align: 'center',
dataIndex: 'xqxn',
},
{
title: '学院',
align: 'center',
dataIndex: 'kkdw',
},
{
title: '课程名称',
align: 'center',
dataIndex: 'kcmc',
},
{
title: '课程性质',
align: 'center',
dataIndex: 'kcxz',
},
{
title: '选课学生',
align: 'center',
dataIndex: 'xkrs',
},
{
title: '授课教师',
align: 'center',
dataIndex: 'skjs',
},
{
title: '职称',
align: 'center',
dataIndex: 'zc',
},
{
title: '测验名称',
align: 'center',
dataIndex: 'title',
},
{
title: '是否完成',
align: 'center',
dataIndex: 'sfwc',
},
];
//查询数据

View File

@ -4,17 +4,11 @@
<a-tab-pane key="1" tab="统计信息">
<TjsjList></TjsjList>
</a-tab-pane>
<a-tab-pane key="2" tab="作业:按课程统计">
<a-tab-pane key="2" tab="作业统计">
<ZyKctjList></ZyKctjList>
</a-tab-pane>
<a-tab-pane key="3" tab="作业:按教师统计">
</a-tab-pane>
<a-tab-pane key="4" tab="测验:按课程统计">
</a-tab-pane>
<a-tab-pane key="5" tab="测验:按教师统计">
<a-tab-pane key="3" tab="测验统计">
<CyKctjList></CyKctjList>
</a-tab-pane>
</a-tabs>
<!-- 表单区域 -->
@ -36,6 +30,7 @@
import { useGlobSetting } from '/@/hooks/setting';
import TjsjList from '/@/views/zy/sysZy/kczygl/TjsjList.vue';
import ZyKctjList from '/@/views/zy/sysZy/kczygl/ZyKctjList.vue';
import CyKctjList from '/@/views/zy/sysZy/kczygl/CyKctjList.vue';
const globSetting = useGlobSetting();
const baseApiUrl = globSetting.domainUrl;

View File

@ -19,6 +19,20 @@
<a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item label="是否完成">
<a-select v-model:value="queryParam.sfwc" placeholder="是否完成" >
<a-select-option value="">全部</a-select-option>
<a-select-option :value="2"></a-select-option>
<a-select-option :value="1"></a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item label="是否互评">
<j-dict-select-tag placeholder="是否互评" v-model:value="queryParam.sfhp" dictCode="yn"/>
</a-form-item>
</a-col>
<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">
@ -47,7 +61,7 @@
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns2 } from './Kczygl.data';
import { list2, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Kczygl.api';
import { sysStaticZyList, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Kczygl.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { JInput, JDictSelectTag } from '/@/components/Form';
import ZyJxdgModal from './components/KczyglModal.vue'
@ -66,7 +80,7 @@
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
api: list2,
api: sysStaticZyList,
columns: columns2,
canResize:false,
useSearchForm: false,
@ -81,7 +95,7 @@
},
},
exportConfig: {
name: "课程作业管理",
name: "课程作业情况统计",
url: getExportUrl,
params: () => {
return Object.assign({},queryParam.value);