yangjun
/
DBSD_ZJPT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-09-07 15:17:09 +08:00
parent 8576177e2a
commit b8e19e840f
32 changed files with 1321 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyHuizong.java
View File

@ -91,6 +91,7 @@ public class ZyHuizong implements Serializable {
/**作业类型*/ /**作业类型*/
@Excel(name = "作业类型", width = 15) @Excel(name = "作业类型", width = 15)
@ApiModelProperty(value = "作业类型") @ApiModelProperty(value = "作业类型")
@Dict(dicCode = "cjlx")
private java.lang.String zylx; private java.lang.String zylx;
/**作业占比*/ /**作业占比*/
@Excel(name = "作业占比", width = 15) @Excel(name = "作业占比", width = 15)

13
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/Vkczxzy0002.java
View File

@ -136,5 +136,18 @@ public class Vkczxzy0002 implements Serializable {
@Dict(dicCode = "zyLeixing") @Dict(dicCode = "zyLeixing")
private String zyLeixing; private String zyLeixing;
@Excel(name = "维普查重报告", width = 15)
@ApiModelProperty(value = "维普查重报告")
private String wpccbg;
@Excel(name = "学校查重报告", width = 15)
@ApiModelProperty(value = "学校查重报告")
private String xxccbg;
@Excel(name = "本次查重报告", width = 15)
@ApiModelProperty(value = "本次查重报告")
private String bcccbg;
@Excel(name = "aigc查重报告", width = 15)
@ApiModelProperty(value = "aigc查重报告")
private String aigcccbg;
} }

20
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/ZyHuizongXiangxi.java
View File

@ -150,8 +150,24 @@ public class ZyHuizongXiangxi implements Serializable {
private java.util.Date khclTime; private java.util.Date khclTime;
/**作业类型*/ /**作业类型*/
@Excel(name = "作业类型", width = 15, dicCode = "zyLeixing") @Excel(name = "作业类型", width = 15, dicCode = "cjlx")
@ApiModelProperty(value = "作业类型") @ApiModelProperty(value = "作业类型")
@Dict(dicCode = "zyLeixing") @Dict(dicCode = "cjlx")
private String zyLeixing; private String zyLeixing;
@Excel(name = "维普查重报告", width = 15)
@ApiModelProperty(value = "维普查重报告")
private String wpccbg;
@Excel(name = "学校查重报告", width = 15)
@ApiModelProperty(value = "学校查重报告")
private String xxccbg;
@Excel(name = "本次查重报告", width = 15)
@ApiModelProperty(value = "本次查重报告")
private String bcccbg;
@Excel(name = "aigc查重报告", width = 15)
@ApiModelProperty(value = "aigc查重报告")
private String aigcccbg;
} }

4
jeecgboot-vue3/.env
View File

@ -2,10 +2,10 @@
VITE_PORT = 3100 VITE_PORT = 3100
# 网站标题 # 网站标题
VITE_GLOB_APP_TITLE = 东北师大-专家督导平台 VITE_GLOB_APP_TITLE = 东北师范大学专家审核评估平台
# 简称，此变量只能是字符/下划线 # 简称，此变量只能是字符/下划线
VITE_GLOB_APP_SHORT_NAME = 专家督导平台 VITE_GLOB_APP_SHORT_NAME = 专家审核评估
# 单点登录服务端地址 # 单点登录服务端地址
VITE_GLOB_APP_CAS_BASE_URL=https://authserver.nenu.edu.cn/authserver VITE_GLOB_APP_CAS_BASE_URL=https://authserver.nenu.edu.cn/authserver

7
jeecgboot-vue3/src/components/Table/src/BasicTable.vue
View File

@ -129,6 +129,13 @@
const wrapRef = ref(null); const wrapRef = ref(null);
const innerPropsRef = ref<Partial<BasicTableProps>>(); const innerPropsRef = ref<Partial<BasicTableProps>>();
console.log("----------->",props);
const indexColumnProps = {
dataIndex: 'index',
width: '15px',
};
// props.indexColumnProps = indexColumnProps;
const { prefixCls } = useDesign('basic-table'); const { prefixCls } = useDesign('basic-table');
const [registerForm, formActions] = useForm(); const [registerForm, formActions] = useForm();

2
jeecgboot-vue3/src/hooks/system/useListPage.ts
View File

@ -255,7 +255,7 @@ export function useListTable(tableProps: TableProps): [
// 是否显示边框 // 是否显示边框
bordered: true, bordered: true,
// 是否显示序号列 // 是否显示序号列
showIndexColumn: false, showIndexColumn: true,
// 显示表格设置 // 显示表格设置
showTableSetting: true, showTableSetting: true,
// 表格全屏设置 // 表格全屏设置

33
jeecgboot-vue3/src/hooks/web/useTitle.ts
View File

@ -29,23 +29,24 @@ export function useTitle() {
if (route.name === REDIRECT_NAME) { if (route.name === REDIRECT_NAME) {
return; return;
} }
pageTitle.value = title;
// update-begin--author:liaozhiyang---date:20231110---for：【QQYUN-6938】online菜单名字和页面title不一致 // update-begin--author:liaozhiyang---date:20231110---for：【QQYUN-6938】online菜单名字和页面title不一致
if (route.params && Object.keys(route.params).length) { // if (route.params && Object.keys(route.params).length) {
if (!menus.value) { // if (!menus.value) {
menus.value = await getMenus(); // menus.value = await getMenus();
} // }
const getTitle = getMatchingRouterName(menus.value, route.fullPath); // const getTitle = getMatchingRouterName(menus.value, route.fullPath);
let tTitle = ''; // let tTitle = '';
if (getTitle) { // if (getTitle) {
tTitle = t(getTitle); // tTitle = t(getTitle);
} else { // } else {
tTitle = t(route?.meta?.title as string); // tTitle = t(route?.meta?.title as string);
} // }
pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`; // pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`;
} else { // } else {
const tTitle = t(route?.meta?.title as string); // const tTitle = t(route?.meta?.title as string);
pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`; // pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`;
} // }
// update-end--author:liaozhiyang---date:20231110---for：【QQYUN-6938】online菜单名字和页面title不一致 // update-end--author:liaozhiyang---date:20231110---for：【QQYUN-6938】online菜单名字和页面title不一致
}, },
{ immediate: true } { immediate: true }

4
jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue
View File

