Merge branch 'dev_20241202_xukangle' into develop

@@ -52,20 +52,21 @@ onMounted(() => {
     </div> -->
     </div> -->
     <el-dropdown class="user-container" size="default" @command="userCommand">
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
       <div class="user-wrapper">
+
+        <div class="v-uerinfo">
+          <div class="v-top">{{ userStore.userName }}</div>
+          <div class="v-top"> {{ JSON.parse(loaclStorageInfo).abbreviation }}</div>
+        </div>
         <el-avatar size="small">
         <el-avatar size="small">
           <el-icon>
           <el-icon>
             <svg-icon name="ep:user-filled" />
             <svg-icon name="ep:user-filled" />
           </el-icon>
           </el-icon>
         </el-avatar>
         </el-avatar>
-        <div class="v-uerinfo">
-          <div class="v-top">{{ userStore.userName }}</div>
-          <div class="v-top"> {{ JSON.parse(loaclStorageInfo).abbreviation }}</div>
-        </div>
-        <div>
+        <!-- <div>
           <el-icon>
           <el-icon>
             <svg-icon name="ep:caret-bottom" />
             <svg-icon name="ep:caret-bottom" />
           </el-icon>
           </el-icon>
-        </div>
+        </div> -->
       </div>
       </div>
       <template #dropdown>
       <template #dropdown>
         <el-dropdown-menu class="user-dropdown">
         <el-dropdown-menu class="user-dropdown">
@@ -87,8 +88,20 @@ onMounted(() => {
 .tools {
 .tools {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  padding: 0 20px;
+  padding: 0 10px !important;
   white-space: nowrap;
   white-space: nowrap;
+  position: relative;
+  margin-left: 16px;
+
+  &::before {
+    content: '';
+    height: 35px;
+    border-left: 1px solid #fff;
+    position: absolute;
+    top: 50%;
+    left: -1px;
+    transform: translateY(-50%);
+  }
 
 
   .buttons {
   .buttons {
     margin-right: 20px;
     margin-right: 20px;
@@ -160,10 +173,14 @@ onMounted(() => {
       display: flex;
       display: flex;
       flex-direction: column;
       flex-direction: column;
       font-size: 12px;
       font-size: 12px;
+      margin-right: 6px;
+
 
 
       .v-top {
       .v-top {
         height: 18px;
         height: 18px;
         line-height: 18px;
         line-height: 18px;
+        text-align: right;
+        max-width: 120px;
       }
       }
     }
     }