diff --git a/RMS/RMS_front/vue_RMS_front/package-lock.json b/RMS/RMS_front/vue_RMS_front/package-lock.json
index 4162da8badf173e601297c9b5cfd0839556f6ede..f3ae11621d3e1269e070863a0c902c9cd295f1fd 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 eb30183a6bee42dde04177b9774f45353e37c659..d2553304ee09e7b1b6136a4e6182ee63e9e90c8a 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 2a9fe23564f6d328fdce9a59bae19f58ff4569f7..446df9f3b36542829e03351012d4ab9710747107 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 f10f4114e0fc5765bb966a3b4fd47ddaec8d99e5..a0c9a298957d626c505d683335aabc23631a6098 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 f16a47c195da6f270691d04a59a489728fae6910..d55d463a6af02bda22559021f7601d255193e219 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 @@
-<script>
+<script setup>
+import { ref } from 'vue';
+import router from '@/router';
+const userName = ref("")
+const passWord = ref("")
 
+const land = ()=>{
+    router.push("/index")
+}
 </script>
 
 <template>
-<div class="loginbody">
-    <div class="logindata">
-      <div class="logintext title-wrap">
+    <div class="tbody">
+        <div class="tbody-Two">
         <span class="title">
-          {{ "请先登录" }}
+            <p>请先登录</p>
         </span>
-      </div>
-      <div class="formdata">
-        <el-form ref="form" :model="form" :rules="rules">
-          <el-form-item prop="username">
-            <el-input
-              clearable
-              placeholder="请输入账号"
-            >
-            <template slot="prepend"><i style="font-size:20px" class="el-icon-user"></i></template>
-          </el-input>
-          </el-form-item>
-          <el-form-item prop="password">
-            <el-input
-              clearable
-              placeholder="请输入密码"
-              show-password
-            >
-            <template slot="prepend"><i style="font-size:20px" class="el-icon-key"></i></template>
-          </el-input>
-          </el-form-item>
+        <div class="main">
+        <el-form>
+            <el-form-item>
+                <el-input v-model="userName" placeholder="请输入账号" clearable style="width: 300px;"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-input v-model="passWord" placeholder="请输入密码" clearable show-password style="width: 300px;"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <div class="button-Two">
+                <el-button type="primary" @click="land">登录</el-button>
+                <el-button >注册</el-button>
+            </div>
+            </el-form-item>
+            
         </el-form>
-      </div>
-      <div class="tool">
-        <div>
-          <el-checkbox v-model="checked" @change="remenber"
-            >记住密码</el-checkbox
-          >
-        </div>
-        <div>
-          <span class="shou" @click="forgetpas">忘记密码？</span>
         </div>
-      </div>
-      <div class="butt">
-        <el-button type="primary" @click.native.prevent="login('form')"
-          >登录</el-button
-        >
-        <el-button class="shou" @click="register">注册</el-button>
-      </div>
     </div>
-  </div>
+</div>
 </template>
 
