From 2e79cd145680c570eeb3a08718004db74eeabf4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E9=BE=99=E5=B3=B0?= <1211012311@qq.com> Date: Fri, 12 Jul 2024 10:07:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RMS/RMS_front/vue_RMS_front/package-lock.json | 103 +++++++ RMS/RMS_front/vue_RMS_front/package.json | 3 + RMS/RMS_front/vue_RMS_front/src/main.js | 2 + .../vue_RMS_front/src/router/index.js | 19 +- .../vue_RMS_front/src/views/land.vue | 173 ++++------- .../vue_RMS_front/src/views/system/system.vue | 2 +- .../src/views/system/userSys.vue | 278 +++++++++++------- .../com/demo/controller/UserController.java | 7 +- .../main/java/com/demo/mapper/UserMapper.java | 2 + RMS/src/main/java/com/demo/pojo/PO/User.java | 6 + RMS/src/main/resources/application.yml | 2 +- 11 files changed, 375 insertions(+), 222 deletions(-) diff --git a/RMS/RMS_front/vue_RMS_front/package-lock.json b/RMS/RMS_front/vue_RMS_front/package-lock.json index 4162da8..f3ae116 100644 --- a/RMS/RMS_front/vue_RMS_front/package-lock.json +++ b/RMS/RMS_front/vue_RMS_front/package-lock.json @@ -9,8 +9,11 @@ "version": "0.0.0", "dependencies": { "@element-plus/icons-vue": "^2.3.1", + "axios": "^1.7.2", "cors": "^2.8.5", "element-plus": "^2.7.6", + "koa-cors": "^0.0.16", + "koa-cors2": "^0.0.1", "unplugin-auto-import": "^0.16.1", "unplugin-vue-components": "^0.20.1", "vue": "^3.4.29", @@ -961,6 +964,21 @@ "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz", "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.7.2", + "resolved": "https://registry.npmmirror.com/axios/-/axios-1.7.2.tgz", + "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1019,6 +1037,17 @@ "fsevents": "~2.3.2" } }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/confbox": { "version": "0.1.7", "resolved": "https://registry.npmmirror.com/confbox/-/confbox-0.1.7.tgz", @@ -1062,6 +1091,14 @@ } } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/element-plus": { "version": "2.7.6", "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.7.6.tgz", @@ -1511,6 +1548,38 @@ "node": ">=8" } }, + "node_modules/follow-redirects": { + "version": "1.15.6", + "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz", @@ -1611,6 +1680,16 @@ "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-9.0.0.tgz", "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==" }, + "node_modules/koa-cors": { + "version": "0.0.16", + "resolved": "https://registry.npmmirror.com/koa-cors/-/koa-cors-0.0.16.tgz", + "integrity": "sha512-s15knPxe3AJBi2I/ZMPL0pSqU+PLYLO6k5tI0AqClkzavowvocPlSdFUwaHNqtjHMhsGmiq2tiX/25iILJx9YA==" + }, + "node_modules/koa-cors2": { + "version": "0.0.1", + "resolved": "https://registry.npmmirror.com/koa-cors2/-/koa-cors2-0.0.1.tgz", + "integrity": "sha512-Qp2fZ8ZllfMv2cUPsPC/AU/91uHcCvDg/VD6u1mi6Uskqp9EKhvShB1BiZ0r5W2m9d92fbyTQdGBlxhvQolGeQ==" + }, "node_modules/local-pkg": { "version": "0.4.3", "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.3.tgz", @@ -1675,6 +1754,25 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz", @@ -1806,6 +1904,11 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", diff --git a/RMS/RMS_front/vue_RMS_front/package.json b/RMS/RMS_front/vue_RMS_front/package.json index eb30183..d255330 100644 --- a/RMS/RMS_front/vue_RMS_front/package.json +++ b/RMS/RMS_front/vue_RMS_front/package.json @@ -10,8 +10,11 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.3.1", + "axios": "^1.7.2", "cors": "^2.8.5", "element-plus": "^2.7.6", + "koa-cors": "^0.0.16", + "koa-cors2": "^0.0.1", "unplugin-auto-import": "^0.16.1", "unplugin-vue-components": "^0.20.1", "vue": "^3.4.29", diff --git a/RMS/RMS_front/vue_RMS_front/src/main.js b/RMS/RMS_front/vue_RMS_front/src/main.js index 2a9fe23..446df9f 100644 --- a/RMS/RMS_front/vue_RMS_front/src/main.js +++ b/RMS/RMS_front/vue_RMS_front/src/main.js @@ -1,5 +1,6 @@ import elementPlus from "element-plus"; import { createApp } from 'vue' +import cors from "koa-cors2"; import "element-plus/dist/index.css"; import * as Icons from "@element-plus/icons-vue" import App from './App.vue' @@ -11,6 +12,7 @@ const app = createApp(App) Object.keys(Icons).forEach(key =>{ app.component(key,Icons[key]) }) +// app.use(cors()) app.use(router) app.use(elementPlus) app.mount('#app') diff --git a/RMS/RMS_front/vue_RMS_front/src/router/index.js b/RMS/RMS_front/vue_RMS_front/src/router/index.js index f10f411..a0c9a29 100644 --- a/RMS/RMS_front/vue_RMS_front/src/router/index.js +++ b/RMS/RMS_front/vue_RMS_front/src/router/index.js @@ -15,11 +15,23 @@ const router = createRouter({ { path:'/', name:'/', + component:Land, + redirect:'/log', + children:[ + { + path:'/log', + component:Land + } + ] + }, + { + path:"/index", + name:"/index", component:System, - redirect:'/index', + redirect:'/system', children:[ { - path:'/index', + path:'/system', component:Index }, { @@ -42,9 +54,8 @@ const router = createRouter({ path:'/system/userSys', component:userSys } - ] - }, + } ] }) diff --git a/RMS/RMS_front/vue_RMS_front/src/views/land.vue b/RMS/RMS_front/vue_RMS_front/src/views/land.vue index f16a47c..d55d463 100644 --- a/RMS/RMS_front/vue_RMS_front/src/views/land.vue +++ b/RMS/RMS_front/vue_RMS_front/src/views/land.vue @@ -1,133 +1,74 @@ - - \ No newline at end of file diff --git a/RMS/RMS_front/vue_RMS_front/src/views/system/system.vue b/RMS/RMS_front/vue_RMS_front/src/views/system/system.vue index 8d06533..647e9a3 100644 --- a/RMS/RMS_front/vue_RMS_front/src/views/system/system.vue +++ b/RMS/RMS_front/vue_RMS_front/src/views/system/system.vue @@ -6,7 +6,7 @@ import { RouterView } from 'vue-router'; - +
Default colors
diff --git a/RMS/RMS_front/vue_RMS_front/src/views/system/userSys.vue b/RMS/RMS_front/vue_RMS_front/src/views/system/userSys.vue index ab0f5d4..6af8ef9 100644 --- a/RMS/RMS_front/vue_RMS_front/src/views/system/userSys.vue +++ b/RMS/RMS_front/vue_RMS_front/src/views/system/userSys.vue @@ -1,67 +1,88 @@