diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java index ff37a24..8234ee7 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java @@ -156,11 +156,12 @@ public class ProjectController extends JeecgController QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap(), customeRuleMap); Page page = new Page(pageNo, pageSize); - //('科技主管部门待提交', '1'); //('不受理', '3'); //('已受理', '4'); //('申请人待提交', '5'); //('申请单位待提交', '6'); + //('科技主管部门待提交(区/县管理员)', '1'); + //('市科技局待提交', '7'); //('市科技局已提交', '8'); //('财政主管理部门待审核', '9'); @@ -169,18 +170,19 @@ public class ProjectController extends JeecgController //申请单位数据 if ("faren_admin".equals(loginUser.getRoleCode())) { queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); - queryWrapper.eq("project_status", 6); + queryWrapper.in("project_status", 6,1,7,8,9,10); + } // 区/县管理员数据 if ("quxian_admin".equals(loginUser.getRoleCode())) { queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); - queryWrapper.eq("project_status", 1); + queryWrapper.in("project_status", 1,7,8,9,10); } if ("kejiju_admin".equals(loginUser.getRoleCode())) { - queryWrapper.in("project_status", 7, 8); + queryWrapper.in("project_status", 7,8,9,10); } if ("caizheng_admin".equals(loginUser.getRoleCode())) { - queryWrapper.in("budget_status", 9, 10); + queryWrapper.in("budget_status", 8,9,10); } IPage pageList = projectService.page(page, queryWrapper); return Result.OK(pageList); @@ -420,6 +422,7 @@ public class ProjectController extends JeecgController // project.setProjectStatus("10"); project.setBudgetStatus("10"); + project.setProjectStatus(project1.getProjectStatus()); log.setBudgetStatus("10"); log.setOperationMark("财政主管部门审核通过"); } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 44cd665..e55f534 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -161,9 +161,9 @@ spring: slow-sql-millis: 5000 datasource: master: - url: jdbc:mysql://10.100.200.177:3306/zmd_kejiju?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://182.92.169.222:3306/zmd_kejiju?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: ycwl2022. driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: diff --git a/jeecgboot-vue3/package.json b/jeecgboot-vue3/package.json index 6acc61e..b67c66d 100644 --- a/jeecgboot-vue3/package.json +++ b/jeecgboot-vue3/package.json @@ -21,18 +21,19 @@ "husky:install": "husky install" }, "dependencies": { - "@jeecg/online": "3.7.1-RC", - "@iconify/iconify": "^3.1.1", "@ant-design/colors": "^7.0.2", "@ant-design/icons-vue": "^7.0.1", + "@iconify/iconify": "^3.1.1", + "@jeecg/online": "3.7.1-RC", + "@tinymce/tinymce-vue": "4.0.7", + "@traptitech/markdown-it-katex": "^3.6.0", + "@vant/area-data": "^1.5.1", "@vue/shared": "^3.4.19", "@vueuse/core": "^10.8.0", - "@tinymce/tinymce-vue": "4.0.7", "@zxcvbn-ts/core": "^3.0.4", "ant-design-vue": "^4.1.2", "axios": "^1.6.7", "china-area-data": "^5.0.1", - "@vant/area-data": "^1.5.1", "clipboard": "^2.0.11", "codemirror": "^5.65.3", "cron-parser": "^4.9.0", @@ -43,22 +44,21 @@ "echarts": "^5.4.3", "emoji-mart-vue-fast": "^15.0.1", "enquire.js": "^2.1.6", + "event-source-polyfill": "^1.0.31", + "highlight.js": "^11.9.0", "intro.js": "^7.2.0", "lodash-es": "^4.17.21", "lodash.get": "^4.4.2", "markdown-it": "^14.0.0", "markdown-it-link-attributes": "^4.0.1", - "event-source-polyfill": "^1.0.31", - "highlight.js": "^11.9.0", - "@traptitech/markdown-it-katex": "^3.6.0", "md5": "^2.3.0", "mockjs": "^1.1.0", "nprogress": "^0.2.0", "path-to-regexp": "^6.2.1", "pinia": "2.1.7", "print-js": "^1.6.0", - "qs": "^6.11.2", "qrcode": "^1.5.3", + "qs": "^6.11.2", "resize-observer-polyfill": "^1.5.1", "showdown": "^2.1.0", "sortablejs": "^1.15.2", @@ -72,6 +72,7 @@ "vue-print-nb-jeecg": "^1.0.12", "vue-router": "^4.3.0", "vue-types": "^5.1.1", + "vue3-scroll-seamless": "^1.0.6", "vuedraggable": "^4.1.0", "vxe-table": "4.6.17", "vxe-table-plugin-antd": "4.0.7", @@ -83,6 +84,7 @@ "@commitlint/config-conventional": "^18.6.2", "@iconify/json": "^2.2.185", "@purge-icons/generated": "^0.10.0", + "@rys-fe/vite-plugin-theme": "^0.8.6", "@types/codemirror": "^5.60.15", "@types/crypto-js": "^4.2.2", "@types/fs-extra": "^11.0.4", @@ -144,6 +146,7 @@ "ts-jest": "^29.1.2", "ts-node": "^10.9.2", "typescript": "^4.9.5", + "unocss": "^0.58.5", "vite": "^5.2.11", "vite-plugin-compression": "^0.5.1", "vite-plugin-html": "^3.2.2", @@ -153,9 +156,7 @@ "vite-plugin-package-config": "^0.1.1", "vite-plugin-purge-icons": "^0.10.0", "vite-plugin-svg-icons": "^2.0.1", - "@rys-fe/vite-plugin-theme": "^0.8.6", "vite-plugin-vue-setup-extend-plus": "^0.1.0", - "unocss": "^0.58.5", "vue-eslint-parser": "^9.4.2", "vue-tsc": "^1.8.27" }, diff --git a/jeecgboot-vue3/src/assets/images/image.png b/jeecgboot-vue3/src/assets/images/image.png new file mode 100644 index 0000000..ea58ae3 Binary files /dev/null and b/jeecgboot-vue3/src/assets/images/image.png differ diff --git a/jeecgboot-vue3/src/assets/images/image1.png b/jeecgboot-vue3/src/assets/images/image1.png new file mode 100644 index 0000000..c8d7200 Binary files /dev/null and b/jeecgboot-vue3/src/assets/images/image1.png differ diff --git a/jeecgboot-vue3/src/assets/images/image11.png b/jeecgboot-vue3/src/assets/images/image11.png new file mode 100644 index 0000000..b53f3e9 Binary files /dev/null and b/jeecgboot-vue3/src/assets/images/image11.png differ diff --git a/jeecgboot-vue3/src/router/helper/mainOut copy.ts b/jeecgboot-vue3/src/router/helper/mainOut copy.ts new file mode 100644 index 0000000..27b62fc --- /dev/null +++ b/jeecgboot-vue3/src/router/helper/mainOut copy.ts @@ -0,0 +1,75 @@ +/** +The routing of this file will not show the layout. +It is an independent new page. +the contents of the file still need to log in to access + */ +import type { AppRouteModule } from '/@/router/types'; + +// test +// http:ip:port/main-out +export const mainOutRoutes: AppRouteModule[] = [ + { + path: '/main-out', + name: 'MainOut', + component: () => import('/@/views/demo/main-out/index.vue'), + meta: { + title: 'MainOut', + ignoreAuth: true, + }, + }, + // ====== + { + path: '/main-home', + name: 'MainOut', + component: () => import('/@/views/demo/main-home/index.vue'), + meta: { + title: 'MainHome', + ignoreAuth: true, + }, + redirect: '/main-home/HomePage', + children: [ + { + path: '/main-home/HomePage', + name: 'HomePage', + component: () => import('/@/views/demo/main-home/components/homePage/index.vue'), + meta: { + title: 'HomePage', + ignoreAuth: true, + }, + }, + { + path: '/main-home/MatchEvaluation', + name: 'MatchEvaluation', + component: () => import('/@/views/demo/main-home/components/matchEvaluation/index.vue'), + meta: { + title: 'MatchEvaluation', + ignoreAuth: true, + }, + redirect: '/main-home/MatchEvaluation/MCh', + children: [ + { + path: '/main-home/MatchEvaluation/MCh', + name: 'MCh', + component: () => import('/@/views/demo/main-home/components/matchEvaluation/components/MCh.vue'), + meta: { + title: 'MCh', + ignoreAuth: true, + }, + }, + { + path: '/main-home/MatchEvaluation/LesserCh/:id', + name: 'LesserCh', + component: () => import('/@/views/demo/main-home/components/matchEvaluation/components/LesserCh.vue'), + meta: { + title: 'LesserCh', + ignoreAuth: true, + }, + }, + ] + }, + + ], + } +]; + +export const mainOutRouteNames = mainOutRoutes.map((item) => item.name); diff --git a/jeecgboot-vue3/src/router/helper/mainOut.ts b/jeecgboot-vue3/src/router/helper/mainOut.ts index 27b62fc..c4e8005 100644 --- a/jeecgboot-vue3/src/router/helper/mainOut.ts +++ b/jeecgboot-vue3/src/router/helper/mainOut.ts @@ -33,43 +33,75 @@ export const mainOutRoutes: AppRouteModule[] = [ name: 'HomePage', component: () => import('/@/views/demo/main-home/components/homePage/index.vue'), meta: { - title: 'HomePage', + title: '首页', ignoreAuth: true, }, }, { - path: '/main-home/MatchEvaluation', - name: 'MatchEvaluation', - component: () => import('/@/views/demo/main-home/components/matchEvaluation/index.vue'), + path: '/main-home/instrumentSharing', + name: 'InstrumentSharing', + component: () => import('/@/views/demo/main-home/components/instrumentSharing/index.vue'), meta: { - title: 'MatchEvaluation', + title: '仪器共享', + ignoreAuth: true, + }, + }, + { + path: '/main-home/projectDeclaration', + name: 'ProjectDeclaration', + component: () => import('/@/views/demo/main-home/components/projectDeclaration/index.vue'), + meta: { + title: '项目申报', + ignoreAuth: true, + }, + }, + { + path: '/main-home/expertManagement', + name: 'ExpertManagement', + component: () => import('/@/views/demo/main-home/components/expertManagement/index.vue'), + meta: { + title: '专家管理', + ignoreAuth: true, + }, + }, + { + path: '/main-home/newsList', + name: 'NewsList', + component: () => import('/@/views/demo/main-home/components/newsList/index.vue'), + meta: { + title: '新闻列表', + ignoreAuth: true, + }, + }, + { + path: '/main-home/newsInfo', + name: 'NewsIndo', + component: () => import('/@/views/demo/main-home/components/newsInFo/index.vue'), + meta: { + title: '新闻详情', + ignoreAuth: true, + }, + }, + { + path: '/main-home/columnManagement', + name: 'ColumnManagement', + component: () => import('/@/views/demo/main-home/components/columnManagement/index.vue'), + meta: { + title: '栏目管理', + ignoreAuth: true, + }, + }, + { + path: '/main-home/articleManagement', + name: 'ArticleManagement', + component: () => import('/@/views/demo/main-home/components/articleManagement/index.vue'), + meta: { + title: '文章管理', ignoreAuth: true, }, - redirect: '/main-home/MatchEvaluation/MCh', - children: [ - { - path: '/main-home/MatchEvaluation/MCh', - name: 'MCh', - component: () => import('/@/views/demo/main-home/components/matchEvaluation/components/MCh.vue'), - meta: { - title: 'MCh', - ignoreAuth: true, - }, - }, - { - path: '/main-home/MatchEvaluation/LesserCh/:id', - name: 'LesserCh', - component: () => import('/@/views/demo/main-home/components/matchEvaluation/components/LesserCh.vue'), - meta: { - title: 'LesserCh', - ignoreAuth: true, - }, - }, - ] }, - ], - } + }, ]; export const mainOutRouteNames = mainOutRoutes.map((item) => item.name); diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/NewsList/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/NewsList/index.vue new file mode 100644 index 0000000..4ccf750 --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/components/NewsList/index.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/articleManagement/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/articleManagement/index.vue new file mode 100644 index 0000000..1a607ba --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/components/articleManagement/index.vue @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/columnManagement/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/columnManagement/index.vue new file mode 100644 index 0000000..90f879b --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/components/columnManagement/index.vue @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/expertManagement/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/expertManagement/index.vue new file mode 100644 index 0000000..5c03218 --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/components/expertManagement/index.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue index f831fa9..4c3b7de 100644 --- a/jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue +++ b/jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue @@ -1,418 +1,377 @@ - - diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue new file mode 100644 index 0000000..b3f05ad --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/newsInfo/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/newsInfo/index.vue new file mode 100644 index 0000000..c0ae3b3 --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/components/newsInfo/index.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/projectDeclaration/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/projectDeclaration/index.vue new file mode 100644 index 0000000..29bd06d --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/components/projectDeclaration/index.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/demo/main-home/index copy.vue b/jeecgboot-vue3/src/views/demo/main-home/index copy.vue new file mode 100644 index 0000000..ae22df6 --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/index copy.vue @@ -0,0 +1,445 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/demo/main-home/index.vue b/jeecgboot-vue3/src/views/demo/main-home/index.vue index 595852f..d44baaa 100644 --- a/jeecgboot-vue3/src/views/demo/main-home/index.vue +++ b/jeecgboot-vue3/src/views/demo/main-home/index.vue @@ -1,151 +1,107 @@ - diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue index 9c224f1..9d569c4 100644 --- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue @@ -42,10 +42,22 @@ +
+ +