diff --git a/src/assets/images/operate.png b/src/assets/images/operate.png
new file mode 100644
index 0000000..3c59bc2
Binary files /dev/null and b/src/assets/images/operate.png differ
diff --git a/src/views/Home.vue b/src/views/Home.vue
index f185069..d394ab1 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -6,11 +6,19 @@
         class="principalheader"
       >
         <div class="navs">
+          <img
+            src="@/assets/logo.png"
+            alt=""
+            style="width: 24px; height: 24px"
+          />
           <div class="maintitle">神豚体检管理系统</div>
           <div style="margin-left: 5%">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link">
-                <span style="margin-top: 10px;color:#000">
+                <span style="margin-top: 10px">
                   <img
                     class="iconimg"
                     src="@/assets/images/usericon.png"
@@ -40,7 +48,10 @@
             style="margin-left: 10px; padding: 0 5px"
             class="basicdictionany"
           >
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link" style="margin-left: 10px">
                 <img
                   src="@/assets/images/feesettings.png"
@@ -111,7 +122,10 @@
           </div>
           <!-- 收费设置 -->
           <div class="feesettings" style="margin-left: 20px">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link">
                 <img
                   src="@/assets/images/chargeimg.png"
@@ -140,7 +154,10 @@
           </div>
           <!--常用设置  -->
           <div class="commonsettings" style="margin-left: 20px">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link">
                 <img
                   src="@/assets/images/commonsetting.png"
@@ -192,7 +209,11 @@
           </div>
           <!-- 体检登记 -->
           <div class="examinationregistration" style="margin-left: 20px">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+              class="dropdowncolor"
+            >
               <span class="el-dropdown-link">
                 <img
                   src="@/assets/images/registrationimg.png"
@@ -229,7 +250,10 @@
           </div>
           <!-- 体检 -->
           <div class="physicalexamination" style="margin-left: 10px">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link">体检</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="doctorCheck"
@@ -243,7 +267,10 @@
           </div>
           <!-- 体检查询 -->
           <div style="margin-left: 10px">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link">体检查询</span>
               <el-dropdown-menu slot="dropdown" style="width: 170px">
                 <el-dropdown-item command="report">体检报告</el-dropdown-item>
@@ -264,7 +291,10 @@
           </div>
           <!-- 客户报表 -->
           <div class="physicalexamination" style="margin-left: 15px">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link"> 客户报表 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="diseaseStatistics"
@@ -302,7 +332,10 @@
           <!--  -->
           <!-- 收费 -->
           <div class="physicalexamination" style="margin-left: 15px">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link"> 工作量统计 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="registrar"
@@ -323,7 +356,10 @@
           <!--  -->
           <!-- 收费 -->
           <div class="physicalexamination" style="margin-left: 15px">
-            <el-dropdown @command="handleCommand">
+            <el-dropdown
+              @command="handleCommand"
+              style="color: rgb(121, 114, 113); font-weight: 700"
+            >
               <span class="el-dropdown-link"> 收费 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="tollcollector"
@@ -344,11 +380,18 @@
               src="@/assets/images/currentuser.png"
               alt=""
               class="currentuser"
+              style="background-color:red;"
             />
             当前用户:{{ user }}
             <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
             <el-dropdown>
               <span class="el-dropdown-link">
+                <img
+                  src="@/assets/images/operate.png"
+                  alt=""
+                  style="width: 20px; height: 20px"
+                  class="operateimg"
+                />
                 操作 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -709,18 +752,22 @@ export default {
 };
 </script>
 <style scoped>