@ -15,8 +15,8 @@
<script lang="ts" name="zyHuizong-zyHuizong" setup> <script lang="ts" name="zyHuizong-zyHuizong" setup>
import { ref } from 'vue'; import { ref } from 'vue';
import ZyHuizongList from '/@/views/bl/zyHuizong/ZyHuizongList.vue'; import ZyHuizongList from '/@/views/bl/zyHuizong/ZyHuizongList2.vue';
import ZyHuizongXiangxiList from '/@/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList.vue'; import ZyHuizongXiangxiList from '/@/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList2.vue';
import XxhbjwxtjxrwList from '/@/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue'; import XxhbjwxtjxrwList from '/@/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue';
import XxhbjwxtxsmdList from '/@/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue'; import XxhbjwxtxsmdList from '/@/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue';

8
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/JwxtMain.vue
View File

@ -4,12 +4,12 @@
<a-tab-pane key="1" tab="教学任务"> <a-tab-pane key="1" tab="教学任务">
<XxhbjwxtjxrwList /> <XxhbjwxtjxrwList />
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="文件上传信息"> <a-tab-pane key="2" tab="学生成绩">
<XxhbjwxtscwjxxList />
</a-tab-pane>
<a-tab-pane key="3" tab="学生名单">
<XxhbjwxtxsmdList /> <XxhbjwxtxsmdList />
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="3" tab="传输记录">
<XxhbjwxtscwjxxList />
</a-tab-pane>
</a-tabs> </a-tabs>
</div> </div>
</template> </template>

10
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList.vue
View File

@ -4,7 +4,7 @@
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24" style="text-align: right;"> <a-col :span="24" style="text-align: right;margin-bottom: 20px;">
模板下载： 模板下载：
<a-popover placement="topRight" type="primary"> <a-popover placement="topRight" type="primary">
<template #content> <template #content>
@ -21,7 +21,7 @@
<!-- <a-button type="primary" style="margin-left: 10px;">专家用评价表</a-button> <!-- <a-button type="primary" style="margin-left: 10px;">专家用评价表</a-button>
<a-button type="primary" style="margin-left: 10px;">专家工作量统计</a-button> --> <a-button type="primary" style="margin-left: 10px;">专家工作量统计</a-button> -->
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6" >
<a-form-item name="xn"> <a-form-item name="xn">
<template #label><span title="学年">学年</span></template> <template #label><span title="学年">学年</span></template>
<j-dict-select-tag placeholder="请选择学年" v-model:value="queryParam.xn" :dictCode="`v_xn,xn,xn`" allow-clear /> <j-dict-select-tag placeholder="请选择学年" v-model:value="queryParam.xn" :dictCode="`v_xn,xn,xn`" allow-clear />
@ -35,7 +35,6 @@
</a-col> </a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="kcmc"> <a-form-item name="kcmc">
<template #label><span title="课程名称">课程名称</span></template> <template #label><span title="课程名称">课程名称</span></template>
@ -54,17 +53,12 @@
<j-input placeholder="请输入任课教师" v-model:value="queryParam.teaxm" allow-clear ></j-input> <j-input placeholder="请输入任课教师" v-model:value="queryParam.teaxm" allow-clear ></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :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>
<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:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button> <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col> </a-col>
</span> </span>
</a-col> </a-col>

8
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue
View File

@ -4,7 +4,7 @@
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24" style="text-align: right;"> <a-col :span="24" style="text-align: right;margin-bottom: 20px;">
模板下载： 模板下载：
<a-popover placement="topRight" type="primary"> <a-popover placement="topRight" type="primary">
<template #content> <template #content>
@ -35,7 +35,6 @@
</a-col> </a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="kcmc"> <a-form-item name="kcmc">
<template #label><span title="课程名称">课程名称</span></template> <template #label><span title="课程名称">课程名称</span></template>
@ -54,17 +53,12 @@
<j-input placeholder="请输入任课教师" v-model:value="queryParam.teaxm" allow-clear ></j-input> <j-input placeholder="请输入任课教师" v-model:value="queryParam.teaxm" allow-clear ></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :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>
<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:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button> <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col> </a-col>
</span> </span>
</a-col> </a-col>

10
jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts
View File

@ -6,24 +6,26 @@ import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
title: '姓名', title: '文件名称',
align: "center", align: "center",
dataIndex: 'name' dataIndex: 'name'
}, },
{ {
title: '文件', title: '存储路径',
align: "center", align: "center",
dataIndex: 'path' dataIndex: 'path'
}, },
{ {
title: '创建人', title: '创建人',
align: "center", align: "center",
dataIndex: 'cjr' dataIndex: 'cjr',
width:80,
}, },
{ {
title: '创建时间', title: '创建时间',
align: "center", align: "center",
dataIndex: 'cjsj' dataIndex: 'cjsj',
width: 160,
}, },
]; ];

41
jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue
View File

@ -4,38 +4,29 @@
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6" >
<a-form-item name="name">
<template #label><span title="文件名称">文件名称</span></template>
<j-input placeholder="请输入文件名称" v-model:value="queryParam.name" x allow-clear />
</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-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</a-col>
</span>
</a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<!--引用表格--> <!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection"> <BasicTable @register="registerTable" >
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'xxhbjwxtscwjxx:xxhbjwxtscwjxx:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'xxhbjwxtscwjxx:xxhbjwxtscwjxx:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" v-auth="'xxhbjwxtscwjxx:xxhbjwxtscwjxx:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button v-auth="'xxhbjwxtscwjxx:xxhbjwxtscwjxx:deleteBatch'">批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<!--操作栏--> <!--操作栏-->
<template #action="{ record }"> <template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/> <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template> </template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable> </BasicTable>
<!-- 表单区域 --> <!-- 表单区域 -->
<XxhbjwxtscwjxxModal ref="registerModal" @success="handleSuccess"></XxhbjwxtscwjxxModal> <XxhbjwxtscwjxxModal ref="registerModal" @success="handleSuccess"></XxhbjwxtscwjxxModal>
@ -51,6 +42,7 @@
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import XxhbjwxtscwjxxModal from './components/XxhbjwxtscwjxxModal.vue' import XxhbjwxtscwjxxModal from './components/XxhbjwxtscwjxxModal.vue'
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
const formRef = ref(); const formRef = ref();
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});
@ -60,7 +52,6 @@
//注册table数据 //注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: { tableProps: {
title: '教务系统上传文件信息',
api: list, api: list,
columns, columns,
canResize:false, canResize:false,

152
jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts
View File

