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

修改问题

This commit is contained in:
yangjun 2024-09-29 17:23:28 +08:00
parent dd11fb83b4
commit f1a49c5ea7
11 changed files with 95 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java
View File

@ -8,6 +8,8 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.DateUtils;
@ -94,6 +96,10 @@ public class XxhbjwxtscwjxxController extends JeecgController<Xxhbjwxtscwjxx, IX
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if(StringUtils.isEmpty(xxhbjwxtscwjxx.getKcrwdm())){
return Result.OK(new Page<>());
}
QueryWrapper<Xxhbjwxtscwjxx> queryWrapper = QueryGenerator.initQueryWrapper(xxhbjwxtscwjxx, req.getParameterMap());
Page<Xxhbjwxtscwjxx> page = new Page<Xxhbjwxtscwjxx>(pageNo, pageSize);
IPage<Xxhbjwxtscwjxx> pageList = xxhbjwxtscwjxxService.page(page, queryWrapper);
@ -101,16 +107,16 @@ public class XxhbjwxtscwjxxController extends JeecgController<Xxhbjwxtscwjxx, IX
item.setId(item.getPath());
});
//
// List<Xxhbjwxtscwjxx> list = pageList.getRecords();
// if(list.size()>0){
// List<Xxhbjwxtscwjxx> list2 = new ArrayList<>();
// String sorts[] = ("课程考核合理性审核记录单,课程目标达成情况评价报告,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准,历次过程性考核-内容及要求（或试题）,历次过程性考核-评分标准").split(",");
// for (String par : sorts){
// list2.add(list.stream().filter(item->item.getFjtype().equals(par)).findFirst().orElse(null));
// }
// pageList.setRecords(list2);
// }
List<Xxhbjwxtscwjxx> list = pageList.getRecords();
if(list.size()>0){
List<Xxhbjwxtscwjxx> list2 = new ArrayList<>();
String sorts[] = ("历次过程性考核-评分标准,历次过程性考核-内容及要求（或试题）,课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题（或内容及要求）,课程考核质量评价单,课程目标达成情况评价报告").split(",");
for (String par : sorts){
list2.add(list.stream().filter(item->item.getFjtype().equals(par)).findFirst().orElse(null));
}
pageList.setRecords(list2);
}
return Result.OK(pageList);

1
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
View File

@ -303,7 +303,6 @@ public class SysUserController {
return result;
}
@RequiresPermissions("system:user:queryUserRole")
@RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
Result<List<String>> result = new Result<>();

2
jeecg-boot/pom.xml
View File

@ -32,6 +32,8 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomcat.version>9.0.89</tomcat.version>
<!-- 微服务 -->
<spring-cloud.version>2021.0.3</spring-cloud.version>
<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>

23
jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue
View File