-<style>
-
-.loginbody {
-  width: 100%;
-  height: 100%;
-  min-width: 1000px;
-  background-color: #2d3a4b;
-  background-size: 100% 100%;
-  background-position: center center;
-  overflow: auto;
-  background-repeat: no-repeat;
-  position: fixed;
-  line-height: 100%;
-  padding-top: 150px;
-  margin: -8px;
+<style scoped>
+.tbody{
+    width: 100%;
+ height: 100%;
+ min-width: 1000px;
+ background-color: #2d3a4b;
+ background-size: 100% 100%;
+ background-position: center center;
+ overflow: auto;
+ background-repeat: no-repeat;
+ position: fixed;
+ line-height: 100%;
+ padding-top: 150px;
+ margin: -8px;
 }
-
-.logintext {
-  margin-bottom: 20px;
-  line-height: 50px;
-  text-align: center;
-  font-size: 30px;
-  font-weight: bolder;
-  color: white;
-  text-shadow: 2px 2px 4px #000000;
+.tbody-Two{
+    margin-bottom: 20px;
+ line-height: 50px;
+ text-align: center;
+ font-size: 30px;
+ font-weight: bolder;
+ color: white;
+ text-shadow: 2px 2px 4px #000000;
 }
-
-.logindata {
-  width: 400px;
-  height: 300px;
-  transform: translate(-50%);
-  margin-left: 50%;
+.title p{
+    color: rgb(255, 255, 255);
 }
-
-.tool {
-  display: flex;
-  justify-content: space-between;
-  color: #606266;
-}
-
-.butt {
-  margin-top: 10px;
-  text-align: center;
+.main{
+    display: flex;
+    justify-content: space-around
 }
-
-.shou {
-  cursor: pointer;
-  color: #606266;
+.button-Two{
+    display: flex;
+    justify-content: center
 }
-.title-wrap {
-  filter: contrast(30);
-  @keyframes showup {
-    0% {
-      letter-spacing: -20px;
-    }
-
-    100% {
-      letter-spacing: 4px;
-    }
-  }
-}
-
-.title {
-  letter-spacing: 4px;
-  animation: showup 3s forwards;
-}
-/*ui*/
-/* /deep/ .el-form-item__label {
-  font-weight: bolder;
-  font-size: 15px;
-  text-align: left;
-}
-
-/deep/ .el-button {
-  width: 100%;
-  margin-bottom: 10px;
-
-} */
-
 </style>
\ 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 8d065331b37f3333b3478affbefbedd5691df353..647e9a3f268b498379f08d3e58b8e3eb88455034 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';
   <el-container class="layout-container-demo" style="height: 500px">
     <el-aside width="200px">
       <el-scrollbar>
-        <a href="/" class="index-a">
+        <a href="/index" class="index-a">
         <el-row class="tac">
           <el-col :span="12">
             <h5 class="mb-2">Default colors</h5>
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 ab0f5d49c3cb2d783e3f87c75ce4a4ad178fab1e..6af8ef982f383b7df931c192c8b26979598471b1 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 @@
 <script setup>
-import { ref } from 'vue';
+import { ref,onMounted } from 'vue';
+import axios from 'axios';
 import breadcrumb from "@/views/head/breadCrumb.vue"
+//定义，获取全部数据
+const userList = ref("");
+const roleList = ref("")
+const postList = ref("")
+const deptList = ref("")
+//获取用户输入查询的信息
+const need = ref("")
+const roleNameTwo = ref("")
+const postNameTwo = ref("")
+//储存用户要添加的值
+const username = ref("")
+const name = ref("")
+const phone = ref("")
+const post = ref("")
+const dept = ref("")
+const role = ref("")
 
+onMounted(()=>{
+  render()
+  getRole()
+  getPost()
+  getDept()
+})
 
-const input = ref("")
-const tableData = [
-  {
-    date: '2016-05-03',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-02',
-    name: 'Tor',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 1888889, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 1888889, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 1888889, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 1888889, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 1888889, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 1888889, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 1888889, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 1888889, Grove St, Los Angeles',
-  }
-]
-import { Search,Edit,Delete,User } from '@element-plus/icons-vue';
+// 获取用户
+const render = async ()=>{
+  const res = await axios({
+  url:'http://localhost:8080/RMS/User',
+  method:'GET'
+})
+  userList.value = res.data.data
+  console.log(userList.value);
+}
+
+//点击搜索后获取输入框要查找的人
+const select = async ()=>{
+  const res = await axios({
+    url:`http://localhost:8080/RMS/User/getLike`,
+    method:'GET',
+    params:{
+      need:need.value
+    }
+  })
+  userList.value = res.data.data
+  console.log(roleNameTwo.value);
+  console.log(postNameTwo.value);
+}
+
+//获取角色
+const getRole = async ()=>{
+  const res = await axios({
+    url:'http://localhost:8080/RMS/User/getRole',
+    method:'GET'
+  })
+  roleList.value = res.data.data
+}
+
+//获取岗位信息
+const getPost = async ()=>{
+  const res = await axios({
+    url:'http://localhost:8080/RMS/User/getPost',
+    method:'GET'
+  })
+  postList.value = res.data.data
+}
+
+//获取部门信息
+const getDept = async ()=>{
+  const res = await axios({
+    url:'http://localhost:8080/RMS/User/getDept',
+    method:'GET'
+  })
+  deptList.value = res.data.data
+  console.log(deptList.value);
+}
+
+
+//修改状态栏
+const updateStatus = (data,b,index)=>{
+  console.log(data,b,index);
+}
 
 //添加的弹窗
 const dialogVisible = ref(false);
@@ -74,22 +95,50 @@ const confirmDel = ref(false);
 <!-- 顶部导航栏 -->
 <breadcrumb></breadcrumb>
 
+<!-- 左边导航栏 -->
+<div class="div2">
+  <el-space wrap>
+    <el-card style="width: 250px">
+      <template #header>
+        <div class="card-header">
+          <span>Card name</span>
+          <el-button class="button" text>Operation button</el-button>
+        </div>
+      </template>
+      <div v-for="o in 4" :key="o" class="text item">
+        {{ 'List item ' + o }}
+      </div>
+    </el-card>
+  </el-space>
+</div>
+
+<div class="div1">
 <!-- 搜索功能 -->
 <div class="head_border">
     <el-row :gutter="20">
         <el-col :span="7">
-            关键字 &nbsp; <el-input v-model="input" style="width: 240px" placeholder="用户名/姓名/电话号码" />
+            关键字 &nbsp; <el-input v-model="need" style="width: 240px" placeholder="用户名/姓名/电话号码" />
         </el-col>
         <el-col :span="8">
             角色 &nbsp; 
-            <el-select v-model="value" placeholder="请选择" style="width: 300px">
-                <el-option></el-option>
+            <el-select v-model="roleNameTwo" placeholder="请选择" style="width: 300px">
+                <el-option
+                v-for="item in roleList"
+                :key="item.id"
+                :label="item.roleName"
+                :value="item.id"
+                ></el-option>
             </el-select>
         </el-col>
         <el-col :span="8">
             岗位 &nbsp; 
-            <el-select v-model="value" placeholder="请选择" style="width: 300px">
-                <el-option></el-option>
+            <el-select v-model="postNameTwo" placeholder="请选择" style="width: 300px">
+                <el-option
+                v-for="item in postList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                ></el-option>
             </el-select>
         </el-col>
     </el-row>
@@ -98,7 +147,7 @@ const confirmDel = ref(false);
 
     <el-row :gutter="20">
         <el-col span="8">
-            <el-button type="primary" icon="Search">搜索</el-button>
+            <el-button type="primary" icon="Search" @click="select">搜索</el-button>
             <el-button icon="refresh">重置</el-button>
         </el-col>
     </el-row>
@@ -113,18 +162,25 @@ const confirmDel = ref(false);
 
 
 <!-- 列表的渲染 -->
-<el-table :data="tableData" border style="width: 100%">
-  <el-table-column prop="date" label="序列" width="200"/>
-    <el-table-column prop="name" label="用户名" width="200"/>
+<el-table :data="userList" border style="width: 100%">
+  <el-table-column prop="id" label="序列" width="200"/>
+    <el-table-column prop="username" label="用户名" width="200"/>
     <el-table-column prop="name" label="姓名"  width="200"/>
-    <el-table-column prop="name" label="手机"  width="200"/>
-    <el-table-column prop="name" label="岗位" width="200"/>
-    <el-table-column prop="name" label="部门"  width="200"/>
-    <el-table-column prop="name" label="所属角色"  width="200"/>
-    <el-table-column prop="name" label="状态"  width="200">
-      <el-switch v-model="status" />
+    <el-table-column prop="phone" label="手机"  width="200"/>
+    <el-table-column prop="status" label="岗位" width="200"/>
+    <el-table-column prop="status" label="部门"  width="200"/>
+    <el-table-column prop="status" label="所属角色"  width="200"/>
+    <el-table-column prop="status" label="状态"  width="200">
+      <template v-slot="scope">
+      <el-switch 
+      :active-value="1" 
+      :inactive-value="0" 
+      v-model="scope.row.status"
+      @change="updateStatus($event,scope.row,scope.$index)">
+    </el-switch>
+    </template>
     </el-table-column>
-    <el-table-column prop="name" label="创建时间"  width="200"/>
+    <el-table-column prop="createTime" label="创建时间"  width="200"/>
     <el-table-column fixed="right" label="操作" min-width="200">
       <template #default>
         <!-- 修改按钮 -->
@@ -161,7 +217,7 @@ const confirmDel = ref(false);
       @current-change="handleCurrentChange"
     />
   </div>
-
+</div>
 
 
   <!-- 添加弹窗 -->
@@ -172,27 +228,40 @@ const confirmDel = ref(false);
     width="40%"
     :before-close="handleClose"
     :center = "true"
-  >c
-    <el-row :gutter="20" class="elrowOne">
-      <el-col span="20">
-        用户名 &nbsp; <el-input v-model="input" style="width: 240px" placeholder="请输入用户名" />
-      </el-col>
-      <el-col span="20">
-        姓名 &nbsp; <el-input v-model="input" style="width: 240px" placeholder="请输入姓名" />
-      </el-col>
-      <el-col span="20">
-        手机 &nbsp; <el-input v-model="input" style="width: 240px" placeholder="请输入手机" />
-      </el-col>
-      <el-col span="20">
-        岗位 &nbsp; <el-input v-model="input" style="width: 240px" placeholder="请输入岗位" />
-      </el-col>
-      <el-col span="20">
-        部门 &nbsp; <el-input v-model="input" style="width: 240px" placeholder="请输入部门" />
-      </el-col>
-      <el-col span="20">
-        所属角色 &nbsp; <el-input v-model="input" style="width: 240px" placeholder="请输入所属角色" />
-      </el-col>
-    </el-row>
+  >
+  <el-form
+  label-width="auto"
+  >
+    <el-form-item label="用户名">
+      <el-input v-model="username" style="width: 240px" placeholder="请输入用户名" />
+    </el-form-item>
+    <el-form-item label="姓名">
+      <el-input v-model="name" style="width: 240px" placeholder="请输入姓名" />
+    </el-form-item>
+    <el-form-item label="手机">
+      <el-input v-model="phone" style="width: 240px" placeholder="请输入手机" />
+    </el-form-item>
+    <el-form-item label="岗位">
+      <el-select v-model="post" placeholder="请选择" style="width: 240px">
+                <el-option
+                v-for="item in postList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                ></el-option>
+            </el-select>
+    </el-form-item>
+    <el-form-item label="部门">
+      <el-select v-model="dept" placeholder="请选择" style="width: 240px">
+                <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                ></el-option>
+            </el-select>
+    </el-form-item>
+  </el-form>
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="dialogVisible = false">取消</el-button>
@@ -268,7 +337,18 @@ const confirmDel = ref(false);
   display: flex;
   justify-content: center;
 }
- 
 
+.add{
+  display: flex;
+  justify-content: center;
+}
+
+.div1{
+  float: left;
+}
+
+.div2{
+  float: left;
+}
 
 </style>
\ No newline at end of file
diff --git a/RMS/src/main/java/com/demo/controller/UserController.java b/RMS/src/main/java/com/demo/controller/UserController.java
index 0c8f24f90d0909dc8a8cdfb163ed0f7700d7d551..774cf1f3b1b216939d82cb955214e044c9f303e7 100644
--- a/RMS/src/main/java/com/demo/controller/UserController.java
+++ b/RMS/src/main/java/com/demo/controller/UserController.java
@@ -27,7 +27,7 @@ public class UserController {
     private UserMapper userMapper;
     @Autowired
     private DeptMapper deptMapper;
-    @GetMapping
+    @GetMapping()
     public R getAllUser(){
         return new R(true,"",userMapper.selectAllUser());
     }
@@ -44,6 +44,7 @@ public class UserController {
         System.out.println(need);
         return new R(true,"",userMapper.selectLikeUser("%"+need+"%"));
     }
+
     public List<DTODeptId> getDeptStream(List<Dept> userList,List<DTODeptId> userid){
         List<DTODeptId> userid1=  userid.stream().map(m->{
             DTODeptId dtoDeptId = new DTODeptId();
diff --git a/RMS/src/main/java/com/demo/pojo/PO/User.java b/RMS/src/main/java/com/demo/pojo/PO/User.java
index 473e61750a5a450d373b58dad271b183700b7a50..8c63a9645d9c63bf1c2328be95aef8a79e617445 100644
--- a/RMS/src/main/java/com/demo/pojo/PO/User.java
+++ b/RMS/src/main/java/com/demo/pojo/PO/User.java
@@ -1,7 +1,9 @@
 package com.demo.pojo.PO;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
diff --git a/RMS/src/main/resources/application.yml b/RMS/src/main/resources/application.yml
index 0a2776933c3a099080f1cbd87c1b79e1a17179b3..32c1dd8de2de753d0dc84b77835b2c4fc8f174e6 100644
--- a/RMS/src/main/resources/application.yml
+++ b/RMS/src/main/resources/application.yml
@@ -6,7 +6,7 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://localhost/guigu-oa
       username: root
-      password: 123456
+      password: root
   mvc:
     static-path-pattern: /***