@ -8,7 +8,8 @@ export const columns: BasicColumn[] = [
{ {
title: '课程任务代码', title: '课程任务代码',
align: "center", align: "center",
dataIndex: 'kcrwdm' dataIndex: 'kcrwdm',
width: 200,
}, },
{ {
title: '年级', title: '年级',
@ -18,37 +19,44 @@ export const columns: BasicColumn[] = [
{ {
title: '学生状态', title: '学生状态',
align: "center", align: "center",
dataIndex: 'xsztmc' dataIndex: 'xsztmc',
width: 100,
}, },
{ {
title: '专业', title: '专业',
align: "center", align: "center",
dataIndex: 'zymc' dataIndex: 'zymc',
width: 200,
}, },
{ {
title: '学号', title: '学号',
align: "center", align: "center",
dataIndex: 'xsbh' dataIndex: 'xsbh',
width: 100,
}, },
{ {
title: '学生姓名', title: '学生姓名',
align: "center", align: "center",
dataIndex: 'xsxm' dataIndex: 'xsxm',
width: 100,
}, },
{ {
title: '课程名称', title: '课程名称',
align: "center", align: "center",
dataIndex: 'kcmc' dataIndex: 'kcmc',
width: 200,
}, },
{ {
title: '课程类别', title: '课程类别',
align: "center", align: "center",
dataIndex: 'kclb' dataIndex: 'kclb',
width: 200,
}, },
{ {
title: '任课教师', title: '任课教师',
align: "center", align: "center",
dataIndex: 'teaxm' dataIndex: 'teaxm',
width: 100,
}, },
{ {
title: '平时成绩1', title: '平时成绩1',
@ -225,6 +233,134 @@ export const columns: BasicColumn[] = [
// align: "center", // align: "center",
// dataIndex: 'cj5mc' // dataIndex: 'cj5mc'
// }, // },
{
title: '总成绩',
align: "center",
dataIndex: 'zcj',
width: 100,
},
{
title: '成绩方式',
align: "center",
dataIndex: 'cjfsmc',
width: 100,
},
{
title: '选读',
align: "center",
dataIndex: 'xdfsmc',
width: 100,
},
{
title: '考试性质',
align: "center",
dataIndex: 'ksxzmc',
width: 100,
},
];
//列表数据
export const columns2: BasicColumn[] = [
{
title: '课程任务代码',
align: "center",
dataIndex: 'kcrwdm',
width: 200,
},
{
title: '年级',
align: "center",
dataIndex: 'nj'
},
{
title: '学生状态',
align: "center",
dataIndex: 'xsztmc'
},
{
title: '专业',
align: "center",
dataIndex: 'zymc',
width: 200,
},
{
title: '学号',
align: "center",
dataIndex: 'xsbh'
},
{
title: '学生姓名',
align: "center",
dataIndex: 'xsxm'
},
{
title: '课程名称',
align: "center",
dataIndex: 'kcmc',
width: 200,
},
{
title: '课程类别',
align: "center",
dataIndex: 'kclb',
width: 200,
},
{
title: '任课教师',
align: "center",
dataIndex: 'teaxm'
},
{
title: '平时成绩1',
align: "center",
dataIndex: 'cj1',
},
{
title: '平时成绩2',
align: "center",
dataIndex: 'cj2',
},
{
title: '平时成绩3',
align: "center",
dataIndex: 'cj3',
},
{
title: '期中成绩',
align: "center",
dataIndex: 'cj4',
},
{
title: '期末成绩',
align: "center",
dataIndex: 'cj5',
},
{
title: '平时成绩1',
align: "center",
dataIndex: 'cj1mc'
},
{
title: '平时成绩2',
align: "center",
dataIndex: 'cj2mc'
},
{
title: '平时成绩3',
align: "center",
dataIndex: 'cj3mc'
},
{
title: '期中成绩',
align: "center",
dataIndex: 'cj4mc'
},
{
title: '期末成绩',
align: "center",
dataIndex: 'cj5mc'
},
{ {
title: '总成绩', title: '总成绩',
align: "center", align: "center",

93
jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue
View File

@ -4,47 +4,44 @@
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<div style="width:100%;"> <a-col :lg="6" >
<div style="text-align: right"> <a-form-item name="kcrwdm">
模板下载： <template #label><span title="课程任务代码">课程任务代码</span></template>
<a-button type="primary" style="margin-left: 10px;">课程考核合理性评价单</a-button> <j-input placeholder="请输入文件名称" v-model:value="queryParam.kcrwdm" allow-clear />
<a-button type="primary" style="margin-left: 10px;">成绩单</a-button> </a-form-item>
<a-button type="primary" style="margin-left: 10px;">课程目标达成评价报告</a-button> </a-col>
<a-button type="primary" style="margin-left: 10px;">专家用评价表</a-button> <a-col :lg="6" >
</div> <a-form-item name="zymc">
<div style="text-align: center;font-size: 16px;font-weight: 700;line-height: 50px;" v-if="jxrwInfo.value"> <template #label><span title="专业">专业</span></template>
{{jxrwInfo?.value.xn}}{{jxrwInfo?.value.xqmc}}学期《{{jxrwInfo?.value.kcmc}}》课程考核材料 <j-input placeholder="请输入文件名称" v-model:value="queryParam.zymc" allow-clear />
</div> </a-form-item>
<div v-if="jxrwInfo.value"> </a-col>
<div>概要信息</div> <a-col :lg="6" >
<a-row> <a-form-item name="xsxm">
<a-col :span="5"> <template #label><span title="学生姓名">学生姓名</span></template>
<span style="margin-left: 15px;">开课单位</span> ：<span>{{jxrwInfo?.value.kkyxmc}}</span> <j-input placeholder="请输入学生姓名" v-model:value="queryParam.xsxm" allow-clear />
</a-col> </a-form-item>
<a-col :span="5"> </a-col>
<span style="margin-left: 15px;">课程类别</span> ：<span>{{jxrwInfo?.value.kclb}}</span> <a-col :lg="6" >
</a-col> <a-form-item name="kcmc">
<a-col :span="5"> <template #label><span title="课程名称">课程名称</span></template>
<span style="margin-left: 15px;">课程名称</span> ：<span>{{jxrwInfo?.value.kcmc}}</span> <j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc" allow-clear />
</a-col> </a-form-item>
<a-col :span="5"> </a-col>
<span style="margin-left: 15px;">课程负责人</span> ：<span>{{jxrwInfo?.value.teaxm}}</span> <a-col :lg="6" >
</a-col> <a-form-item name="kclb">
<a-col :span="4"> <template #label><span title="课程类别">课程类别</span></template>
<span style="margin-left: 15px;">考试性质</span> ：<span>{{jxrwInfo?.value.khfsmc}}</span> <JSelectMultiple v-model:value="queryParam.kclb" placeholder="请选择课程类别" dictCode="kcxz"></JSelectMultiple>
</a-col> </a-form-item>
<!-- <a-col :span="6">--> </a-col>
<!-- <span style="margin-left: 15px;">成绩方式</span> ：<span></span>--> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<!-- </a-col>--> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<!-- <a-col :span="6">--> <a-col :lg="6">
<!-- <span style="margin-left: 15px;">修读方式</span> ：<span></span>--> <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<!-- </a-col>--> <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<!-- <a-col :span="6">--> </a-col>
<!-- <span style="margin-left: 15px;">任课教师职称</span> ：<span>{{jxrwInfo?.value.teaxm.substring(jxrwInfo?.value.teaxm.indexOf("[")+1,jxrwInfo?.value.teaxm.indexOf("]"))}}</span>--> </span>
<!-- </a-col>--> </a-col>
</a-row>
</div>
</div>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
@ -67,12 +64,14 @@
import { ref, reactive,defineExpose } from 'vue'; import { ref, reactive,defineExpose } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage'; import { useListPage } from '/@/hooks/system/useListPage';
import { columns, superQuerySchema } from './Xxhbjwxtxsmd.data'; import { columns, superQuerySchema,columns2 } from './Xxhbjwxtxsmd.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Xxhbjwxtxsmd.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Xxhbjwxtxsmd.api';
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import XxhbjwxtxsmdModal from './components/XxhbjwxtxsmdModal.vue' import XxhbjwxtxsmdModal from './components/XxhbjwxtxsmdModal.vue'
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { downloadFile as ajaxDownloadFileFn } from '/@/api/common/api'; import { downloadFile as ajaxDownloadFileFn } from '/@/api/common/api';
import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
const formRef = ref(); const formRef = ref();
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});
@ -87,7 +86,7 @@
tableProps: { tableProps: {
title:'详细信息', title:'详细信息',
api: list, api: list,
columns, columns:columns2,
canResize:false, canResize:false,
useSearchForm: false, useSearchForm: false,
showActionColumn: false, showActionColumn: false,
@ -112,13 +111,13 @@
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext; const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({ const labelCol = reactive({
xs:24, xs:24,
sm:4, sm:8,
xl:6, xl:8,
xxl:4 xxl:8
}); });
const wrapperCol = reactive({ const wrapperCol = reactive({
xs: 24, xs: 24,
sm: 20, sm: 16,
}); });
function textDown(){ function textDown(){

12
jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue
View File

@ -16,7 +16,6 @@
<a-input placeholder="请输入专家姓名" v-model:value="queryParam.zjName" allow-clear ></a-input> <a-input placeholder="请输入专家姓名" v-model:value="queryParam.zjName" allow-clear ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="sqfw"> <a-form-item name="sqfw">
<template #label><span title="授权范围">授权范围</span></template> <template #label><span title="授权范围">授权范围</span></template>
@ -29,16 +28,11 @@
<j-dict-select-tag placeholder="请选择授权状态" v-model:value="queryParam.sqzt" dictCode="zj_sqzt" allow-clear /> <j-dict-select-tag placeholder="请选择授权状态" v-model:value="queryParam.sqzt" dictCode="zj_sqzt" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :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>
<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 @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col> </a-col>
</span> </span>
</a-col> </a-col>
@ -110,13 +104,13 @@
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext; const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({ const labelCol = reactive({
xs:24, xs:24,
sm:4, sm:6,
xl:6, xl:6,
xxl:4 xxl:6
}); });
const wrapperCol = reactive({ const wrapperCol = reactive({
xs: 24, xs: 24,
sm: 20, sm: 18,
}); });
// 高级查询配置 // 高级查询配置

48
jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue
View File

@ -4,20 +4,20 @@
<template #detail> <template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ZjSqxxForm"> <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ZjSqxxForm">
<a-row> <a-row>
<a-col :span="24" > <a-col :span="24">
<a-form-item label="用户" v-bind="validateInfos.userName" id="ZjSqxxForm-userId" name="userName" class="mdule-box"> <a-form-item label="用户" v-bind="validateInfos.userName" id="ZjSqxxForm-userId" name="userName" class="mdule-box">
<a-input v-model:value="formData.userName" placeholder="请选择用户" allow-clear style="width: 60%" disabled></a-input> <a-input v-model:value="formData.userName" placeholder="请选择用户" allow-clear style="width: 60%" disabled></a-input>
<a-input v-model:value="formData.userId" placeholder="请选择用户" allow-clear hidden></a-input> <a-input v-model:value="formData.userId" placeholder="请选择用户" allow-clear hidden></a-input>
<a-button type="primary" @click="handleSelect" style="margin-left: 10px"> 选择用户</a-button> <a-button type="primary" @click="handleSelect" style="margin-left: 10px"> 选择专家</a-button>
<a-button type="primary" @click="handleShouquan" style="margin-left: 10px"> 授权</a-button> <a-button type="primary" @click="handleShouquan" style="margin-left: 10px"> 授权</a-button>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-for="(item, index) in sqDataList" :key="index" class="mdule-box"> <a-row v-for="(item, index) in sqDataList" :key="index" class="mdule-box">
<a-col :span="24"> <a-col :span="24">
<a-form-item label="授权范围" id="ZjSqxxForm-sqfw" name="sqfw"> <a-form-item label="授权范围" id="ZjSqxxForm-sqfw" name="sqfw">
<j-dict-select-tag v-model:value="item.sqfw" dictCode="zj_sqfw" placeholder="请选择授权范围" allow-clear style="width:80%" /> <j-dict-select-tag v-model:value="item.sqfw" dictCode="zj_sqfw" placeholder="请选择授权范围" allow-clear style="width: 80%" />
<a-button type="primary" @click="handleSqDel(index)">删除</a-button> <a-button type="primary" @click="handleSqDel(index)" style="margin-left: 33px;">删除</a-button>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 过程考核 --> <!-- 过程考核 -->
@ -102,7 +102,6 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq"> <a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq">
<j-dict-select-tag v-model:value="item.xnxq" dictCode="xqxn" placeholder="请选择学年学期" allow-clear />
<JSelectMultiple v-model:value="item.xnxq" placeholder="请选择学年学期" dictCode="xqxn"></JSelectMultiple> <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择学年学期" dictCode="xqxn"></JSelectMultiple>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -296,7 +295,7 @@ const disabled = computed(() => {
return props.formDisabled; return props.formDisabled;
}); });
function handleSqDel(index){ function handleSqDel(index) {
sqDataList.value.splice(index, 1); sqDataList.value.splice(index, 1);
} }
@ -414,6 +413,29 @@ async function submitForm() {
} }
model.sqDataList = sqDataList.value; model.sqDataList = sqDataList.value;
console.log('💋', model); console.log('💋', model);
if (!model.userId) {
createMessage.warning('请选择专家');
confirmLoading.value = false;
return;
}
console.log('🧒', model.sqDataList);
if (model.sqDataList.length==0) {
createMessage.warning('请给专家配置授权范围');
confirmLoading.value = false;
return;
}else{
var list = model.sqDataList;
for(var i=0;i<list.length;i++){
if(!list[i].sqfw){
createMessage.warning('请给专家配置授权范围');
confirmLoading.value = false;
return;
}
}
}
await saveNew(model, isUpdate.value) await saveNew(model, isUpdate.value)
.then((res) => { .then((res) => {
@ -441,17 +463,17 @@ defineExpose({
padding: 14px; padding: 14px;
background: #f7f7f7; background: #f7f7f7;
} }
.mdule-box{ .mdule-box {
border: 2px solid #ececec; border: 2px solid #ececec;
background: #fff; background: #fff;
border-radius:8px; border-radius: 8px;
margin:0 10px 10px 10px; margin: 0 10px 10px 10px;
padding:20px 0; padding: 20px 0;
} }
.mdule-box:hover{ .mdule-box:hover {
border: 2px solid #ececec; border: 2px solid #ececec;
background: #fff; background: #fff;
border-radius:8px; border-radius: 8px;
box-shadow: 1px 1px 10px 1px #dedede; box-shadow: 1px 1px 10px 1px #dedede;
cursor: pointer; cursor: pointer;
} }

7
jeecgboot-vue3/src/views/bl/zyHuizong/ZyHuizong.data.ts
View File

@ -48,15 +48,16 @@ export const columns: BasicColumn[] = [
{ {
title: '作业名称', title: '作业名称',
align: "center", align: "center",
dataIndex: 'zymc' dataIndex: 'zymc',
slots: {customRender: 'zymc'}
}, },
{ {
title: '作业类型', title: '作业类型',
align: "center", align: "center",
dataIndex: 'zylx' dataIndex: 'zylx_dictText'
}, },
{ {
title: '作业占比', title: '作业占比(%)',
align: "center", align: "center",
dataIndex: 'qmzb' dataIndex: 'qmzb'
}, },

6
jeecgboot-vue3/src/views/bl/zyHuizong/ZyHuizongList.vue
View File

@ -16,7 +16,6 @@
<a-input placeholder="请输入学院编号" v-model:value="queryParam.xybh" allow-clear ></a-input> <a-input placeholder="请输入学院编号" v-model:value="queryParam.xybh" allow-clear ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="xymc"> <a-form-item name="xymc">
<template #label><span title="学院名称">学院名称</span></template> <template #label><span title="学院名称">学院名称</span></template>
@ -41,16 +40,11 @@
<a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs" allow-clear ></a-input> <a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs" allow-clear ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :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>
<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 @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col> </a-col>
</span> </span>
</a-col> </a-col>

248
jeecgboot-vue3/src/views/bl/zyHuizong/ZyHuizongList2.vue Normal file
View File

@ -0,0 +1,248 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="xnxq">
<template #label><span title="学期学年">学期学年</span></template>
<j-dict-select-tag placeholder="请选择学期学年" v-model:value="queryParam.xnxq" dictCode="xqxn" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="xybh">
<template #label><span title="学院编号">学院编号</span></template>
<a-input placeholder="请输入学院编号" v-model:value="queryParam.xybh" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="xymc">
<template #label><span title="学院名称">学院名称</span></template>
<a-input placeholder="请输入学院名称" v-model:value="queryParam.xymc" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="kcmc">
<template #label><span title="课程名称">课程名称</span></template>
<a-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="jgh">
<template #label><span title="教工号">教工号</span></template>
<a-input placeholder="请输入教工号" v-model:value="queryParam.jgh" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="skjs">
<template #label><span title="授课教师">授课教师</span></template>
<a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs" allow-clear></a-input>
</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-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" 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>
<template #zymc="{ record }">
<a @click="handleZyinfo(record)">{{ record.zymc }}</a>
</template>
</BasicTable>
<!-- 表单区域 -->
<ZyHuizongModal ref="registerModal" @success="handleSuccess"></ZyHuizongModal>
<ZyInfoDetailModal ref="registerDetialModal" @success="handleSuccess"></ZyInfoDetailModal>
</div>
</template>
<script lang="ts" name="zyHuizong-zyHuizong" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, superQuerySchema } from './ZyHuizong.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ZyHuizong.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import ZyHuizongModal from './components/ZyHuizongModal.vue';
import { useUserStore } from '/@/store/modules/user';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import ZyInfoDetailModal from '/@/views/bl/zyHuizong/components/ZyInfoDetailModal.vue';
const emit = defineEmits(['callback']);
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const registerDetialModal = ref();
const userStore = useUserStore();
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
api: list,
columns,
canResize: false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: '作业汇总',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
tableContext;
const labelCol = reactive({
xs: 24,
sm: 6,
xl: 6,
xxl: 6,
});
const wrapperCol = reactive({
xs: 24,
sm: 18,
});
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
function handleZyinfo(record) {
console.log('🏃', record);
registerDetialModal.value.disableSubmit = true;
registerDetialModal.value.edit(record);
}
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
emit('callback', 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 searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//刷新数据
reload();
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust {
min-width: 100px !important;
}
.query-group-split-cust {
width: 30px;
display: inline-block;
text-align: center;
}
.ant-form-item:not(.ant-form-item-with-help) {
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),
:deep(.ant-input-number) {
width: 100%;
}
}
</style>

4
jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue
View File

@ -4,10 +4,10 @@
<a-tab-pane key="1" tab="作业汇总"> <a-tab-pane key="1" tab="作业汇总">
<ZyHuizongList /> <ZyHuizongList />
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="详细信息"> <a-tab-pane key="2" tab="作业详情">
<ZyHuizongXiangxiList /> <ZyHuizongXiangxiList />
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="3" tab="上传记录"> <a-tab-pane key="3" tab="传输记录">
<ZyInfoScjlList /> <ZyInfoScjlList />
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>

49
jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongForm.vue
View File

@ -72,7 +72,6 @@
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getValueType } from '/@/utils'; import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../ZyHuizong.api';
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
const props = defineProps({ const props = defineProps({
@ -143,59 +142,11 @@
}); });
} }
/**
* 提交数据
*/
async function submitForm() {
try {
// 触发表单验证
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
}
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//时间格式化
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//循环数据
for (let data in model) {
//如果该数据是数组并且是字符串类型
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//如果是字符串类型的需要变成以逗号分割的字符串
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
defineExpose({ defineExpose({
add, add,
edit, edit,
submitForm,
}); });
</script> </script>

1
jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongModal.vue
View File

@ -43,7 +43,6 @@
* 确定按钮点击事件 * 确定按钮点击事件
*/ */
function handleOk() { function handleOk() {
registerForm.value.submitForm();
} }
/** /**

395
jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailForm.vue Normal file
View File

@ -0,0 +1,395 @@
<template>
<a-spin :spinning="confirmLoading">
<a-form ref="formRef" style="background: #f9f9f9" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-col :span="24">
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<div class="wrapper-back">
<div class="wrapper-title">基本信息</div>
<a-col :span="24">
<a-form-item label="作业题目">
<span class="spanb-word">{{ formData.zymc }}</span>
</a-form-item>
</a-col>
<a-col :span="24" v-if="dataKhnr.length > 0">
<a-form-item label="考察内容">
<a-table :columns="columnsKhnr" class="spanb-word" rowKey="id" :data-source="dataKhnr" :pagination="false" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="作业截止时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
<span class="spanb-word">{{ formData.endTime }}</span>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="作业发布时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
<span class="spanb-word">{{ formData.startTime }}</span>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="作业要求">
<div class="spanb-word" style="margin-top: 5px" v-html="formData.content"></div>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.filePath">
<a-form-item label="参考资料">
<span>{{ lastString(formData.filePath) }}</span>
<a-button type="primary" style="margin-left: 10px" @click="downLoad(formData.filePath)">下载</a-button>
</a-form-item>
</a-col>
<a-col :span="24" v-show="formData.sturead == '1' && formData.pfbz">
<a-form-item label="评分标准" layout="inline">
<div class="spanb-word" style="margin-top: 5px" v-html="formData.pfbz"></div>
</a-form-item>
</a-col>
</div>
<a-col :span="24" v-if="formData.wwtgl" class="wrapper-back">
<div class="wrapper-title">查重设置</div>
<a-form-item layout="inline" style="margin-left: 100px">
<a-form-item label="检测通过率" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
<span style="padding: 7px 10px"></span>
<a-input-number v-model:value="formData.wwtgl" placeholder="检测通过率" style="width: 60%" :max="100" :min="0" disabled>
<template #addonAfter> % </template>
</a-input-number>
</a-form-item>
<a-form-item label="比对库设置" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
<div style="padding: 7px 20px">维普</div>
<div style="padding: 0 10px">
<a-checkbox v-model:checked="formData.wwcc" style="margin-left: 10px" disabled>
<span class="Check-title">维普资源库查重：</span><br />
<span class="Check-concent">中文科技期刊数据库、硕博学位论文库、高校特色论文库、互联网数据资源/互联网文档资源</span>
</a-checkbox>
<a-checkbox v-model:checked="formData.xncc" disabled>
<span class="Check-title">学校作业库查重：</span><br />
<span class="Check-concent">历届学生提供的作业库内查重</span>
</a-checkbox>
<a-checkbox v-model:checked="formData.nwcc" disabled>
<span class="Check-title">本次作业查重：</span><br />
<span class="Check-concent">本次学生提交的作业间查重</span>
</a-checkbox>
</div>
<div style="padding: 7px 20px">AIGC</div>
<div style="padding: 0 10px">
<a-checkbox v-model:checked="formData.aigccc" style="margin-left: 10px" disabled>
<span class="Check-title">AIGC查重：</span><br />
<span class="Check-concent">检测作业是否部分或全部由AI模型生成</span>
</a-checkbox>
</div>
</a-form-item>
</a-form-item>
</a-col>
<a-col v-if="formData.pyContent || formData.pyFilePath">
<div class="wrapper-back">
<div class="wrapper-title">批阅信息</div>
<a-row>
<a-col :span="24" v-if="formData.pyContent">
<a-form-item label="批阅内容" layout="inline">
<div class="spanb-word" style="margin-top: 5px" v-html="formData.pyContent"></div>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.pyFilePath">
<a-form-item label="批阅附件">
<span>{{ lastString(formData.pyFilePath) }}</span>
<a-button type="primary" style="margin-left: 10px" @click="downLoad(formData.pyFilePath)">下载</a-button>
</a-form-item>
</a-col>
</a-row>
</div>
</a-col>
</a-row>
</a-form>
</a-col>
</a-row>
</a-form>
</a-spin>
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted, unref } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getValueType } from '/@/utils';
import { Form } from 'ant-design-vue';
import { useRouter } from 'vue-router';
import dayjs, { Dayjs } from 'dayjs';
import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
import { downloadFile } from '/@/utils/common/renderUtils';
//当前路由信息
const { currentRoute } = useRouter();
const { query } = unref(currentRoute);
const { rwbh } = query; //获取传递参数
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => {} },
formBpm: { type: Boolean, default: true },
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const dataKhnr = ref<any>([]);
const formData = reactive<Record<string, any>>({
id: '',
createTime: '',
jgh: '',
kcmc: '',
qmzb: '',
rwbh: '',
sfsckhcl: '',
sfsckhclTime: '',
skjs: '',
xnxq: '',
xybh: '',
xymc: '',
zyLeixing: '',
zybh: '',
zylx_dictText: '',
zymc: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
// const labelCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 3 } });
// const wrapperCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 20 } });
const labelCol2 = reactive({
sm: { span: 10 },
});
const wrapperCol2 = reactive({
sm: { span: 10 },
});
const labelCol3 = reactive({
sm: { span: 4 },
});
const wrapperCol3 = reactive({
sm: { span: 20 },
});
const confirmLoading = ref<boolean>(false);
//表单验证
const validatorRules = {
title: [{ required: true, message: '请输入作业名称!' }],
// zyType: [{ required: true, message: '请输入类型!'},],
startTime: [{ required: true, message: '请输入开始时间!' }],
endTime: [{ required: true, message: '请输入结束时间!' }],
wwcc: [{ required: true, message: '请输入外网是否查重!' }],
wwtgl: [{ required: false }, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!' }],
nwcc: [{ required: true, message: '请输入内网查重!' }],
nwtgl: [{ required: false }, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!' }],
aigccc: [{ required: true, message: '请输入aigc查重!' }],
aigctgl: [{ required: false }, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!' }],
xncc: [{ required: true, message: '请输入aigc查重!' }],
xntgl: [{ required: false }, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!' }],
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
const disabledDate = (current: Dayjs) => {
return current && current < dayjs().subtract(1, 'days').endOf('day');
};
// 表单禁用
const disabled = computed(() => {
if (props.formBpm === true) {
if (props.formData.disabled === false) {
return false;
} else {
return true;
}
}
return props.formDisabled;
});
const columnsKhnr = [
{
title: '序号',
dataIndex: 'no',
key: 'no',
customRender: (text) => {
return text.index + 1;
},
width: 80,
},
{
title: '章次',
dataIndex: 'title',
key: 'title',
},
{
title: '节次',
dataIndex: 'twoTitle',
key: 'twoTitle',
},
];
function downLoad(file) {
if (file) {
let url = getFileAccessHttpUrl(file);
if (url) {
window.open(url);
}
} else {
createMessage.warning('暂无文件或文件上传中');
}
}
/**
* 新增
*/
function add() {
edit({ rwbh });
}
/**
* 编辑
*/
function edit(record) {
console.log('😈', record);
nextTick(() => {
resetFields();
//赋值
Object.assign(formData, record);
handleKcnr(formData.kcnr);
});
}
function lastString(record) {
console.log('😓', record);
const parts = record.split('/');
console.log('🧔', parts);
return parts[parts.length - 1];
}
/**
* 提交数据
*/
async function submitForm() {
// 触发表单验证
await validate();
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//时间格式化
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//循环数据
for (let data in model) {
//如果该数据是数组并且是字符串类型
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//如果是字符串类型的需要变成以逗号分割的字符串
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
if (model.wwcc == '1') {
if (!model.wwtgl) {
createMessage.warning('网络通过率不能为空');
confirmLoading.value = false;
return;
}
}
if (model.nwcc == '1') {
if (!model.nwtgl) {
createMessage.warning('内网通过率不能为空');
confirmLoading.value = false;
return;
}
}
if (model.aigccc == '1') {
if (!model.aigctgl) {
createMessage.warning('AIGC通过率不能为空');
confirmLoading.value = false;
return;
}
}
if (model.xncc == '1') {
if (!model.xntgl) {
createMessage.warning('校内通过率不能为空');
confirmLoading.value = false;
return;
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
//选择考察内容
function handleKcnr(kcnr) {
if (kcnr) {
defHttp.get({ url: '/teachingunitcontent/kcTeachingUnitContentOne/getAllList', params: { id: kcnr } }).then((res) => {
console.log('🤦‍♀️', res);
dataKhnr.value = res;
});
} else {
dataKhnr.value = [];
}
}
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
min-height: 300px !important;
overflow-y: auto;
padding: 24px 24px 24px 24px;
}
.spanSm {
top: -22px;
position: inherit;
padding: 0 0 0 164px;
color: #a9a9a9;
}
.spana {
margin-left: 30px;
line-height: 30px;
}
.spanb {
margin-left: 30px;
line-height: 30px;
}
.spanb-word {
color: #999999;
}
.wrapper-back {
background: #fff;
border-radius: 10px;
margin-top: 10px;
padding-top: 15px;
width: 100%;
}
.wrapper-title {
font-size: 18px;
border-left: 4px solid #1ab394;
font-weight: bold;
padding-left: 20px;
margin-bottom: 20px;
}
.Check-title {
color: #333;
font-weight: bold;
}
.Check-concent {
color: #999;
}
</style>

75
jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailModal.vue Normal file
View File

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

54
jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxi.data.ts
View File

@ -59,7 +59,7 @@ export const columns: BasicColumn[] = [
{ {
title: '作业类型', title: '作业类型',
align: "center", align: "center",
dataIndex: 'zyLeixing' dataIndex: 'zyLeixing_dictText'
}, },
{ {
title: '占比(%)', title: '占比(%)',
@ -76,30 +76,34 @@ export const columns: BasicColumn[] = [
align: "center", align: "center",
dataIndex: 'xsxm' dataIndex: 'xsxm'
}, },
// {
// title: '维普检测率', {
// align: "center", title: '查重率（%）',
// dataIndex: 'wpzyk', align: "center",
// ifShow: false, dataIndex: 'ccl',
// }, children: [
// { {
// title: '学校检测率', title: '维普资源库',
// align: "center", align: "center",
// dataIndex: 'xxzyk', dataIndex: 'wpzyk',
// ifShow: false, },
// }, {
// { title: '学校作业库',
// title: '本次检测率', align: "center",
// align: "center", dataIndex: 'xxzyk',
// dataIndex: 'bczyk', },
// ifShow: false, {
// }, title: '本次作业库',
// { align: "center",
// title: 'aigc检测率', dataIndex: 'bczyk',
// align: "center", },
// dataIndex: 'aigc', {
// ifShow: false, title: 'AIGC',
// }, align: "center",
dataIndex: 'aigc',
},
]
},
{ {
title: '作业分数', title: '作业分数',
align: "center", align: "center",

210
jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList2.vue Normal file
View File

@ -0,0 +1,210 @@
<template>
<div class="p-2">
<!--查询区域-->
<!--引用表格-->
<BasicTable @register="registerTable">
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
</BasicTable>
<!-- 表单区域 -->
<ZyHuizongXiangxiModal ref="registerModal" @success="handleSuccess"></ZyHuizongXiangxiModal>
</div>
</template>
<script lang="ts" name="zyHuizongXiangxi-zyHuizongXiangxi" setup>
import { ref, reactive ,defineExpose} from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, superQuerySchema } from './ZyHuizongXiangxi.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ZyHuizongXiangxi.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import ZyHuizongXiangxiModal from './components/ZyHuizongXiangxiModal.vue';
import { useUserStore } from '/@/store/modules/user';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
import { baseApiUrl } from '/@/utils/common/compUtils';
import { encryptByBase64 } from '/@/utils/cipher';
import { getFileAccessHttpUrl, getHeaders, getRandom } from '/@/utils/common/compUtils';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
api: list,
columns,
canResize: false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: '作业汇总详细',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
tableContext;
const labelCol = reactive({
xs: 24,
sm: 6,
xl: 6,
xxl: 6,
});
const wrapperCol = reactive({
xs: 24,
sm: 18,
});
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
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 handleYulan(record){
var file = getFileAccessHttpUrl(record.fwqPath) ;
console.log('🤬', file);
window.open('https://fileview.jeecg.com/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
}
function handleDown(record){
downloadFile(record.filePath)
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '预览',
onClick: handleYulan.bind(null, record),
},
{
label: '下载',
onClick: handleDown.bind(null, record),
},
];
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//刷新数据
reload();
}
function init(record) {
console.log('🧞', record);
queryParam.zybh = record.id;
reload();
}
defineExpose({
init,
});
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust {
min-width: 100px !important;
}
.query-group-split-cust {
width: 30px;
display: inline-block;
text-align: center;
}
.ant-form-item:not(.ant-form-item-with-help) {
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),
:deep(.ant-input-number) {
width: 100%;
}
}
</style>

6
jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue
View File

@ -16,7 +16,6 @@
<j-dict-select-tag placeholder="请选择作业类型" v-model:value="queryParam.zyLeixing" dictCode="zy_leixing" allow-clear /> <j-dict-select-tag placeholder="请选择作业类型" v-model:value="queryParam.zyLeixing" dictCode="zy_leixing" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="kkdw"> <a-form-item name="kkdw">
<template #label><span title="开课单位">开课单位</span></template> <template #label><span title="开课单位">开课单位</span></template>
@ -59,16 +58,11 @@
<a-input placeholder="请输入学生姓名" v-model:value="queryParam.studentName" allow-clear ></a-input> <a-input placeholder="请输入学生姓名" v-model:value="queryParam.studentName" allow-clear ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :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>
<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 @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col> </a-col>
</span> </span>
</a-col> </a-col>

5
jeecgboot-vue3/src/views/dashboard/Analysis/index.vue
View File

@ -1,9 +1,10 @@
<template> <template>
<div style="text-align: center;" > <div style="text-align: center;" >
<img src="../../../assets/images/welcome.png" style="margin-top: 10%; width:600px" /> <div style="font-size: 20px;line-height: 30px;font-weight: 700;margin-top: 10%;">{{projectName}}</div>
<div style="font-size: 20px;line-height: 30px;font-weight: 700;margin-top: 50px;"></div> <img src="../../../assets/images/welcome.png" style="margin-top: 50px; width:600px" />
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue'; import { ref } from 'vue';
const projectName = import.meta.env.VITE_GLOB_APP_TITLE;
</script> </script>

2
jeecgboot-vue3/src/views/system/notice/index.vue
View File

@ -30,7 +30,7 @@
<a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleEdit(notice)">编辑</a-button> <a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleEdit(notice)">编辑</a-button>
<a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleDelete(notice)">删除</a-button> <a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleDelete(notice)">删除</a-button>
<a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleRelease(notice)">发布</a-button> <a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleRelease(notice)">发布</a-button>
<a-button v-if="notice.sendStatus==1" class="item-button-border" type="link" @click="handleDetail(notice)">详情</a-button> <!-- <a-button v-if="notice.sendStatus==1" class="item-button-border" type="link" @click="handleDetail(notice)">详情</a-button> -->
<a-button v-if="notice.sendStatus==1" class="item-button-border" type="link" @click="handleReturn(notice)">撤回</a-button> <a-button v-if="notice.sendStatus==1" class="item-button-border" type="link" @click="handleReturn(notice)">撤回</a-button>
</a-col> </a-col>
</a-row> </a-row>

8
jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<BasicModal v-bind="$attrs" @register="registerModal" title="用户选择列表" width="1000px" @ok="handleSubmit" destroyOnClose> <BasicModal v-bind="$attrs" @register="registerModal" title="专家选择列表" width="1000px" @ok="handleSubmit" destroyOnClose>
<BasicTable @register="registerTable" :rowSelection="rowSelection" /> <BasicTable @register="registerTable" :rowSelection="rowSelection" />
</BasicModal> </BasicModal>
</template> </template>
@ -7,7 +7,7 @@
import { ref, unref, toRaw } from 'vue'; import { ref, unref, toRaw } from 'vue';
import { BasicModal, useModalInner } from '/src/components/Modal'; import { BasicModal, useModalInner } from '/src/components/Modal';
import { BasicTable, useTable, TableAction } from '/src/components/Table'; import { BasicTable, useTable, TableAction } from '/src/components/Table';
import { userColumns, searchUserFormSchema } from '../role.data'; import { userColumnsNew, searchUserFormSchemaNew } from '../role.data';
import { expertList } from '../../user/user.api'; import { expertList } from '../../user/user.api';
// 声明Emits // 声明Emits
const emit = defineEmits(['select', 'register']); const emit = defineEmits(['select', 'register']);
@ -17,10 +17,10 @@
const [registerTable, { reload }] = useTable({ const [registerTable, { reload }] = useTable({
api: expertList, api: expertList,
rowKey: 'id', rowKey: 'id',
columns: userColumns, columns: userColumnsNew,
formConfig: { formConfig: {
labelWidth: 60, labelWidth: 60,
schemas: searchUserFormSchema, schemas: searchUserFormSchemaNew,
baseRowStyle: { maxHeight: '20px' }, baseRowStyle: { maxHeight: '20px' },
autoSubmitOnEnter: true, autoSubmitOnEnter: true,
}, },

31
jeecgboot-vue3/src/views/system/role/role.data.ts
View File

@ -35,6 +35,25 @@ export const userColumns = [
width: 80, width: 80,
}, },
]; ];
/**
* 角色用户Columns
*/
export const userColumnsNew = [
{
title: '专家账号',
dataIndex: 'username',
},
{
title: '专家姓名',
dataIndex: 'realname',
},
{
title: '状态',
dataIndex: 'status_dictText',
width: 80,
},
];
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'roleName', field: 'roleName',
@ -49,6 +68,18 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 6 }, colProps: { span: 6 },
}, },
]; ];
/**
* 角色用户搜索form
*/
export const searchUserFormSchemaNew: FormSchema[] = [
{
field: 'username',
label: '专家账号',
component: 'Input',
colProps: { span: 12 },
},
];
/** /**
* 角色用户搜索form * 角色用户搜索form
*/ */