From f1a49c5ea7e23a140031466aa744a51903e82412 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sun, 29 Sep 2024 17:23:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XxhbjwxtscwjxxController.java | 26 ++++++++++++------- .../system/controller/SysUserController.java | 1 - jeecg-boot/pom.xml | 2 ++ .../header/components/user-dropdown/index.vue | 23 ++++++++++++++-- .../bl/xxhbjwxtjxrw/components/CjdForm.vue | 10 +++---- .../bl/xxhbjwxtjxrw/components/KhpjclForm.vue | 20 +++++++------- .../bl/xxhbjwxtjxrw/components/XsysclForm.vue | 20 +++++++------- .../bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue | 13 +++++----- .../bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts | 3 +++ .../bl/xxhbjwxtxsmd/XxhbjwxtxsmdList3.vue | 10 +++---- .../bl/xxhbjwxtxsmd/XxhbjwxtxsmdList4.vue | 23 +++++++++++----- 11 files changed, 95 insertions(+), 56 deletions(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java index e21c306..8dc61e9 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java @@ -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()); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(xxhbjwxtscwjxx, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = xxhbjwxtscwjxxService.page(page, queryWrapper); @@ -101,16 +107,16 @@ public class XxhbjwxtscwjxxController extends JeecgController list = pageList.getRecords(); -// if(list.size()>0){ -// List 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 list = pageList.getRecords(); + if(list.size()>0){ + List 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); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 2d1c788..a8eadc5 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -303,7 +303,6 @@ public class SysUserController { return result; } - @RequiresPermissions("system:user:queryUserRole") @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET) public Result> queryUserRole(@RequestParam(name = "userid", required = true) String userid) { Result> result = new Result<>(); diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index 63c85bf..be8bbaa 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -32,6 +32,8 @@ 1.8 UTF-8 + 9.0.89 + 2021.0.3 2021.0.1.0 diff --git a/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue b/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue index 9e80800..d16af86 100644 --- a/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue +++ b/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue @@ -17,7 +17,8 @@ - + + ',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, }; }, }); diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/CjdForm.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/CjdForm.vue index 07c244f..7a50812 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/CjdForm.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/CjdForm.vue @@ -24,19 +24,19 @@
概要信息
- + 开课单位 ：{{ jxrwInfo?.value.kkyxmc }} - + 课程类别 ：{{ jxrwInfo?.value.kclb }} - + 课程名称 ：{{ jxrwInfo?.value.kcmc }} - + 课程负责人 ：{{ jxrwInfo?.value.teaxm }} - + 选课人数 ：{{ jxrwInfo?.value.jxbrs }} diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/KhpjclForm.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/KhpjclForm.vue index 207a852..1dd9e6a 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/KhpjclForm.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/KhpjclForm.vue @@ -15,20 +15,20 @@
概要信息
- - 开课单位 ：{{ jxrwInfo?.value.kkyxmc }} + + 开课单位 ：{{ jxrwInfo?.value.kkyxmc }} - - 课程类别 ：{{ jxrwInfo?.value.kclb }} + + 课程类别 ：{{ jxrwInfo?.value.kclb }} - - 课程名称 ：{{ jxrwInfo?.value.kcmc }} + + 课程名称 ：{{ jxrwInfo?.value.kcmc }} - - 课程负责人 ：{{ jxrwInfo?.value.teaxm }} + + 课程负责人 ：{{ jxrwInfo?.value.teaxm }} - - 考试性质 ：{{ jxrwInfo?.value.khfsmc }} + + 选课人数 ：{{ jxrwInfo?.value.jxbrs }}
diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XsysclForm.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XsysclForm.vue index 80a2b58..d73b955 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XsysclForm.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XsysclForm.vue @@ -24,20 +24,20 @@
概要信息
- - 开课单位 ：{{ jxrwInfo?.value.kkyxmc }} + + 开课单位 ：{{ jxrwInfo?.value.kkyxmc }} - - 课程类别 ：{{ jxrwInfo?.value.kclb }} + + 课程类别 ：{{ jxrwInfo?.value.kclb }} - - 课程名称 ：{{ jxrwInfo?.value.kcmc }} + + 课程名称 ：{{ jxrwInfo?.value.kcmc }} - - 课程负责人 ：{{ jxrwInfo?.value.teaxm }} + + 课程负责人 ：{{ jxrwInfo?.value.teaxm }} - - 考试性质 ：{{ jxrwInfo?.value.khfsmc }} + + 选课人数 ：{{ jxrwInfo?.value.jxbrs }}
diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue index fe32e1f..317b404 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue @@ -21,19 +21,19 @@
概要信息
- + 开课单位 ：{{ jxrwInfo?.value.kkyxmc }} - + 课程类别 ：{{ jxrwInfo?.value.kclb }} - + 课程名称 ：{{ jxrwInfo?.value.kcmc }} - + 课程负责人 ：{{ jxrwInfo?.value.teaxm }} - + 选课人数 ：{{ jxrwInfo?.value.jxbrs }} @@ -263,7 +263,8 @@ function searchReset() { function init(record) { queryParam.kcrwdm = record.kcrwdm; - queryParam.fjtype = '课程考核合理性审核记录单,课程目标达成情况评价报告,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准,历次过程性考核-内容及要求（或试题）,历次过程性考核-评分标准'; + // queryParam.fjtype = '课程考核合理性审核记录单,课程目标达成情况评价报告,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准,历次过程性考核-内容及要求（或试题）,历次过程性考核-评分标准'; + queryParam.fjtype = '历次过程性考核-评分标准,历次过程性考核-内容及要求（或试题）,课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题（或内容及要求）,课程考核质量评价单,课程目标达成情况评价报告'; // 平时成绩 // 期末成绩 // 期中成绩 diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts index 82da929..9fc28e1 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts @@ -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, }, ]; diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList3.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList3.vue index 6054ac1..ab5939b 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList3.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList3.vue @@ -21,19 +21,19 @@
概要信息
- + 开课单位 ：{{ jxrwInfo?.value.kkyxmc }} - + 课程类别 ：{{ jxrwInfo?.value.kclb }} - + 课程名称 ：{{ jxrwInfo?.value.kcmc }} - + 课程负责人 ：{{ jxrwInfo?.value.teaxm }} - + 选课人数 ：{{ jxrwInfo?.value.jxbrs }} diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList4.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList4.vue index 0cb2bdf..6537583 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList4.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList4.vue @@ -1,14 +1,23 @@