From f369e99292745a6a80363cf4a8841115eedc2ac6 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Sat, 29 Jun 2024 17:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E5=AE=8C=E5=96=84=E5=85=B6=E4=BB=96=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=B8=8E=E7=95=8C=E9=9D=A2=E5=B0=B1=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 +- src/router/authentication.js | 5 +- src/router/index.js | 1 - src/router/organizationManagement.js | 6 +- src/services/authenticationService.js | 19 +- src/services/organizationService.js | 14 ++ src/views/authentication_login.vue | 41 ++-- src/views/authentication_register.vue | 24 ++- .../Organization_main.vue | 202 ++++++++++++++++++ 9 files changed, 261 insertions(+), 54 deletions(-) create mode 100644 src/views/organization-management/Organization_main.vue diff --git a/src/App.vue b/src/App.vue index bc687ea..3095b3e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,8 +5,7 @@ import authentication from "./views/authentication_login.vue"; diff --git a/src/router/authentication.js b/src/router/authentication.js index 5bf05ef..1ef2554 100644 --- a/src/router/authentication.js +++ b/src/router/authentication.js @@ -1,7 +1,8 @@ import authentication from '../views/authentication_login.vue' - +import register from '../views/authentication_register.vue' export default [ + { path: '/', component: authentication }, { path: '/login', component: authentication }, - // { path: '/register', component: Register }, + { path: '/register', component: register }, // { path: '/profile', component: Profile } ] diff --git a/src/router/index.js b/src/router/index.js index d6483bb..da53169 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,6 @@ import userManagementRoutes from './userManagement' import authentication from "../views/authentication_login.vue"; const routes = [ - { path: '/', component: HelloWorld }, ...authenticationRoutes, ...courseManagementRoutes, ...meetingManagementRoutes, diff --git a/src/router/organizationManagement.js b/src/router/organizationManagement.js index 78fb824..56bfbb5 100644 --- a/src/router/organizationManagement.js +++ b/src/router/organizationManagement.js @@ -1,9 +1,7 @@ -// import OrganizationList from '../views/organization-management/OrganizationList.vue' -// import OrganizationDetail from '../views/organization-management/OrganizationDetail.vue' -// import OrganizationEdit from '../views/organization-management/OrganizationEdit.vue' +import Organization_main from '../views/organization-management/Organization_main.vue' export default [ - // { path: '/organizations', component: OrganizationList }, + { path: '/organizations', component: Organization_main}, // { path: '/organizations/:id', component: OrganizationDetail }, // { path: '/organizations/:id/edit', component: OrganizationEdit } ] diff --git a/src/services/authenticationService.js b/src/services/authenticationService.js index c1025e9..9c190ac 100644 --- a/src/services/authenticationService.js +++ b/src/services/authenticationService.js @@ -1,29 +1,22 @@ import axios from "axios"; export default { - login(username, password, apiUrl="http://localhost:8080"){ - const url = `${apiUrl}/users/checkLogin` + login(account, password){ + const url = `http://localhost:8080/users/checkLogin` const data = { - username: username, + account: account, password: password }; return axios.post(url, data) .then(response => { - alert(">login方法中<"); - alert(response.data.username); + alert(response.data.account); return response.data; }); }, register(user){ - const url = `${apiUrl}/users/checkLogin` - const data = { - username: username, - password: password - }; - return axios.post(url, data) + const url = `http://localhost:8080/users/checkRegister` + return axios.post(url, user) .then(response => { - alert(">login方法中<"); - alert(response.data.username); return response.data; }); //跳转逻辑 diff --git a/src/services/organizationService.js b/src/services/organizationService.js index e69de29..0984050 100644 --- a/src/services/organizationService.js +++ b/src/services/organizationService.js @@ -0,0 +1,14 @@ +import axios from "axios"; + +export default { + getAllOrganizations() { + return axios.get('http://localhost:8080/organizations/listAll').then(response => { + return response.data; + }); + }, + addOrganization(organization) { + return axios.post('http://localhost:8080/organizations/addOrganization', organization).then(response => { + return response.data; + }); + } +} \ No newline at end of file diff --git a/src/views/authentication_login.vue b/src/views/authentication_login.vue index 3c51846..6c2d6dc 100644 --- a/src/views/authentication_login.vue +++ b/src/views/authentication_login.vue @@ -1,39 +1,32 @@ diff --git a/src/views/authentication_register.vue b/src/views/authentication_register.vue index 5617421..9c83d33 100644 --- a/src/views/authentication_register.vue +++ b/src/views/authentication_register.vue @@ -1,7 +1,9 @@ + + \ No newline at end of file diff --git a/src/views/organization-management/Organization_main.vue b/src/views/organization-management/Organization_main.vue new file mode 100644 index 0000000..75a880b --- /dev/null +++ b/src/views/organization-management/Organization_main.vue @@ -0,0 +1,202 @@ + + + + +