+.dropdowncolor {
+  font-size: 12px;
+}
 .el-dropdown {
   color: rgb(140, 135, 134);
+  font-size: 12px;
 }
 .currentuser {
   width: 30px;
   height: 30px;
-
-  position: absolute;
-  right: 11%;
+  position: relative;
+  right: 2%;
   top: 10px;
   color: #000;
   background-color: #2bca84;
+  z-index: 99;
 }
 .registrationimgimges {
   width: 20px;
@@ -823,7 +870,11 @@ export default {
 .el-header {
   height: 70px;
 }
-
+.operateimg{
+  position: relative;
+  left: 0;
+  top: 5px;
+}
 .el-aside {
   /* height: calc(100vh, -70px); */
   height: calc(100vh - 0px);
diff --git a/src/views/basic-dictionary/GuideType.vue b/src/views/basic-dictionary/GuideType.vue
index 295b30b..23cd30d 100644
--- a/src/views/basic-dictionary/GuideType.vue
+++ b/src/views/basic-dictionary/GuideType.vue
@@ -2,7 +2,7 @@
   <div style="display: flex">
     <div style="width: 95%">
       <el-card class="cardboder">
-          <div class="publiccss">导入类别</div>
+        <div class="publiccss">导入类别</div>
         <el-row style="margin-top: 20px">
           <el-col :span="4">
             <el-input
@@ -12,13 +12,16 @@
             ></el-input>
           </el-col>
           <el-col :span="4">
-            <el-button type="primary" style="margin-left: 5%" @click="getlists"
+            <el-button
+              type=""
+              style="margin-left: 5%; width: 100px"
+              @click="getlists"
               >查询</el-button
             >
           </el-col>
         </el-row>
         <div class="exportExcel" style="margin-top: 0px; display: flex">
-          <!-- <download-excel
+          <!-- <download-excel 121 114 113
             :data="tableData"
             :fields="jsonfields"
             header="用户信息"
@@ -282,26 +285,32 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 7%">
-      <el-button type="primary" @click="guideadd">新增</el-button>
+      <el-button type="" @click="guideadd" style="width: 100px;color:#2BCA84;font-weight: 700;">新增</el-button>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="editandmofin">编辑</el-button>
+        <el-button type="" @click="editandmofin" style="width: 100px;color:#2BCA84;font-weight: 700;"
+          >编辑</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="confirmdeltion">删除</el-button>
+        <el-button type="" @click="confirmdeltion" style="width: 100px;color:#2BCA84;font-weight: 700;"
+          >删除</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" style="width: 100px;color:#2BCA84;font-weight: 700;"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="setlow">置底</el-button>
+        <el-button type="" @click="setlow" style="width: 100px;color:#2BCA84;font-weight: 700;">置底</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
-          >排序</el-button
+        <el-button type="" :disabled="isshow" @click="assertion"
+         style="width: 100px;color:#2BCA84;font-weight: 700;" >排序</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button type="" :disabled="isshow" @click="cancellation" style="width: 100px;color:#2BCA84;font-weight: 700;"
           >取消</el-button
         >
       </div>
@@ -313,14 +322,14 @@
           name="用户信息"
           style="width: 100px; margin-left: 0px"
         >
-          <el-button type="primary">导出</el-button>
+          <el-button type="" style="width: 100px;color:#2BCA84;font-weight: 700;">导出</el-button>
         </download-excel>
       </div>
       <div style="margin-top: 10px">
         <el-button
-          type="success"
+          type=""
           v-print="{ id: 'printTest', extraHead: '用户信息' }"
-          style="margin-left: 0px"
+          style="margin-left: 0px;width: 100px;color:#2BCA84;font-weight: 700;"
           >打印</el-button
         >
       </div>
@@ -785,8 +794,9 @@ export default {
 };
 </script>
 <style scoped>
-.cardboder{
-  border-radius: 15px;
+.cardboder {
+  margin-top: -15px;
+  border-radius: 12px;
 }
 .fixed-height-row {
   height: 30px;
diff --git a/src/views/common-settings/ItemType.vue b/src/views/common-settings/ItemType.vue
index f3efa6c..871f484 100644
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@@ -64,6 +64,10 @@
           width="40%"
           :close-on-click-modal="false"
         >
+         <el-cascader
+    :options="options"
+    :props="{ checkStrictly: true }"
+    clearable></el-cascader>
           <el-form
             :model="form"
             label-width="80px"
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index ae18501..9a7e34a 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -28,9 +28,9 @@
                 prefix-icon="el-icon-unlock"
               ></el-input>
             </el-form-item>
-            <button type="primary" class="btn" @click="onSubmit(form)">
+            <el-button type="primary" class="btn" @click="onSubmit(form)">
               用户登录
-            </button>
+            </el-button>
           </el-form>
         </div>
       </div>
@@ -65,12 +65,9 @@ export default {
   },
   methods: {
     onSubmit() {
+      //
       this.$refs.form.validate((valid) => {
         if (valid) {
-          // let res = await getapi("/api/identity/users/login", {
-          //   username: this.form.Username,
-          //   password: this.form.Password,11
-          // });
           var msgs = "";
           postapi(`/api/identity/users/login`, {
             userName: this.form.Username,
@@ -96,191 +93,14 @@ export default {
               }
 
               console.log(res, "res");
-              // if (res.code != -1 && res.data.code == 1) {
-              //   window.sessionStorage.setItem("peisid", res.data.peisid); //设置当前人员所属体检中心
-
-              //   return this.$axios.post(
-              //     mm.apiurl + "/connect/token",
-              //     {
-              //       client_id: "Peis_App",
-              //       grant_type: "password",
-              //       username: this.form.Username,
-              //       password: this.form.Password,
-              //       scope: "Peis offline_access",
-              //     },
-              //     {
-              //       headers: {
-              //         "Content-Type": "application/x-www-form-urlencoded",
-              //       },
-              //     }
-              //   );
-              // } else {
-              //   this.$message.warning(ret.data.msg);
-              // }
             })
-            // .then((res) => {
-            //   writetoken(res.data.expires_in);
-            //   window.localStorage.setItem("token", res.data.access_token);
-            //   window.localStorage.setItem(
-            //     "refresh_token",
-            //     res.data.refresh_token
-            //   );
-            //   window.localStorage.setItem("tokentype", res.data.token_type);
-            //   window.localStorage.setItem("user", this.form.Username);
 
-            //   this.$router.push({ path: "home" });
-            //   this.$store.state.changepassword = this.form.Password;
-            // })
             .catch((err) => {});
-
-          //   console.log(res);
-          //   if (res.data.code == 1 && res.code == 1) {
-          //     console.log(res.data.msg);
-          //     postapi()
-          //     let ress = await this.$axios.post(
-          //       mm.apiurl + "/connect/token",
-          //       {
-          //         client_id: "Peis_App",
-          //         grant_type: "password",
-          //         username: this.form.Username,
-          //         password: this.form.Password,
-          //         scope: "Peis offline_access",
-          //       },
-          //       {
-          //         headers: {
-          //           "Content-Type": "application/x-www-form-urlencoded",
-          //         },
-          //       }
-          //     );
-          //     if (ress.status == 200) {
-          //       writetoken(ress.data.expires_in);
-          //       window.localStorage.setItem("token", ress.data.access_token);
-          //       window.localStorage.setItem(
-          //         "refresh_token",
-          //         ress.data.refresh_token
-          //       );
-          //       window.localStorage.setItem("tokentype", ress.data.token_type);
-          //       window.localStorage.setItem("user", this.form.Username);
-          //       this.$message.success(res.data.msg, "登录成功");
-          //       this.$router.push({ path: "home" });
-          //     }
-          //   } else {
-          //     console.log();
-          //     this.$message.warning(res.data.msg);
-          //   }
-          // } catch (err) {
-          //   console.log(err);
-          // }
-
-          // await getapi("/api/identity/users/login", {
-          //   username: this.form.Username,
-          //   password: this.form.Password,
-          // }).then((ress) => {
-          //   if (ress.data.code == 1 && ress.code == 1) {
-          //     // console.log(msg);
-          //     postapi(mm.apiurl + "/connect/token", {
-          //       client_id: "Peis_App",
-          //       grant_type: "password",
-          //       username: this.form.Username,
-          //       password: this.form.Password,
-          //       scope: "Peis offline_access",
-          //     }).then((res) => {
-          //       console.log(res);
-
-          //       writetoken(res.data.expires_in);
-          //       window.localStorage.setItem("token", res.data.access_token);
-          //       window.localStorage.setItem(
-          //         "refresh_token",
-          //         res.data.refresh_token
-          //       );
-          //       window.localStorage.setItem("tokentype", res.data.token_type);
-          //       window.localStorage.setItem("user", this.form.Username);
-          //       this.$message.success("登录成功");
-          //       this.$router.push({ path: "home" });
-
-          //       this.$store.state.changepassword = this.form.Password;
-          //     });
-          //   } else {
-          //     this.$message.warning(res.data.msg);
-          //   }
-          // });
-
-          // this.$axios
-          //   .post(
-          //     mm.apiurl + "/connect/token",
-          //     {
-          //       client_id: "Peis_App",
-          //       grant_type: "password",
-          //       username: this.form.Username, //admin
-          //       password: this.form.Password, //1q2w3E
-          //       scope: "Peis offline_access",
-          //     },
-          //     {
-          //       headers: {
-          //         "Content-Type": "application/x-www-form-urlencoded",
-          //       },
-          //     }
-          //   )
-          //   .then((res) => {
-          //     console.log(res, "222222");
-
-          //     if (res.status == 200) {
-          //       //console.log(res.data)
-          //       writetoken(res.data.expires_in);
-          //       window.localStorage.setItem("token", res.data.access_token);
-          //       window.localStorage.setItem(
-          //         "refresh_token",
-          //         res.data.refresh_token
-          //       );
-          //       // window.localStorage.setItem("expires_in", res.data.expires_in);
-          //       window.localStorage.setItem("tokentype", res.data.token_type);
-          //       window.localStorage.setItem("user", this.form.Username);
-          //       this.$message.success("登录成功");
-          //       this.$router.push({ path: "home" });
-          //       // this.$store.dispatch('changepassword',this.form.Password)
-          //       this.$store.state.changepassword = this.form.Password;
-          //     } else {
-          //       this.$message.warning("用户名或密码错误");
-          //     }
-          // });
         }
       });
     },
-    tuichui() {
-      let token = localStorage.getItem("token");
-      let tokentype = localStorage.getItem("tokentype");
-      this.$axios
-        .get("http://192.168.1.108:44394/api/identity/users", {
-          params: {
-            SkipCount: 1,
-            MaxResultCount: 1,
-          },
-          headers: {
-            Authorization: `${tokentype} ${token}`,
-          },
-        })
-        .then((res) => {
-          console.log(res);
-        });
-    },
-    users() {
-      this.$axios.put(
-        "http://192.168.1.108:44394/api/permission-management/permissions",
-        {
-          providerName: "R",
-          providerKey: "sdsaf",
-        }
-      );
-    },
-  },
-  created() {
-    // let date = moment();
-    // date.add(3600, 's');
-    // console.log(parseInt(new Date(date).getTime() / 1000) + '')
-    // // console.log(this.$moment);
-    // console.log('33');
-    // console.log(parseInt(new Date().getTime() / 1000) + '');
   },
+  created() {},
 };
 </script>
 <style lang="scss" scoped>
@@ -323,7 +143,12 @@ export default {
   width: 100%;
   min-height: 100vh;
 }
-
+.el-form-item.is-error .el-input__inner {
+  color: none;
+}
+.inputcolor {
+  border: none;
+}
 .box {
   width: 400px;
   height: 300px;
@@ -331,7 +156,7 @@ export default {
   // background: #fff;
   // background: rgb(185, 251, 211);
   // box-shadow: 0 6px #99907e;
-  // background: rgba(186, 251, 185, 1);
+  // background: #fff;
   // opacity: 0.4;
   position: absolute;
   left: 50%;
@@ -346,7 +171,8 @@ export default {
     text-align: center;
     font-weight: 700;
     font-size: 20px;
-    color: rgba(73, 73, 73, 1);
+    // color: rgba(73, 73, 73, 1);
+    color: #000;
     opacity: 0.7;
   }
 }
@@ -358,8 +184,12 @@ export default {
 // .btn :hover {
 //   // background-color: rgb(0, 183, 92);
 // }
+::v-deep .el-input__icon {
+  font-size: 18px;
+}
 .btn {
   background-color: rgb(0, 183, 92);
+  font-size: 17px;
   // background-color: #ccc;
   border: none;
   color: #fff;
diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue
index 6035ef3..e67698e 100644
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -183,6 +183,7 @@ export default {
     cascaderchang(v) {
       console.log(this.departmentname);
       this.departmentname = v[v.length - 1];
+      localStorage.setItem("departmentname", v[v.length - 1]);
       // console.log(v[v.length-1]);
       // v.forEach((item) => {
       //   this.departmentname = item;
@@ -371,6 +372,8 @@ export default {
     },
     //编辑组织
     rena(node, data) {
+      console.log(this.departmentname);
+      this.departmentname = localStorage.getItem("departmentname");
       console.log(data, "data");
       this.dialogVisible = true;
       this.title = 2;
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index 3e71e8f..60e02be 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -7,7 +7,7 @@
       >
       <el-row style="margin-top: 10px">
         <el-form ref="form" :model="form">
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="用户查询">
               <el-input
                 v-model="pages.Filter"
@@ -184,7 +184,6 @@
             </el-checkbox-group>
           </el-tab-pane>
           <el-tab-pane label="组织架构">
-
             <!-- :default-checked-keys="defaultKeys" -->
             <!-- <el-tree
               :props="{
@@ -200,8 +199,11 @@
               ref="trees"
             >
             </el-tree> -->
+            <div>
+              当前选中的组织<span> {{ orgId }}</span>
+            </div>
             <el-cascader
-            v-model="defaultKeys"
+              v-model="orgId"
               :options="organizationalstructure"
               :show-all-levels="false"
               :props="{
@@ -212,9 +214,7 @@
               }"
             ></el-cascader>
           </el-tab-pane>
-          <el-tab-pane label="科室设置">
-            <!-- :default-checked-keys="defaultKeys"  /api/app/abpuserdepartment/createmany-->
-
+          <el-tab-pane label="科室设置1">
             <el-tree
               :props="{
                 label: 'displayName',
@@ -366,7 +366,6 @@
             </el-tab-pane>
           </el-tabs>
         </el-form>
-
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
           <el-button type="primary" @click="addlsit">确 定</el-button>
@@ -501,6 +500,7 @@ let validatePassword = /^[a-zA-Z0-9@\$\^\.\*\\?]\{6,15}$/;
 export default {
   data() {
     return {
+      orgId: [],
       confarmPassWord: "", //确认密码
       usersName: "", //用户名
       defaultchekedKeys: [], //默认选中的科室
@@ -850,7 +850,7 @@ export default {
               });
             }
           } else if (this.title == 2) {
-            console.log(this.form.roleNames);
+            console.log(this.orgId);
 
             // this.roleNames=arrs
             let obj = {
@@ -875,18 +875,18 @@ export default {
                   this.dialogVisible = false;
                   this.getlist();
                 }
-
                 console.log(res);
                 if (res.code == 1) {
                   selectbinding({
                     userId: this.form.id,
-                    orgId: this.defaultKeys,
+                    orgId: this.orgId[0],
                   }).then((res) => {
                     console.log(res);
                     postapi(
                       `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
-                      this.department
+                      this.orgId
                     ).then((res) => {
+                      console.log(this.orgId);
                       // this.$message.success("操作成功");
                     });
                     // this.$message.success("修改绑定组织成功");
@@ -954,6 +954,9 @@ export default {
           this.setupdepartments = res.data;
           console.log(res, "sssssss");
         });
+        // postapi(`/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,{orgId:this.orgId[0]}).then(res=>{
+        //   console.log(res,'wwwwwwwwwwwww');
+        // })
         useraffiliation(this.form.id).then((res) => {
           console.log(res.data.items);
           if (res.data.items && res.data.items.length > 0) {
@@ -1006,6 +1009,8 @@ export default {
       });
       console.log(row);
       usersinits(row.id).then((res) => {
+        this.orgId = res.data[0].displayName;
+        console.log(this.orgId);
         console.log("zzz这里", res);
         let list = res.data;
         this.defaultKeys = list.map((item) => {