@ -17,7 +17,8 @@
<MenuItem itemKey="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" />
<MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" />
<MenuItem itemKey="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" />
<MenuItem itemKey="zhanghao" :text="t('layout.header.dropdownItemZhanghao')" icon="ion:sync-outline" />
<MenuItem itemKey="zhanghao" v-if="adminRole" :text="t('layout.header.dropdownItemZhanghao')" icon="ion:sync-outline" />
<!-- <MenuItem
v-if="getUseLockPage"
itemKey="lock"
@ -60,6 +61,7 @@
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
import { getRefPromise } from '/@/utils/index';
import Qiehuanzhanghao from './Qiehuanzhanghao.vue';
import { defHttp } from '/@/utils/http/axios';
type MenuEvent = 'logout' | 'doc' | 'lock' | 'cache' | 'depart';
const { createMessage } = useMessage();
@ -85,6 +87,7 @@ import Qiehuanzhanghao from './Qiehuanzhanghao.vue';
const userStore = useUserStore();
const go = useGo();
const passwordVisible = ref(false);
const adminRole = ref(false);
const lockActionVisible = ref(false);
const lockActionRef = ref(null);
@ -102,6 +105,19 @@ import Qiehuanzhanghao from './Qiehuanzhanghao.vue';
}
});
defHttp.get({ url: '/sys/user/queryUserRole',params:{userid:userStore.getUserInfo.id} }).then((res) => {
console.log('--->',res);
if (res.length>0) {
res.forEach((item=>{
if(item == 'f6817f48af4fb3af11b9e8bf182f618b'){
adminRole.value = true;
}
}))
}
});
const [register, { openModal }] = useModal();
/**
* 多部门弹窗逻辑
@ -155,7 +171,9 @@ import Qiehuanzhanghao from './Qiehuanzhanghao.vue';
}
function qiehuanzhanghao(){
console.log('切换账号');
console.log('切换账号',userStore);
console.log('切换账号',userStore.getUserInfo);
console.log('切换账号',userStore.getRoleList);
qiehuanzhanghaoRef.value.title = "切换账号";
qiehuanzhanghaoRef.value.show(userStore.getUserInfo.username);
}
@ -206,6 +224,7 @@ import Qiehuanzhanghao from './Qiehuanzhanghao.vue';
qiehuanzhanghaoRef,
passwordVisible,
lockActionVisible,
adminRole,
};
},
});

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

@ -24,19 +24,19 @@
<div v-if="jxrwInfo.value">
<div style="padding-left:14px; font-size:16px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>

20
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/KhpjclForm.vue
View File

@ -15,20 +15,20 @@
<div v-if="jxrwInfo.value">
<div style="padding-left: 15px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<span style="margin-left: 15px">开课单位</span> ：<span>{{ jxrwInfo?.value.kkyxmc }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程类别</span> ：<span>{{ jxrwInfo?.value.kclb }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程名称</span> ：<span>{{ jxrwInfo?.value.kcmc }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程负责人</span> ：<span>{{ jxrwInfo?.value.teaxm }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<span style="margin-left: 15px">考试性质</span> ：<span>{{ jxrwInfo?.value.khfsmc }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>
</div>

20
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XsysclForm.vue
View File

@ -24,20 +24,20 @@
<div v-if="jxrwInfo.value">
<div style="padding-left: 15px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<span style="margin-left: 15px">开课单位</span> ：<span>{{ jxrwInfo?.value.kkyxmc }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程类别</span> ：<span>{{ jxrwInfo?.value.kclb }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程名称</span> ：<span>{{ jxrwInfo?.value.kcmc }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<span style="margin-left: 15px">课程负责人</span> ：<span>{{ jxrwInfo?.value.teaxm }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<span style="margin-left: 15px">考试性质</span> ：<span>{{ jxrwInfo?.value.khfsmc }}</span>
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>
</div>

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

@ -21,19 +21,19 @@
<div v-if="jxrwInfo.value">
<div style="padding-left: 14px; font-size:16px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>
@ -263,7 +263,8 @@ function searchReset() {
function init(record) {
queryParam.kcrwdm = record.kcrwdm;
queryParam.fjtype = '课程考核合理性审核记录单,课程目标达成情况评价报告,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准,历次过程性考核-内容及要求（或试题）,历次过程性考核-评分标准';
// queryParam.fjtype = '课程考核合理性审核记录单,课程目标达成情况评价报告,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准,历次过程性考核-内容及要求（或试题）,历次过程性考核-评分标准';
queryParam.fjtype = '历次过程性考核-评分标准,历次过程性考核-内容及要求（或试题）,课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题（或内容及要求）,课程考核质量评价单,课程目标达成情况评价报告';
// 平时成绩
// 期末成绩
// 期中成绩

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

@ -307,18 +307,21 @@ export const columns3: BasicColumn[] = [
align: "center",
dataIndex: 'cj4',
width: 100,
sorter: true,
},
{
title: '期末成绩',
align: "center",
dataIndex: 'cj5',
width: 100,
sorter: true,
},
{
title: '总成绩',
align: "center",
dataIndex: 'zcj',
width: 100,
sorter: true,
},
];

10
jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList3.vue
View File

@ -21,19 +21,19 @@
<div v-if="jxrwInfo.value">
<div style="padding-left:14px; font-size:16px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>

23
jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList4.vue
View File

@ -1,14 +1,23 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" class="query-criteria">
<a-row :gutter="24">
<a-col :span="12" style="margin-top: 10px;">
<a-button type="primary" @click="handleFanhui">返回</a-button>
</a-col>
</a-row>
</a-form>
</div>
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24" v-if="jxrwInfo?.value">
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">{{ jxrwInfo?.value?.khfs }}[{{ jxrwInfo?.value?.zb }}] </span> </a-col>
<a-col :span="12" style="text-align: right">
<!-- <a-col :span="12" style="text-align: right">
<a-button type="primary" @click="handleFanhui">返回</a-button>
</a-col>
</a-col> -->
<a-col :gutter="24">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo?.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
@ -16,19 +25,19 @@
<div v-if="jxrwInfo.value">
<div style="padding-left:16px;font-size:16px; font-weight: 700">概要信息</div>
<a-row style="line-height: 30px">
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">开课单位</span> ：<span class="header-title">{{ jxrwInfo?.value.kkyxmc }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程类别</span> ：<span class="header-title">{{ jxrwInfo?.value.kclb }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程名称</span> ：<span class="header-title">{{ jxrwInfo?.value.kcmc }}</span>
</a-col>
<a-col :span="5">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">课程负责人</span> ：<span class="header-title">{{ jxrwInfo?.value.teaxm }}</span>
</a-col>
<a-col :span="4">
<a-col :xl="8" :sm="12" :md="8">
<span class="header-title" style="margin-left: 15px">选课人数</span> ：<span class="header-title">{{ jxrwInfo?.value.jxbrs }}</span>
</a-col>
</a-row>