From 8b8ad43dc4dfebe914a60975d6907d67a6db111f Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 6 Nov 2024 15:18:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=AA=E5=99=A8CMS=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 2 + .../controller/InstrumentController.java | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index ba519c7..0b61b4b 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -84,6 +84,8 @@ public class ShiroConfig { } // 配置不会被拦截的链接 顺序判断 + filterChainDefinitionMap.put("/instrument/instrument/listcms", "anon"); //cms仪器资源接口 + filterChainDefinitionMap.put("/instrument/instrument/queryByIdCms", "anon"); //cms仪器资源接口 filterChainDefinitionMap.put("/expert/expert/listadminCMS", "anon"); //cms专家模块不拦截 filterChainDefinitionMap.put("/expert/expert/directioncalListCMS", "anon"); //cms专家模块不拦截 filterChainDefinitionMap.put("/expert/expert/CMSexpinfo", "anon"); //cms专家模块不拦截 diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java index ee2c50d..51eafb8 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java @@ -94,6 +94,47 @@ public class InstrumentController extends JeecgController> listcms(Instrument instrument, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(instrument, req.getParameterMap()); + queryWrapper.eq("state","3"); + Page page = new Page(pageNo, pageSize); + IPage pageList = instrumentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "仪器信息表-通过id查询") + @ApiOperation(value="仪器信息表-通过id查询", notes="仪器信息表-通过id查询") + @GetMapping(value = "/queryByIdCms") + public Result queryByIdCms(@RequestParam(name="id",required=true) String id) { + Instrument instrument = instrumentService.getById(id); + if(instrument==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(instrument); + } + /** * 分页列表查询 * From d1909e7cfe2b6439666d59b9dce93b7431613289 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 6 Nov 2024 15:44:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=AA=E5=99=A8CMS=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/config/shiro/ShiroConfig.java | 2 ++ .../controller/DisciplineFieidController.java | 10 ++++++++++ .../controller/InstrumentTypeController.java | 15 +++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 0b61b4b..a76b18e 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -86,6 +86,8 @@ public class ShiroConfig { // 配置不会被拦截的链接 顺序判断 filterChainDefinitionMap.put("/instrument/instrument/listcms", "anon"); //cms仪器资源接口 filterChainDefinitionMap.put("/instrument/instrument/queryByIdCms", "anon"); //cms仪器资源接口 + filterChainDefinitionMap.put("/disciplinefieid/disciplineFieid/listcms", "anon"); //cms学科领域接口 + filterChainDefinitionMap.put("/instrumenttype/instrumentType/listcms", "anon"); //cms仪器分类接口 filterChainDefinitionMap.put("/expert/expert/listadminCMS", "anon"); //cms专家模块不拦截 filterChainDefinitionMap.put("/expert/expert/directioncalListCMS", "anon"); //cms专家模块不拦截 filterChainDefinitionMap.put("/expert/expert/CMSexpinfo", "anon"); //cms专家模块不拦截 diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java index ac8767c..9e52820 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java @@ -75,6 +75,16 @@ public class DisciplineFieidController extends JeecgController> listcms() { + QueryWrapper queryWrapper = new QueryWrapper(); + List pageList = disciplineFieidService.list(queryWrapper); + return Result.OK(pageList); + } + + /** * 添加 * diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java index 9f12172..92ae2e5 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java @@ -75,6 +75,21 @@ public class InstrumentTypeController extends JeecgController> listcms() { + QueryWrapper queryWrapper = new QueryWrapper(); + List pageList = instrumentTypeService.list(queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * From f93241de6caf7ee30d4f8cd7360cdbe2017a4790 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Wed, 6 Nov 2024 16:18:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E3=80=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=97=A5=E5=BF=97=20=E5=8A=9F=E8=83=BD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=2011.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ProjectList.vue | 20 +- .../src/views/projectLog/ProjectLog.data.ts | 12 +- .../views/projectLog/ProjectLogBasicModal.vue | 218 +++++++++++++++--- .../src/views/projectLog/ProjectLogList.vue | 23 +- 4 files changed, 208 insertions(+), 65 deletions(-) diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue index 9d569c4..5d978bb 100644 --- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue @@ -42,21 +42,9 @@ -
- -
+ + diff --git a/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue b/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue index 4f716d7..71e5049 100644 --- a/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue +++ b/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue @@ -3,7 +3,7 @@ - - + <!–操作栏–> - + <!–字段回显插槽–> + --> @@ -46,16 +46,25 @@ import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ProjectLog.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import { useUserStore } from '/@/store/modules/user'; + import {useRoute} from "vue-router"; + import {defHttp} from "@/utils/http/axios"; const queryParam = reactive({}); const checkedKeys = ref>([]); const userStore = useUserStore(); //注册model const [registerModal, {openModal}] = useModal(); + + const route = useRoute(); + const listByProjectId = () =>{ + // console.log("projectId",props.projectId) + let params = {projectId: route.query.id} + return defHttp.get({url: '/projectLog/projectLog/list', params}); + } //注册table数据 const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ tableProps:{ title: '项目操作日志', - api: list, + api: listByProjectId, columns, canResize:false, formConfig: { @@ -187,4 +196,4 @@ :deep(.ant-picker),:deep(.ant-input-number){ width: 100%; } - \ No newline at end of file +