From b9c8842a85be293796feb0f5ca5fcb084ed797a1 Mon Sep 17 00:00:00 2001
From: MiLla <18826902282@163.com>
Date: Mon, 24 Jun 2024 17:15:21 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=B0=9D?=
 =?UTF-8?q?=E8=AF=95=E5=B0=86=E5=90=84=E4=B8=AAurl=E5=88=86=E5=BC=80?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                     |  2 +-
 package.json                          |  2 +-
 src/App.vue                           | 53 ++++++++++++++++-----------
 src/components/HelloWorld.vue         |  3 +-
 src/components/authentication.vue     | 13 +++++++
 src/router/index.js                   |  4 +-
 src/services/authenticationService.js |  5 +++
 7 files changed, 56 insertions(+), 26 deletions(-)
 create mode 100644 src/components/authentication.vue

diff --git a/package-lock.json b/package-lock.json
index e62bc4e..d512723 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1285,7 +1285,7 @@
     },
     "node_modules/vue-router": {
       "version": "4.4.0",
-      "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.0.tgz",
       "integrity": "sha512-HB+t2p611aIZraV2aPSRNXf0Z/oLZFrlygJm+sZbdJaW6lcFqEDQwnzUBXn+DApw+/QzDU/I9TeWx9izEjTmsA==",
       "dependencies": {
         "@vue/devtools-api": "^6.5.1"
diff --git a/package.json b/package.json
index e49cf53..7543975 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "axios": "^1.7.2",
     "element-plus": "^2.7.6",
     "vue": "^3.4.29",
     "vue-router": "^4.4.0",
-    "axios": "^1.7.2",
     "vuex": "^4.1.0"
   },
   "devDependencies": {
diff --git a/src/App.vue b/src/App.vue
index 341dbf0..d839ad5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,30 +1,39 @@
 <script setup>
 import HelloWorld from './components/HelloWorld.vue'
+import authentication from "./components/authentication.vue";
 </script>
 
 <template>
-  <div>
-    <a href="https://vitejs.dev" target="_blank">
-      <img src="/vite.svg" class="logo" alt="Vite logo" />
-    </a>
-    <a href="https://vuejs.org/" target="_blank">
-      <img src="./assets/vue.svg" class="logo vue" alt="Vue logo" />
-    </a>
+  <div id="app">
+    <router-view v-if="isHelloRoute"><HelloWorld/></router-view>
+    <router-view v-if="isAuthenRoute"><authentication/></router-view>
   </div>
-  <HelloWorld msg="Vite + Vue" />
 </template>
 
-<style scoped>
-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
-}
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
-}
-.logo.vue:hover {
-  filter: drop-shadow(0 0 2em #42b883aa);
-}
-</style>
+<script>
+export default {
+  name: 'App',
+  computed: {
+    isHelloRoute() {
+      return this.$route.path === '/about'; // 根据实际的路由路径进行判断
+    },
+    isAuthenRoute() {
+      return this.$route.path === '/login'; // 根据实际的路由路径进行判断
+    }
+  }
+};
+</script>
+<!--<style scoped>-->
+<!--.logo {-->
+<!--  height: 6em;-->
+<!--  padding: 1.5em;-->
+<!--  will-change: filter;-->
+<!--  transition: filter 300ms;-->
+<!--}-->
+<!--.logo:hover {-->
+<!--  filter: drop-shadow(0 0 2em #646cffaa);-->
+<!--}-->
+<!--.logo.vue:hover {-->
+<!--  filter: drop-shadow(0 0 2em #42b883aa);-->
+<!--}-->
+<!--</style>-->
diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
index afd5006..6b08007 100644
--- a/src/components/HelloWorld.vue
+++ b/src/components/HelloWorld.vue
@@ -13,8 +13,9 @@ const count = ref(0)
 <template>
   <h1>{{ msg }}</h1>
 
+
   <div class="card">
-    <el-button type="success" @click="count++">count is {{ count }}</el-button>
+    <el-button type="danger" @click="count++">count is {{ count }}</el-button>
     <p>
       Edit
       <code>components/HelloWorld.vue</code> to test HMR
diff --git a/src/components/authentication.vue b/src/components/authentication.vue
new file mode 100644
index 0000000..9cc18ce
--- /dev/null
+++ b/src/components/authentication.vue
@@ -0,0 +1,13 @@
+<script setup>
+
+</script>
+
+<template>
+  <h1>登录</h1>
+  <el-input >pls enter the username</el-input>
+  <el-input>pls enter the username</el-input>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 7f56f2f..6bbaefe 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,9 +6,11 @@ import meetingManagementRoutes from './meetingManagement'
 import newsManagementRoutes from './newsManagement'
 import organizationManagementRoutes from './organizationManagement'
 import userManagementRoutes from './userManagement'
+import authentication from "../components/authentication.vue";
 
 const routes = [
-    { path: '/', component: HelloWorld },
+    { path: '/about', component: HelloWorld },
+    { path: '/login', component: authentication},
     ...authenticationRoutes,
     ...courseManagementRoutes,
     ...meetingManagementRoutes,
diff --git a/src/services/authenticationService.js b/src/services/authenticationService.js
index e69de29..d7ef9ee 100644
--- a/src/services/authenticationService.js
+++ b/src/services/authenticationService.js
@@ -0,0 +1,5 @@
+import { createApp } from 'vue';
+import App from '../App.vue';
+import router from '../router';
+
+createApp(App).use(router).mount('#app');

From d5611562e6e430e304d102ea6606026deb55ba44 Mon Sep 17 00:00:00 2001
From: MiLla <18826902282@163.com>
Date: Mon, 24 Jun 2024 19:19:51 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9No2.=E5=B0=9D=E8=AF=95?=
 =?UTF-8?q?=E5=B0=86routes=E4=B8=AD=E7=9A=84authenticationRoutes=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=EF=BC=8C=E6=B2=A1=E6=9C=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86authentication.vue=E4=BB=8Ecomponents?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E6=96=B0=E5=BB=BA=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9views=E4=B8=AD=EF=BC=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86authentication.js=E4=B8=AD=E7=9A=84l?=
 =?UTF-8?q?ogin=E6=96=B9=E6=B3=95=EF=BC=8C=E4=B8=8D=E7=9F=A5=E4=B8=BA?=
 =?UTF-8?q?=E4=BD=95=E5=88=A0=E9=99=A4#{apiUrl}'/checkLogin'=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84${apiUrl}=E5=B0=B1=E8=83=BD=E7=94=A8=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=88=A0=E5=B0=B1=E4=B8=8D=E8=A1=8C=EF=BC=8C=E7=95=99=E5=BE=85?=
 =?UTF-8?q?=E4=B8=8B=E6=AC=A1=E5=AD=A6=E4=B9=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                           |  2 +-
 src/components/authentication.vue     | 13 ----------
 src/router/authentication.js          |  7 ++----
 src/router/index.js                   |  5 ++--
 src/services/authenticationService.js | 15 ++++++++---
 src/views/authentication.vue          | 36 +++++++++++++++++++++++++++
 6 files changed, 52 insertions(+), 26 deletions(-)
 delete mode 100644 src/components/authentication.vue
 create mode 100644 src/views/authentication.vue

diff --git a/src/App.vue b/src/App.vue
index d839ad5..32af3d5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <script setup>
 import HelloWorld from './components/HelloWorld.vue'
-import authentication from "./components/authentication.vue";
+import authentication from "./views/authentication.vue";
 </script>
 
 <template>
diff --git a/src/components/authentication.vue b/src/components/authentication.vue
deleted file mode 100644
index 9cc18ce..0000000
--- a/src/components/authentication.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<script setup>
-
-</script>
-
-<template>
-  <h1>登录</h1>
-  <el-input >pls enter the username</el-input>
-  <el-input>pls enter the username</el-input>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/router/authentication.js b/src/router/authentication.js
index 7c0f2e7..5fcc93d 100644
--- a/src/router/authentication.js
+++ b/src/router/authentication.js
@@ -1,10 +1,7 @@
-// ！！！这是一个示例，请根据实际情况修改！！！
-// import Login from '../views/authentication/Login.vue'
-// import Register from '../views/authentication/Register.vue'
-// import Profile from '../views/authentication/Profile.vue'
+import authentication from '../views/authentication.vue'
 
 export default [
-    // { path: '/login', component: Login },
+    { path: '/login', component: authentication },
     // { path: '/register', component: Register },
     // { path: '/profile', component: Profile }
 ]
diff --git a/src/router/index.js b/src/router/index.js
index 6bbaefe..e8d32ad 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,11 +6,10 @@ import meetingManagementRoutes from './meetingManagement'
 import newsManagementRoutes from './newsManagement'
 import organizationManagementRoutes from './organizationManagement'
 import userManagementRoutes from './userManagement'
-import authentication from "../components/authentication.vue";
+import authentication from "../views/authentication.vue";
 
 const routes = [
-    { path: '/about', component: HelloWorld },
-    { path: '/login', component: authentication},
+    { path: '/', component: HelloWorld },
     ...authenticationRoutes,
     ...courseManagementRoutes,
     ...meetingManagementRoutes,
diff --git a/src/services/authenticationService.js b/src/services/authenticationService.js
index d7ef9ee..58f78bb 100644
--- a/src/services/authenticationService.js
+++ b/src/services/authenticationService.js
@@ -1,5 +1,12 @@
-import { createApp } from 'vue';
-import App from '../App.vue';
-import router from '../router';
+import axios from "axios";
 
-createApp(App).use(router).mount('#app');
+export default {
+    login(username, password, apiUrl="http://localhost:8080"){
+        return axios.get(`/checkLogin`, {username:username, password:password})
+            .then(response => {
+                alert("hahaha");
+                // 处理登录成功的逻辑
+                return response.data;
+            });
+    }
+}
\ No newline at end of file
diff --git a/src/views/authentication.vue b/src/views/authentication.vue
new file mode 100644
index 0000000..2c3a3b1
--- /dev/null
+++ b/src/views/authentication.vue
@@ -0,0 +1,36 @@
+<script setup>
+
+</script>
+
+<template>
+  <h1>登录</h1>
+  <el-input v-model="username" placeholder="pls enter the username"></el-input>
+  <el-input v-model="password" placeholder="pls enter the password"></el-input>
+  <el-button type="success" @click="handleLogin">LOGIN</el-button>
+</template>
+
+<script>
+   import authenticationService from "../services/authenticationService.js";
+
+   export default {
+     name: 'Authentication',
+     data(){
+       return {
+         username: '',
+         password: '',
+       };
+     },methods:{
+       handleLogin(){
+         authenticationService.login(this.username,this.password).then(res=>{
+            alert(res);
+         });
+       }
+     }
+   }
+
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

From 14522088223990dd99030ef8379d4100de5c324e Mon Sep 17 00:00:00 2001
From: MiLla <18826902282@163.com>
Date: Tue, 25 Jun 2024 14:54:39 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=BF=98=E6=98=AF=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=B8=8D=E8=BF=87=E7=8E=B0=E5=9C=A8=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E6=94=B6=E5=88=B0?=
 =?UTF-8?q?username=E5=92=8Cpassword?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/authenticationService.js | 14 +++++++++++---
 src/views/authentication.vue          |  8 +++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/services/authenticationService.js b/src/services/authenticationService.js
index 58f78bb..36a7db4 100644
--- a/src/services/authenticationService.js
+++ b/src/services/authenticationService.js
@@ -2,11 +2,19 @@ import axios from "axios";
 
 export default {
     login(username, password, apiUrl="http://localhost:8080"){
-        return axios.get(`/checkLogin`, {username:username, password:password})
+        const url = `${apiUrl}/users/checkLogin`
+        const data = {
+            username: username,
+            password: password
+        };
+        return axios.post(url, data)
             .then(response => {
-                alert("hahaha");
-                // 处理登录成功的逻辑
+                alert(">login方法中<");
+                alert(response.data);
                 return response.data;
             });
+    },
+    register(){
+        //跳转逻辑
     }
 }
\ No newline at end of file
diff --git a/src/views/authentication.vue b/src/views/authentication.vue
index 2c3a3b1..726e27f 100644
--- a/src/views/authentication.vue
+++ b/src/views/authentication.vue
@@ -7,6 +7,7 @@
   <el-input v-model="username" placeholder="pls enter the username"></el-input>
   <el-input v-model="password" placeholder="pls enter the password"></el-input>
   <el-button type="success" @click="handleLogin">LOGIN</el-button>
+  <el-button type="success" @click="handleRegister">REGISTER</el-button>
 </template>
 
 <script>
@@ -22,7 +23,12 @@
      },methods:{
        handleLogin(){
          authenticationService.login(this.username,this.password).then(res=>{
-            alert(res);
+            alert("login方法调用完毕");
+            alert(res.data);
+         });
+       },handleRegister(){
+         authenticationService.register(this.username,this.password).then(res=>{
+           alert(res);
          });
        }
      }

From b613331464d0ecc10dd22c30d8974273df577178 Mon Sep 17 00:00:00 2001
From: MiLla <18826902282@163.com>
Date: Tue, 25 Jun 2024 16:22:01 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B2=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BA=86=EF=BC=8C=E6=AD=A3=E5=9C=A8=E5=86=99=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=EF=BC=8C=E4=BD=86=E4=BC=BC=E4=B9=8E=E8=A6=81=E7=94=A8?=
 =?UTF-8?q?ref=E4=B9=8B=E7=B1=BB=E7=9A=84=E4=B8=9C=E8=A5=BF=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E7=89=88=E6=9C=AC=E6=98=AF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E4=B9=8B=E5=90=8E=E5=B0=9D=E8=AF=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  2 +-
 src/router/authentication.js                  |  2 +-
 src/router/index.js                           |  2 +-
 src/services/authenticationService.js         | 15 +++++-
 ...ntication.vue => authentication_login.vue} |  5 +-
 src/views/authentication_register.vue         | 51 +++++++++++++++++++
 6 files changed, 70 insertions(+), 7 deletions(-)
 rename src/views/{authentication.vue => authentication_login.vue} (92%)
 create mode 100644 src/views/authentication_register.vue

diff --git a/src/App.vue b/src/App.vue
index 32af3d5..bc687ea 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <script setup>
 import HelloWorld from './components/HelloWorld.vue'
-import authentication from "./views/authentication.vue";
+import authentication from "./views/authentication_login.vue";
 </script>
 
 <template>
diff --git a/src/router/authentication.js b/src/router/authentication.js
index 5fcc93d..5bf05ef 100644
--- a/src/router/authentication.js
+++ b/src/router/authentication.js
@@ -1,4 +1,4 @@
-import authentication from '../views/authentication.vue'
+import authentication from '../views/authentication_login.vue'
 
 export default [
     { path: '/login', component: authentication },
diff --git a/src/router/index.js b/src/router/index.js
index e8d32ad..d6483bb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,7 +6,7 @@ import meetingManagementRoutes from './meetingManagement'
 import newsManagementRoutes from './newsManagement'
 import organizationManagementRoutes from './organizationManagement'
 import userManagementRoutes from './userManagement'
-import authentication from "../views/authentication.vue";
+import authentication from "../views/authentication_login.vue";
 
 const routes = [
     { path: '/', component: HelloWorld },
diff --git a/src/services/authenticationService.js b/src/services/authenticationService.js
index 36a7db4..c1025e9 100644
--- a/src/services/authenticationService.js
+++ b/src/services/authenticationService.js
@@ -10,11 +10,22 @@ export default {
         return axios.post(url, data)
             .then(response => {
                 alert(">login方法中<");
-                alert(response.data);
+                alert(response.data.username);
                 return response.data;
             });
     },
-    register(){
+    register(user){
+        const url = `${apiUrl}/users/checkLogin`
+        const data = {
+            username: username,
+            password: password
+        };
+        return axios.post(url, data)
+            .then(response => {
+                alert(">login方法中<");
+                alert(response.data.username);
+                return response.data;
+            });
         //跳转逻辑
     }
 }
\ No newline at end of file
diff --git a/src/views/authentication.vue b/src/views/authentication_login.vue
similarity index 92%
rename from src/views/authentication.vue
rename to src/views/authentication_login.vue
index 726e27f..3c51846 100644
--- a/src/views/authentication.vue
+++ b/src/views/authentication_login.vue
@@ -23,8 +23,9 @@
      },methods:{
        handleLogin(){
          authenticationService.login(this.username,this.password).then(res=>{
-            alert("login方法调用完毕");
-            alert(res.data);
+           alert(res.username);
+           alert("login方法调用完毕");
+
          });
        },handleRegister(){
          authenticationService.register(this.username,this.password).then(res=>{
diff --git a/src/views/authentication_register.vue b/src/views/authentication_register.vue
new file mode 100644
index 0000000..5617421
--- /dev/null
+++ b/src/views/authentication_register.vue
@@ -0,0 +1,51 @@
+<script setup>
+import authenticationService from "../services/authenticationService.js";
+
+const username = ref('');
+const password = ref('');
+const fullname = ref('');
+const organization = ref('');
+const email = ref('');
+const gender = ref('');
+const phone = ref('');
+const pname = ref('');
+
+const handleBack = () => {
+  location.href = "/login";
+};
+
+const handleRegister = () => {
+  const user = {
+    username: username.value,
+    password: password.value,
+    fullname: fullname.value,
+    organization: organization.value,
+    email: email.value,
+    gender: gender.value,
+    phone: phone.value,
+    pname: pname.value,
+  };
+
+  authenticationService.register(user).then(res => {
+    alert(res);
+  });
+};
+</script>
+
+<template>
+  <el-input v-model="username" placeholder="pls enter the username"></el-input>
+  <el-input v-model="password" placeholder="pls enter the password"></el-input>
+  <el-input v-model="fullname" placeholder="pls enter the fullname"></el-input>
+  <el-input v-model="organization" placeholder="pls enter the organization"></el-input>
+  <el-input v-model="email" placeholder="pls enter the email"></el-input>
+  <el-input v-model="gender" placeholder="pls enter the gender"></el-input>
+  <el-input v-model="phone" placeholder="pls enter the phone"></el-input>
+  <el-input v-model="pname" placeholder="pls enter the pname"></el-input>
+  <el-button type="success" @click="handleBack">BACK</el-button>
+  <el-button type="success" @click="handleRegister">REGISTER</el-button>
+</template>
+
+
+<style scoped>
+
+</style>
\ No newline at end of file

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 5/7] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E5=AE=8C=E5=96=84=E5=85=B6=E4=BB=96=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=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";
 
 <template>
   <div id="app">
-    <router-view v-if="isHelloRoute"><HelloWorld/></router-view>
-    <router-view v-if="isAuthenRoute"><authentication/></router-view>
+    <router-view ></router-view>
   </div>
 </template>
 
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 @@
 <script setup>
+import authenticationService from "../services/authenticationService.js";
+import {ref} from "vue";
+import {useRouter} from "vue-router";
+const account = ref('');
+const password = ref('');
 
+const router = useRouter();
+
+const handleLogin = () => {
+  authenticationService.login(account.value,password.value).then(res=>{
+  });
+};
+
+const handleRegister = () => {
+    router.push('/register');
+};
 </script>
 
 <template>
-  <h1>登录</h1>
-  <el-input v-model="username" placeholder="pls enter the username"></el-input>
+  <el-text size="large">登录</el-text>
+  <el-input v-model="account" placeholder="pls enter the account"></el-input>
   <el-input v-model="password" placeholder="pls enter the password"></el-input>
   <el-button type="success" @click="handleLogin">LOGIN</el-button>
   <el-button type="success" @click="handleRegister">REGISTER</el-button>
 </template>
 
 <script>
-   import authenticationService from "../services/authenticationService.js";
 
-   export default {
-     name: 'Authentication',
-     data(){
-       return {
-         username: '',
-         password: '',
-       };
-     },methods:{
-       handleLogin(){
-         authenticationService.login(this.username,this.password).then(res=>{
-           alert(res.username);
-           alert("login方法调用完毕");
-
-         });
-       },handleRegister(){
-         authenticationService.register(this.username,this.password).then(res=>{
-           alert(res);
-         });
-       }
-     }
-   }
 
 
 </script>
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 @@
 <script setup>
 import authenticationService from "../services/authenticationService.js";
+import {computed, ref} from "vue";
+import {useRouter} from "vue-router";
 
-const username = ref('');
+const account = ref('');
 const password = ref('');
 const fullname = ref('');
 const organization = ref('');
@@ -9,21 +11,25 @@ const email = ref('');
 const gender = ref('');
 const phone = ref('');
 const pname = ref('');
+//
+// const topText = computed(() => {
+//   return `Welcome, ${username.value || 'Guest'}!`;
+// });
+const router = useRouter();
 
 const handleBack = () => {
-  location.href = "/login";
+  router.push('/login');
 };
 
 const handleRegister = () => {
   const user = {
-    username: username.value,
+    account: account.value,
     password: password.value,
-    fullname: fullname.value,
+    name: fullname.value,
     organization: organization.value,
     email: email.value,
     gender: gender.value,
     phone: phone.value,
-    pname: pname.value,
   };
 
   authenticationService.register(user).then(res => {
@@ -32,20 +38,22 @@ const handleRegister = () => {
 };
 </script>
 
+
 <template>
-  <el-input v-model="username" placeholder="pls enter the username"></el-input>
+<!--  <el-text>{{ topText }}</el-text>-->
+  <el-input v-model="account" placeholder="pls enter the account"></el-input>
   <el-input v-model="password" placeholder="pls enter the password"></el-input>
-  <el-input v-model="fullname" placeholder="pls enter the fullname"></el-input>
+  <el-input v-model="fullname" placeholder="pls enter the name"></el-input>
   <el-input v-model="organization" placeholder="pls enter the organization"></el-input>
   <el-input v-model="email" placeholder="pls enter the email"></el-input>
   <el-input v-model="gender" placeholder="pls enter the gender"></el-input>
   <el-input v-model="phone" placeholder="pls enter the phone"></el-input>
-  <el-input v-model="pname" placeholder="pls enter the pname"></el-input>
   <el-button type="success" @click="handleBack">BACK</el-button>
   <el-button type="success" @click="handleRegister">REGISTER</el-button>
 </template>
 
 
+
 <style scoped>
 
 </style>
\ 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 @@
+<template>
+  <el-text>{{ showDialog }}</el-text>
+  <el-button type="primary" @click="showDialog = true">添加部门</el-button>
+<!--  <el-table :data="tableData"-->
+<!--            style="width: 100%; margin-bottom: 20px"-->
+<!--            height="500px"-->
+<!--            row-key="organizationId"-->
+<!--            border-->
+<!--            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"-->
+<!--            default-expand-all>-->
+    <el-table
+      :data="tableData"
+      style="width: 100%; margin-bottom: 20px"
+      row-key="organizationId"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      border
+      default-expand-all
+    >
+    <el-table-column prop="organizationId" label="部门ID" width="180" />
+    <el-table-column prop="parentOrganization.organizationName" label="上级部门" width="180">
+      <template #default="{ row }">
+        {{ row.parentOrganization ? row.parentOrganization.organizationName : '无' }}
+      </template>
+    </el-table-column>
+    <el-table-column prop="organizationName" label="部门名称" width="180" />
+    <el-table-column prop="leader" label="负责人" width="180" />
+    <el-table-column prop="contactPhone" label="负责人联系电话" width="180" />
+    <el-table-column prop="email" label="负责人邮箱" width="180" />
+    <el-table-column prop="organizationStatus" label="部门状态" width="180">
+      <template #default="{ row }">
+        <span v-if="row.organizationStatus">
+           <el-text type="success">启用</el-text>
+        </span>
+        <span v-else>
+          <el-text type="danger">禁用</el-text>
+        </span>
+      </template>
+    </el-table-column>
+  </el-table>
+
+<!--  添加表单-->
+  <el-dialog v-model="showDialog" title="填写信息" width="80%">
+    <el-form :model="dialogForm">
+      <el-form-item label="上级部门" :label-width="formLabelWidth">
+        <el-select v-model="dialogForm.parentOrganization">
+          <el-option
+              v-for="item in originTableData"
+              :key="item.organizationId"
+              :label="item.organizationName"
+              :value="item.organizationId"
+          >
+            {{item.organizationName}}
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="部门名称" :label-width="formLabelWidth">
+        <el-input v-model="dialogForm.organizationName"></el-input>
+      </el-form-item>
+      <el-form-item label="显示排列" :label-width="formLabelWidth">
+        <el-input v-model="dialogForm.displayOrder"></el-input>
+      </el-form-item>
+      <el-form-item label="负责人" :label-width="formLabelWidth">
+        <el-input v-model="dialogForm.leader"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" :label-width="formLabelWidth">
+        <el-input v-model="dialogForm.contactPhone"></el-input>
+      </el-form-item>
+      <el-form-item label="邮箱" :label-width="formLabelWidth">
+        <el-input v-model="dialogForm.email"></el-input>
+      </el-form-item>
+      <el-form-item label="部门状态" :label-width="formLabelWidth">
+        <el-switch v-model="dialogForm.organizationStatus" active-value="true" active-text="启用" inactive-value="false" inactive-text="禁用"></el-switch>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="showDialog = false">取消</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
+      </span>
+  </el-dialog>
+</template>
+
+<script lang="ts">
+import { ref, onMounted, defineComponent } from 'vue';
+import organizationService from '../../services/organizationService';
+
+
+interface Organization {
+  organizationId: number;
+  parentOrganization: Organization | null;
+  organizationName: string;
+  leader: string;
+  contactPhone: string;
+  email: string;
+  displayOrder: number;
+  organizationStatus: boolean;
+  children?: Organization[]; // 子组织数组
+  hasChildren: boolean; // 是否有子组织
+}
+
+export default defineComponent({
+  setup() {
+
+    const showDialog = ref(false);
+    const formLabelWidth = ref('120px');
+
+    const dialogForm = ref(
+        {
+          parentOrganization: '',
+          organizationName: '',
+          displayOrder: 0,
+          leader: '',
+          contactPhone: '',
+          email: '',
+          organizationStatus: true,
+        }
+    );
+
+    const originTableData = ref<Organization[]>([]);
+    const tableData = ref<Organization[]>([]);
+
+    const fetchData = async () => {
+      try {
+        const data = await organizationService.getAllOrganizations(); // 假设此函数可以获取后端数据
+        console.log('获取到的部门信息', data);
+        originTableData.value = data;
+        console.log(originTableData.value)
+        // 转换数据为树形结构
+        const treeData = buildTree(data); // 假设有一个函数 buildTree 负责构建树形结构
+        console.log('树形结构数据', treeData);
+        tableData.value = treeData;
+      } catch (error) {
+        console.error('Error fetching organization:', error);
+      }
+    };
+
+    const buildTree = (flatData: Organization[]): Organization[] => {
+      const map: Record<number, Organization> = {};
+      const roots: Organization[] = [];
+
+      flatData.forEach(org => {
+        map[org.organizationId] = org;
+        org.children = [];
+      });
+
+      flatData.forEach(org => {
+        if (org.parentOrganization?.organizationId && map[org.parentOrganization.organizationId]) {
+          map[org.parentOrganization.organizationId].children.push(org);
+          map[org.parentOrganization.organizationId].hasChildren = false;
+          // map[org.organizationId].hasChildren = true; // 标记是否有子组织
+        } else {
+          roots.push(org);
+        }
+      });
+      console.log('roots:', roots);
+      return roots;
+    };
+    // const buildTree = (flatData: Organization[]): Organization[] => {
+    //   const map: Record<number, Organization> = {};
+    //   const roots: Organization[] = [];
+    //
+    //   flatData.forEach(org => {
+    //     map[org.organizationId] = org;
+    //     org.children = [];
+    //   });
+    //
+    //   flatData.forEach(org => {
+    //     if (org.parentOrganization && map[org.parentOrganization.organizationId]) {
+    //       map[org.parentOrganization.organizationId].children.push(org);
+    //       map[org.organizationId].hasChildren = true; // 标记是否有子组织
+    //     } else {
+    //       roots.push(org);
+    //     }
+    //   });
+    //   console.log('roots:', roots);
+    //   return roots;
+    // };
+
+    const submitForm = () => {
+      console.log('提交表单', dialogForm.value);
+      organizationService.addOrganization(dialogForm.value);
+      showDialog.value = false;
+    }
+
+    onMounted(() => {
+      fetchData();
+    });
+
+    return {
+      originTableData,
+      tableData,
+      showDialog,
+      dialogForm,
+      submitForm,
+      formLabelWidth,
+    };
+  },
+});
+</script>
+
+<style scoped>
+
+</style>

From 34efcf19eebc5277f6c7c69a5b0f8a720371a754 Mon Sep 17 00:00:00 2001
From: MiLla <18826902282@163.com>
Date: Thu, 4 Jul 2024 16:47:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E5=AE=8C=E5=96=84=E5=85=B6=E4=BB=96=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=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/components/HelloWorld.vue                 | 217 +++++++++++----
 src/router/authentication.js                  |   9 +-
 src/services/authenticationService.js         |   1 -
 src/services/organizationService.js           |  21 +-
 .../authentication/authentication_login.vue   |  90 +++++++
 .../authentication/authentication_main.vue    | 143 ++++++++++
 .../authentication_register.vue               | 103 ++++++++
 src/views/authentication_login.vue            |  36 ---
 src/views/authentication_register.vue         |  59 -----
 .../Organization_main.vue                     | 250 +++++++++++++-----
 10 files changed, 714 insertions(+), 215 deletions(-)
 create mode 100644 src/views/authentication/authentication_login.vue
 create mode 100644 src/views/authentication/authentication_main.vue
 create mode 100644 src/views/authentication/authentication_register.vue
 delete mode 100644 src/views/authentication_login.vue
 delete mode 100644 src/views/authentication_register.vue

diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
index 66ccd16..b7569a2 100644
--- a/src/components/HelloWorld.vue
+++ b/src/components/HelloWorld.vue
@@ -1,60 +1,175 @@
-<script setup>
-import { ref } from 'vue'
-
-const count = ref(0)
-</script>
-
 <template>
-  <div>
-    <a href="https://vitejs.dev" target="_blank">
-      <img src="/vite.svg" class="logo" alt="Vite logo" />
-    </a>
-    <a href="https://vuejs.org/" target="_blank">
-      <img src="../assets/vue.svg" class="logo vue" alt="Vue logo" />
-    </a>
+  <div class="login-page">
+    <div class="login-container">
+      <h2>测器汇管理系统</h2>
+      <el-form :model="loginForm" ref="loginForm" :rules="rules" label-width="0px">
+        <el-form-item prop="username">
+          <el-input v-model="loginForm.username" placeholder="请输入您的账号" prefix-icon="el-icon-user"></el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input v-model="loginForm.password" type="password" placeholder="请输入您的密码" prefix-icon="el-icon-lock"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-checkbox v-model="loginForm.remember">记住密码</el-checkbox>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">登录</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
   </div>
-  <h1>{{ this.$route.meta.msg }}</h1>
-
-
-  <div class="card">
-    <el-button type="danger" @click="count++">count is {{ count }}</el-button>
-    <p>
-      Edit
-      <code>components/HelloWorld.vue</code> to test HMR
-    </p>
-  </div>
-
-  <p>
-    Check out
-    <a href="https://vuejs.org/guide/quick-start.html#local" target="_blank"
-      >create-vue</a
-    >, the official Vue + Vite starter
-  </p>
-  <p>
-    Learn more about IDE Support for Vue in the
-    <a
-      href="https://vuejs.org/guide/scaling-up/tooling.html#ide-support"
-      target="_blank"
-      >Vue Docs Scaling up Guide</a
-    >.
-  </p>
-  <p class="read-the-docs">Click on the Vite and Vue logos to learn more</p>
 </template>
 
+<script>
+export default {
+  data() {
+    return {
+      loginForm: {
+        username: '',
+        password: '',
+        remember: false,
+      },
+      rules: {
+        username: [{ type:'email',required: true ,message: '请输入您的账号', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入您的密码', trigger: 'blur' }],
+      },
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.$refs.loginForm.validate((valid) => {
+        if (valid) {
+          // 提交表单
+          console.log('登录成功');
+        } else {
+          console.log('登录失败');
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
 <style scoped>
-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
+.login-page {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  background: url('https://via.placeholder.com/1920x1080') no-repeat center center;
+  background-size: cover;
 }
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
+
+.login-container {
+  width: 400px;
+  padding: 40px;
+  background: rgba(255, 255, 255, 0.9);
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+  border-radius: 8px;
+  text-align: center;
 }
-.logo.vue:hover {
-  filter: drop-shadow(0 0 2em #42b883aa);
-}
-.read-the-docs {
-  color: #888;
+
+.login-container h2 {
+  margin-bottom: 20px;
+  color: #333;
 }
 </style>
+
+
+<!--<template>-->
+<!--  <div class="department-management">-->
+<!--    <el-row :gutter="20" class="toolbar">-->
+<!--      <el-col :span="4">-->
+<!--        <el-input v-model="searchForm.departmentName" placeholder="请输入部门名称"></el-input>-->
+<!--      </el-col>-->
+<!--      <el-col :span="4">-->
+<!--        <el-select v-model="searchForm.status" placeholder="部门状态">-->
+<!--          <el-option label="正常" value="正常"></el-option>-->
+<!--          <el-option label="停用" value="停用"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-col>-->
+<!--      <el-col :span="4">-->
+<!--        <el-button type="primary" @click="search">搜索</el-button>-->
+<!--        <el-button @click="reset">重置</el-button>-->
+<!--      </el-col>-->
+<!--    </el-row>-->
+<!--    <el-table :data="departments" style="width: 100%">-->
+<!--      <el-table-column prop="name" label="部门名称" width="180"></el-table-column>-->
+<!--      <el-table-column prop="order" label="排序" width="80"></el-table-column>-->
+<!--      <el-table-column prop="status" label="状态" width="100">-->
+<!--        <template #default="scope">-->
+<!--          <el-tag :type="scope.row.status === '正常' ? 'success' : 'info'">{{ scope.row.status }}</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column prop="createdTime" label="创建时间" width="200"></el-table-column>-->
+<!--      <el-table-column label="操作" width="180">-->
+<!--        <template #default="scope">-->
+<!--          <el-button type="text" size="small" @click="editDepartment(scope.row)">修改</el-button>-->
+<!--          <el-button type="text" size="small" @click="addSubDepartment(scope.row)">新增</el-button>-->
+<!--          <el-button type="text" size="small" @click="deleteDepartment(scope.row)">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--    </el-table>-->
+<!--  </div>-->
+<!--</template>-->
+
+<!--<script>-->
+<!--export default {-->
+<!--  data() {-->
+<!--    return {-->
+<!--      searchForm: {-->
+<!--        departmentName: '',-->
+<!--        status: '',-->
+<!--      },-->
+<!--      departments: [-->
+<!--        // 示例数据-->
+<!--        { name: '测盟会', order: 0, status: '正常', createdTime: '2021-09-21 17:00:30' },-->
+<!--        { name: '深圳总公司', order: 1, status: '正常', createdTime: '2021-09-21 17:00:31', children: [-->
+<!--            { name: '研发部门', order: 1, status: '正常', createdTime: '2021-09-21 17:00:31' },-->
+<!--            { name: '市场部门', order: 2, status: '正常', createdTime: '2021-09-21 17:00:32' },-->
+<!--            { name: '测试部门', order: 3, status: '正常', createdTime: '2021-09-21 17:00:32' },-->
+<!--          ]},-->
+<!--        { name: '长沙分公司', order: 2, status: '正常', createdTime: '2021-09-21 17:00:33', children: [-->
+<!--            { name: '运营部门', order: 1, status: '正常', createdTime: '2021-09-21 17:00:33' },-->
+<!--            { name: '财务部门', order: 2, status: '正常', createdTime: '2021-09-21 17:00:34' },-->
+<!--          ]},-->
+<!--      ],-->
+<!--    };-->
+<!--  },-->
+<!--  methods: {-->
+<!--    search() {-->
+<!--      // 搜索逻辑-->
+<!--      console.log('搜索', this.searchForm);-->
+<!--    },-->
+<!--    reset() {-->
+<!--      this.searchForm = {-->
+<!--        departmentName: '',-->
+<!--        status: '',-->
+<!--      };-->
+<!--    },-->
+<!--    editDepartment(row) {-->
+<!--      // 编辑部门逻辑-->
+<!--      console.log('编辑', row);-->
+<!--    },-->
+<!--    addSubDepartment(row) {-->
+<!--      // 新增子部门逻辑-->
+<!--      console.log('新增子部门', row);-->
+<!--    },-->
+<!--    deleteDepartment(row) {-->
+<!--      // 删除部门逻辑-->
+<!--      console.log('删除', row);-->
+<!--    },-->
+<!--  },-->
+<!--};-->
+<!--</script>-->
+
+<!--<style scoped>-->
+<!--.department-management {-->
+<!--  padding: 20px;-->
+<!--}-->
+
+<!--.toolbar {-->
+<!--  margin-bottom: 20px;-->
+<!--}-->
+<!--</style>-->
\ No newline at end of file
diff --git a/src/router/authentication.js b/src/router/authentication.js
index 1ef2554..a86507e 100644
--- a/src/router/authentication.js
+++ b/src/router/authentication.js
@@ -1,8 +1,9 @@
-import authentication from '../views/authentication_login.vue'
-import register from '../views/authentication_register.vue'
+import authentication_main from '../views/authentication/authentication_main.vue'
+import register from '../views/authentication/authentication_register.vue'
+import authentication_login from "../views/authentication/authentication_login.vue";
 export default [
-    { path: '/', component: authentication },
-    { path: '/login', component: authentication },
+    { path: '/main', component: authentication_main },
+    { path: '/login', component: authentication_login },
     { path: '/register', component: register },
     // { path: '/profile', component: Profile }
 ]
diff --git a/src/services/authenticationService.js b/src/services/authenticationService.js
index 9c190ac..0f312a5 100644
--- a/src/services/authenticationService.js
+++ b/src/services/authenticationService.js
@@ -9,7 +9,6 @@ export default {
         };
         return axios.post(url, data)
             .then(response => {
-                alert(response.data.account);
                 return response.data;
             });
     },
diff --git a/src/services/organizationService.js b/src/services/organizationService.js
index 0984050..431ab03 100644
--- a/src/services/organizationService.js
+++ b/src/services/organizationService.js
@@ -10,5 +10,24 @@ export default {
         return axios.post('http://localhost:8080/organizations/addOrganization', organization).then(response => {
             return response.data;
         });
-    }
+    },
+    deleteOrganization(organizationId) {
+        return axios.post('http://localhost:8080/organizations/deleteOrganization' , {organizationId:organizationId},{headers: {
+            'Content-Type': 'application/json' // 设置 Content-Type 为 application/json
+        }}).then(response => {
+            return response.data;
+        });
+    },
+    updateOrganization(organization) {
+        return axios.post('http://localhost:8080/organizations/updateOrganization', organization).then(response => {
+            return response.data;
+        });
+    },
+    getOrganizationById(organizationId) {
+        return axios.post('http://localhost:8080/organizations/getOrganizationById', {organizationId:organizationId},{headers: {
+            'Content-Type': 'application/json' // 设置 Content-Type 为 application/json
+        }}).then(response => {
+            return response.data;
+        });
+    },
 }
\ No newline at end of file
diff --git a/src/views/authentication/authentication_login.vue b/src/views/authentication/authentication_login.vue
new file mode 100644
index 0000000..0ee1cba
--- /dev/null
+++ b/src/views/authentication/authentication_login.vue
@@ -0,0 +1,90 @@
+<template>
+  <div class="login-page">
+    <div class="login-container">
+      <h2>测器汇管理系统</h2>
+      <el-form :model="loginForm"  :rules="rules" label-width="0px">
+        <el-form-item prop="username">
+          <el-input v-model="loginForm.username" placeholder="请输入您的账号" prefix-icon="el-icon-user"></el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input v-model="loginForm.password" type="password" placeholder="请输入您的密码" prefix-icon="el-icon-lock"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-checkbox prop="remeber" v-model="loginForm.remember">记住密码</el-checkbox>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">登录</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import {defineComponent, ref} from "vue";
+import authenticationService from "../../services/authenticationService.js";
+import router from "../../router/index.js";
+
+
+export default defineComponent({
+  data() {
+    return {
+      rules: {
+        username:[{
+          required: true, message: '请输入账号', trigger: 'blur'
+        }],
+        leader:[{
+          required: true, message: '请输入密码', trigger: 'blur'
+        }],
+      }
+    };
+  },
+  setup(){
+    const loginForm = ref({
+      username: '',
+      password: '',
+      remember: false,
+    });
+
+    const onSubmit = () => {
+      authenticationService.login(loginForm.value.username,loginForm.value.password).then(res => {
+        console.log(res);
+        console.log(JSON.stringify(res));
+        sessionStorage.setItem('user',JSON.stringify(res));
+        console.log(sessionStorage.getItem('user'));
+        router.push('/main');
+      });
+    }
+
+    return{
+      loginForm,
+      onSubmit,
+    }
+  }
+});
+</script>
+
+<style scoped>
+.login-page {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  background: url('https://via.placeholder.com/1920x1080') no-repeat center center;
+  background-size: cover;
+}
+
+.login-container {
+  width: 400px;
+  padding: 40px;
+  background: rgba(255, 255, 255, 0.9);
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+  border-radius: 8px;
+  text-align: center;
+}
+
+.login-container h2 {
+  margin-bottom: 20px;
+  color: #333;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/authentication/authentication_main.vue b/src/views/authentication/authentication_main.vue
new file mode 100644
index 0000000..6ec09e1
--- /dev/null
+++ b/src/views/authentication/authentication_main.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-card class="box-card">
+    <div class="avatar-container">
+      <h2>个人信息</h2>
+      <el-avatar src="https://avatars.githubusercontent.com/u/1?v=4" size="large"></el-avatar>
+    </div>
+    <el-divider></el-divider>
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="用户昵称">{{user.name}}</el-descriptions-item>
+      <el-descriptions-item label="性别">{{user.gender}}</el-descriptions-item>
+      <el-descriptions-item label="手机号码">{{ user.phone }}</el-descriptions-item>
+      <el-descriptions-item label="用户邮箱">{{user.email}}</el-descriptions-item>
+      <el-descriptions-item label="所属部门">{{user.organization}}</el-descriptions-item>
+      <el-descriptions-item label="所属角色">{{user.role}}</el-descriptions-item>
+      <el-descriptions-item label="创建日期">{{user.createdTime}}</el-descriptions-item>
+    </el-descriptions>
+    <div class="edit-info">
+      <el-link type="primary" @click="editInfo">修改信息</el-link>
+    </div>
+  </el-card>
+
+  <el-dialog v-model="showDialog" title="填写信息" width="80%">
+    <el-tabs type="border-card">
+      <el-tab-pane label="基础信息">
+        <el-form :model="user" :rules="rules">
+          <el-form-item prop="name" label="用户昵称" :label-width="formLabelWidth">
+            <el-input v-model="user.name"></el-input>
+          </el-form-item>
+          <el-form-item prop="phone" label="手机号" :label-width="formLabelWidth">
+            <el-input v-model="user.phone"></el-input>
+          </el-form-item>
+          <el-form-item prop="email" label="邮箱" :label-width="formLabelWidth">
+            <el-input v-model="user.email"></el-input>
+          </el-form-item>
+          <el-form-item prop="gender" label="性别" :label-width="formLabelWidth">
+            <el-radio-group v-model="user.gender">
+              <el-radio value="男">男</el-radio>
+              <el-radio value="女">女</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-button @click="update" type="primary">确认修改</el-button>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane label="修改密码">
+        <el-form :model="user" :rules="rules">
+          <el-form-item prop="password" label="旧密码" :label-width="formLabelWidth">
+            <el-input v-model="passwordForm.confirmPassword"></el-input>
+          </el-form-item>
+          <el-form-item prop="password" label="新密码" :label-width="formLabelWidth">
+            <el-input v-model="passwordForm.newPassword"></el-input>
+          </el-form-item>
+          <el-form-item prop="confirmPassword" label="确认密码" :label-width="formLabelWidth">
+            <el-input v-model="passwordForm.confirmPassword"></el-input>
+          </el-form-item>
+          <el-button @click="update"></el-button>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+
+</template>
+
+<script lang="ts">
+import {defineComponent, onMounted, ref} from "vue";
+
+export default defineComponent({
+  setup() {
+    const passwordForm = ref({
+      currentPassword: '',
+      newPassword: '',
+      confirmPassword: '',
+    });
+    const showDialog = ref(false);
+    const formLabelWidth = ref('120px');
+    const user = ref({
+      name: '',
+      phone: '',
+      email: '',
+      gender: '',
+      organization: '',
+      role: '',
+      createdTime: '',
+    });
+
+    const rules = {
+      name: [
+        {required: true, message: '请输入用户昵称', trigger: 'blur'},
+        {min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur'}
+      ],
+      phone: [
+        {required: true, message: '请输入手机号码', trigger: 'blur'},
+        {pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur'}],
+
+      }
+
+    const editInfo = () => {
+      console.log(user.value);
+      showDialog.value = true;
+    }
+    const update = () => {
+      console.log(user);
+      showDialog.value = false;
+    }
+
+    onMounted(() => {
+      user.value= JSON.parse(sessionStorage.getItem('user'));
+    });
+
+    return {
+      editInfo,
+      user,
+      showDialog,
+      formLabelWidth,
+      update,
+      passwordForm,
+      rules
+    }
+  },
+})
+</script>
+
+<style scoped>
+.box-card {
+  max-width: 400px;
+  margin: 0 auto;
+  text-align: center;
+  padding: 20px;
+}
+
+.avatar-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.avatar-container h2 {
+  margin-bottom: 20px;
+}
+
+.edit-info {
+  margin-top: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/authentication/authentication_register.vue b/src/views/authentication/authentication_register.vue
new file mode 100644
index 0000000..56826c0
--- /dev/null
+++ b/src/views/authentication/authentication_register.vue
@@ -0,0 +1,103 @@
+<script lang="ts">
+import {defineComponent, ref} from "vue";
+import router from "../../router/index.js";
+
+export default defineComponent ({
+  data() {
+    return{
+        rules: {
+          name:[{
+            required: true, message: '请输入账号', trigger: 'blur'
+          }],
+          password:[{
+            required: true, message: '请输入密码', trigger: 'blur'
+          }],
+          contactPhone:[{
+            required: true, message: '请输入联系电话', trigger: 'blur'
+          }],
+          code:[{
+            required: true, message: '请输入验证码', trigger: 'blur'
+          }],
+        }
+      };
+    },
+  setup(){
+    const registerForm = ref({
+      name: '',
+      password: '',
+      contactPhone: '',
+    });
+
+    const handleBack = () => {
+      router.push('/login');
+    };
+
+    const handleRegister = () => {
+      alert('注册成功');
+    };
+
+    return{
+      registerForm,
+      handleRegister,
+      handleBack,
+    }
+  }
+});
+</script>
+
+
+<template>
+  <div class="register-page">
+    <div class="register-container">
+      <h2>企业租户注册</h2>
+      <el-form :model="registerForm"  :rules="rules" label-width="0px">
+        <el-form-item prop="name">
+          <el-input v-model="registerForm.name" placeholder="请输入您的账号" ></el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input v-model="registerForm.password" placeholder="请输入您的密码" ></el-input>
+        </el-form-item>
+        <el-form-item prop="contactPhone">
+          <el-input v-model="registerForm.contactPhone" placeholder="请输入您的联系电话" ></el-input>
+        </el-form-item>
+        <el-form-item prop="code">
+          <el-input  placeholder="请输入验证码"></el-input>
+        </el-form-item>
+        <el-form-item class="button">
+          <el-button type="primary" @click="handleRegister">注册</el-button>
+          <el-button type="primary" @click="handleBack">返回</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+
+
+<style scoped>
+.register-page {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  background: url('https://via.placeholder.com/1920x1080') no-repeat center center;
+  background-size: cover;
+}
+
+.register-container {
+  width: 400px;
+  padding: 40px;
+  background: rgba(255, 255, 255, 0.9);
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+  border-radius: 8px;
+  text-align: center;
+}
+
+.register-container h2 {
+  margin-bottom: 20px;
+  color: #333;
+}
+.button{
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/authentication_login.vue b/src/views/authentication_login.vue
deleted file mode 100644
index 6c2d6dc..0000000
--- a/src/views/authentication_login.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script setup>
-import authenticationService from "../services/authenticationService.js";
-import {ref} from "vue";
-import {useRouter} from "vue-router";
-const account = ref('');
-const password = ref('');
-
-const router = useRouter();
-
-const handleLogin = () => {
-  authenticationService.login(account.value,password.value).then(res=>{
-  });
-};
-
-const handleRegister = () => {
-    router.push('/register');
-};
-</script>
-
-<template>
-  <el-text size="large">登录</el-text>
-  <el-input v-model="account" placeholder="pls enter the account"></el-input>
-  <el-input v-model="password" placeholder="pls enter the password"></el-input>
-  <el-button type="success" @click="handleLogin">LOGIN</el-button>
-  <el-button type="success" @click="handleRegister">REGISTER</el-button>
-</template>
-
-<script>
-
-
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/authentication_register.vue b/src/views/authentication_register.vue
deleted file mode 100644
index 9c83d33..0000000
--- a/src/views/authentication_register.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<script setup>
-import authenticationService from "../services/authenticationService.js";
-import {computed, ref} from "vue";
-import {useRouter} from "vue-router";
-
-const account = ref('');
-const password = ref('');
-const fullname = ref('');
-const organization = ref('');
-const email = ref('');
-const gender = ref('');
-const phone = ref('');
-const pname = ref('');
-//
-// const topText = computed(() => {
-//   return `Welcome, ${username.value || 'Guest'}!`;
-// });
-const router = useRouter();
-
-const handleBack = () => {
-  router.push('/login');
-};
-
-const handleRegister = () => {
-  const user = {
-    account: account.value,
-    password: password.value,
-    name: fullname.value,
-    organization: organization.value,
-    email: email.value,
-    gender: gender.value,
-    phone: phone.value,
-  };
-
-  authenticationService.register(user).then(res => {
-    alert(res);
-  });
-};
-</script>
-
-
-<template>
-<!--  <el-text>{{ topText }}</el-text>-->
-  <el-input v-model="account" placeholder="pls enter the account"></el-input>
-  <el-input v-model="password" placeholder="pls enter the password"></el-input>
-  <el-input v-model="fullname" placeholder="pls enter the name"></el-input>
-  <el-input v-model="organization" placeholder="pls enter the organization"></el-input>
-  <el-input v-model="email" placeholder="pls enter the email"></el-input>
-  <el-input v-model="gender" placeholder="pls enter the gender"></el-input>
-  <el-input v-model="phone" placeholder="pls enter the phone"></el-input>
-  <el-button type="success" @click="handleBack">BACK</el-button>
-  <el-button type="success" @click="handleRegister">REGISTER</el-button>
-</template>
-
-
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/organization-management/Organization_main.vue b/src/views/organization-management/Organization_main.vue
index 75a880b..3acab73 100644
--- a/src/views/organization-management/Organization_main.vue
+++ b/src/views/organization-management/Organization_main.vue
@@ -1,13 +1,27 @@
 <template>
-  <el-text>{{ showDialog }}</el-text>
-  <el-button type="primary" @click="showDialog = true">添加部门</el-button>
-<!--  <el-table :data="tableData"-->
-<!--            style="width: 100%; margin-bottom: 20px"-->
-<!--            height="500px"-->
-<!--            row-key="organizationId"-->
-<!--            border-->
-<!--            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"-->
-<!--            default-expand-all>-->
+  <div class="department-management">
+    <el-breadcrumb separator="/">
+      <el-breadcrumb-item :to="{ path: '/login' }">登录界面</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/' }">Hello world</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/organization' }">部门管理</el-breadcrumb-item>
+    </el-breadcrumb>
+      <el-row :gutter="20" class="toolbar">
+        <el-col :span="4">
+          <el-input v-model="search.name" placeholder="请输入部门名称"></el-input>
+        </el-col>
+        <el-col :span="4">
+          <el-select v-model="search.status" placeholder="部门状态">
+            <el-option label="正常" value=true></el-option>
+            <el-option label="停用" value=false></el-option>
+            <el-option label="全部" value=""></el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="4">
+          <el-button type="primary" @click="handleSearch">搜索</el-button>
+          <el-button @click="handleReset">重置</el-button>
+        </el-col>
+      </el-row>
+      <el-button type="primary" @click="showDialogAdd = true">添加部门</el-button>
     <el-table
       :data="tableData"
       style="width: 100%; margin-bottom: 20px"
@@ -29,20 +43,26 @@
     <el-table-column prop="organizationStatus" label="部门状态" width="180">
       <template #default="{ row }">
         <span v-if="row.organizationStatus">
-           <el-text type="success">启用</el-text>
+           <el-text type="success">正常</el-text>
         </span>
         <span v-else>
-          <el-text type="danger">禁用</el-text>
+          <el-text type="danger">停用</el-text>
         </span>
       </template>
     </el-table-column>
+        <el-table-column label="操作" width="180">
+          <template #default="scope" >
+            <el-button  type="danger" text @click="deleteOrganization(scope.row.organizationId)">删除</el-button>
+            <el-button  type="danger" text @click="handleUpdate(scope.row.organizationId)">修改</el-button>
+          </template>
+        </el-table-column>
   </el-table>
-
+  </div>
 <!--  添加表单-->
-  <el-dialog v-model="showDialog" title="填写信息" width="80%">
-    <el-form :model="dialogForm">
+  <el-dialog v-model="showDialogAdd" title="填写信息" width="80%">
+    <el-form :model="dialogFormAdd" :rules="rules">
       <el-form-item label="上级部门" :label-width="formLabelWidth">
-        <el-select v-model="dialogForm.parentOrganization">
+        <el-select v-model="dialogFormAdd.parentOrganization">
           <el-option
               v-for="item in originTableData"
               :key="item.organizationId"
@@ -51,36 +71,39 @@
           >
             {{item.organizationName}}
           </el-option>
+          <el-option label="无" value=0></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="部门名称" :label-width="formLabelWidth">
-        <el-input v-model="dialogForm.organizationName"></el-input>
+      <el-form-item prop="organizationName" label="部门名称" :label-width="formLabelWidth">
+        <el-input v-model="dialogFormAdd.organizationName"></el-input>
       </el-form-item>
-      <el-form-item label="显示排列" :label-width="formLabelWidth">
-        <el-input v-model="dialogForm.displayOrder"></el-input>
+      <el-form-item prop="displayOrder" label="显示排列" :label-width="formLabelWidth">
+        <el-input-number v-model="dialogFormAdd.displayOrder" :min=1 :max="100"></el-input-number>
       </el-form-item>
-      <el-form-item label="负责人" :label-width="formLabelWidth">
-        <el-input v-model="dialogForm.leader"></el-input>
+      <el-form-item prop="leader" label="负责人" :label-width="formLabelWidth">
+        <el-input v-model="dialogFormAdd.leader"></el-input>
       </el-form-item>
-      <el-form-item label="联系电话" :label-width="formLabelWidth">
-        <el-input v-model="dialogForm.contactPhone"></el-input>
+      <el-form-item prop="contactPhone" label="联系电话" :label-width="formLabelWidth">
+        <el-input v-model="dialogFormAdd.contactPhone"></el-input>
       </el-form-item>
-      <el-form-item label="邮箱" :label-width="formLabelWidth">
-        <el-input v-model="dialogForm.email"></el-input>
+      <el-form-item prop="email" label="邮箱" :label-width="formLabelWidth">
+        <el-input v-model="dialogFormAdd.email"></el-input>
       </el-form-item>
       <el-form-item label="部门状态" :label-width="formLabelWidth">
-        <el-switch v-model="dialogForm.organizationStatus" active-value="true" active-text="启用" inactive-value="false" inactive-text="禁用"></el-switch>
+        <el-switch v-model="dialogFormAdd.organizationStatus" active-value="true" active-text="启用" inactive-value="false" inactive-text="禁用"></el-switch>
       </el-form-item>
     </el-form>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="showDialog = false">取消</el-button>
+    <div class="dialog-footer">
+    <span slot="footer">
+        <el-button @click="showDialogAdd = false">取消</el-button>
         <el-button type="primary" @click="submitForm">提交</el-button>
       </span>
+    </div>
   </el-dialog>
 </template>
 
 <script lang="ts">
-import { ref, onMounted, defineComponent } from 'vue';
+import {ref, onMounted, defineComponent} from 'vue';
 import organizationService from '../../services/organizationService';
 
 
@@ -99,13 +122,13 @@ interface Organization {
 
 export default defineComponent({
   setup() {
-
-    const showDialog = ref(false);
+    const showDialogAdd = ref(false);
     const formLabelWidth = ref('120px');
 
-    const dialogForm = ref(
+    const dialogFormAdd = ref(
         {
-          parentOrganization: '',
+          organizationId:0,
+          parentOrganization: 0,
           organizationName: '',
           displayOrder: 0,
           leader: '',
@@ -115,19 +138,27 @@ export default defineComponent({
         }
     );
 
+
     const originTableData = ref<Organization[]>([]);
     const tableData = ref<Organization[]>([]);
-
+    const treeData = ref();
+    const noChildrenData = ref();
     const fetchData = async () => {
       try {
+        tableData.value=[];
         const data = await organizationService.getAllOrganizations(); // 假设此函数可以获取后端数据
         console.log('获取到的部门信息', data);
         originTableData.value = data;
-        console.log(originTableData.value)
-        // 转换数据为树形结构
-        const treeData = buildTree(data); // 假设有一个函数 buildTree 负责构建树形结构
+        console.log(originTableData.value);
+        //buildTree 负责构建树形结构
+        treeData.value = buildTree(originTableData.value);
         console.log('树形结构数据', treeData);
-        tableData.value = treeData;
+        noChildrenData.value = originTableData.value.map(item => ({
+          ...item,
+          children: []  // 将 children 设置为空数组
+        }));
+        console.log('无子组织数据', noChildrenData);
+        tableData.value = treeData.value;
       } catch (error) {
         console.error('Error fetching organization:', error);
       }
@@ -151,34 +182,95 @@ export default defineComponent({
           roots.push(org);
         }
       });
+
+      const sortTree = (nodes: Organization[]) => {
+        nodes.sort((a, b) => a.displayOrder - b.displayOrder);
+        nodes.forEach(node => {
+          if (node.children && node.children.length > 0) {
+            sortTree(node.children);
+          }
+        });
+      };
+
+      sortTree(roots);
+
       console.log('roots:', roots);
       return roots;
     };
-    // const buildTree = (flatData: Organization[]): Organization[] => {
-    //   const map: Record<number, Organization> = {};
-    //   const roots: Organization[] = [];
-    //
-    //   flatData.forEach(org => {
-    //     map[org.organizationId] = org;
-    //     org.children = [];
-    //   });
-    //
-    //   flatData.forEach(org => {
-    //     if (org.parentOrganization && map[org.parentOrganization.organizationId]) {
-    //       map[org.parentOrganization.organizationId].children.push(org);
-    //       map[org.organizationId].hasChildren = true; // 标记是否有子组织
-    //     } else {
-    //       roots.push(org);
-    //     }
-    //   });
-    //   console.log('roots:', roots);
-    //   return roots;
-    // };
+
+
 
     const submitForm = () => {
-      console.log('提交表单', dialogForm.value);
-      organizationService.addOrganization(dialogForm.value);
-      showDialog.value = false;
+      console.log('提交表单' , dialogFormAdd.value);
+      organizationService.addOrganization(dialogFormAdd.value);
+      showDialogAdd.value = false;
+
+      dialogFormAdd.value = {
+        organizationId:0,
+        parentOrganization: 0,
+        organizationName: '',
+        displayOrder: 0,
+        leader: '',
+        contactPhone: '',
+        email: '',
+        organizationStatus: true,
+      };
+
+    }
+
+    const deleteOrganization = (organizationId:number) => {
+      // const confirmDelete = ElMessageBox.confirm('确认删除该组织?', '提示');
+      // console.log(organizationId);
+      // if(!confirmDelete){
+      //   organizationService.deleteOrganization(organizationId);
+      // }
+      organizationService.deleteOrganization(organizationId);
+      fetchData();
+    }
+
+    const handleUpdate = (organizationId:number) => {
+      console.log('编辑部门', organizationId);
+      const organization = originTableData.value.find((item) => item.organizationId === organizationId);
+      console.log('organization', organization);
+      dialogFormAdd.value = {
+        organizationId:organization?.organizationId,
+        parentOrganization: organization?.parentOrganization?.organizationId || 0,
+        organizationName: organization?.organizationName,
+        displayOrder: organization?.displayOrder,
+        leader: organization?.leader,
+        contactPhone: organization?.contactPhone,
+        email: organization?.email,
+        organizationStatus: organization?.organizationStatus,
+      }
+      console.log('dialogFormAdd', dialogFormAdd.value);
+      showDialogAdd.value = true;
+
+    }
+
+    const search = ref({
+      name:'',
+      status:''
+    })
+    const handleSearch = () => {
+      console.log('搜索', search.value);
+      // if(search.value.name != ''){
+        tableData.value = noChildrenData.value.filter(
+            (data) => {
+              const isNameValid = search.value && search.value.name;
+              const isStatusValid = search.value && search.value.status;
+
+              return (!isNameValid || data.organizationName.toLowerCase().includes(search.value.name.toLowerCase())) &&
+                  (!isStatusValid || data.organizationStatus === JSON.parse(search.value.status));
+            }
+        );
+      // }else{
+      //   fetchData();
+      // }
+    }
+    const handleReset = () => {
+      search.value.name = '';
+      search.value.status = '';
+      fetchData();
     }
 
     onMounted(() => {
@@ -188,15 +280,47 @@ export default defineComponent({
     return {
       originTableData,
       tableData,
-      showDialog,
-      dialogForm,
+      showDialogAdd,
+      dialogFormAdd,
       submitForm,
       formLabelWidth,
+      deleteOrganization,
+      handleUpdate,
+      search,
+      handleSearch,
+      handleReset,
+    };
+  },
+  data() {
+    return {
+      rules: {
+        organizationName:[{
+          required: true, message: '请输入部门名称', trigger: 'blur'
+        }],
+        leader:[{
+          required: true, message: '请输入负责人名称', trigger: 'blur'
+        }],
+        contactPhone:[{
+          type:'text',required:true,message:'请输入联系电话',trigger:'blur'
+        }],
+        email: [{
+          pattern:/^([a-zA-Z0-9]+[-_\.]?)+@[a-zA-Z0-9]+\.[a-z]+$/ ,required: true ,message: '输入邮箱', trigger: 'blur'
+        }],
+      }
     };
   },
 });
 </script>
 
 <style scoped>
+.department-management {
+  padding: 20px;
+}
 
+.toolbar {
+  margin-bottom: 20px;
+}
+.dialog-footer{
+  text-align: right;
+}
 </style>

From c9ab7e221a813a9a9d5be72ef7f6d7125bb9dd9c Mon Sep 17 00:00:00 2001
From: MiLla <18826902282@163.com>
Date: Thu, 4 Jul 2024 17:25:49 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E5=AE=8C=E5=96=84=E5=85=B6=E4=BB=96=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=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/services/organizationService.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/services/organizationService.js b/src/services/organizationService.js
index 431ab03..9258df3 100644
--- a/src/services/organizationService.js
+++ b/src/services/organizationService.js
@@ -2,24 +2,24 @@ import axios  from "axios";
 
 export default {
     getAllOrganizations() {
-        return axios.get('http://localhost:8080/organizations/listAll').then(response => {
+        return axios.get('http://localhost:8080/api/organizations/listAll').then(response => {
             return response.data;
         });
     },
     addOrganization(organization) {
-        return axios.post('http://localhost:8080/organizations/addOrganization', organization).then(response => {
+        return axios.post('http://localhost:8080/api/organizations/addOrganization', organization).then(response => {
             return response.data;
         });
     },
     deleteOrganization(organizationId) {
-        return axios.post('http://localhost:8080/organizations/deleteOrganization' , {organizationId:organizationId},{headers: {
+        return axios.post('http://localhost:8080/api/organizations/deleteOrganization' , {organizationId:organizationId},{headers: {
             'Content-Type': 'application/json' // 设置 Content-Type 为 application/json
         }}).then(response => {
             return response.data;
         });
     },
     updateOrganization(organization) {
-        return axios.post('http://localhost:8080/organizations/updateOrganization', organization).then(response => {
+        return axios.post('http://localhost:8080/api/organizations/updateOrganization', organization).then(response => {
             return response.data;
         });
     },