DESKTOP-SVI9JE1\muzen hace 1 año
padre
commit
c4f663b014
Se han modificado 2 ficheros con 20 adiciones y 14 borrados
  1. 18 12
      src/layout/components/Navbar.vue
  2. 2 2
      src/views/login.vue

+ 18 - 12
src/layout/components/Navbar.vue

@@ -1,32 +1,33 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container"
-      @toggleClick="toggleSideBar" />
+    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!settingsStore.topNav" />
     <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
 
     <div class="right-menu">
+      <template v-if="appStore.device !== 'mobile'">
+        <header-search id="header-search" class="right-menu-item" />
+      </template>
       <div class="avatar-container">
-        <div class="avatar-wrapper">
+        <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
+          <div class="avatar-wrapper">
             <img :src="userStore.avatar" class="user-avatar" />
-            <!-- <el-icon><caret-bottom /></el-icon> -->
+            <el-icon><caret-bottom /></el-icon>
           </div>
-        <!-- <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click"> -->
-
-          <!-- <template #dropdown>
+          <template #dropdown>
             <el-dropdown-menu>
               <router-link to="/user/profile">
                 <el-dropdown-item>个人中心</el-dropdown-item>
               </router-link>
-              <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
+              <!-- <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
                 <span>布局设置</span>
-              </el-dropdown-item>
+              </el-dropdown-item> -->
               <el-dropdown-item divided command="logout">
                 <span>退出登录</span>
               </el-dropdown-item>
             </el-dropdown-menu>
-          </template> -->
-        <!-- </el-dropdown> -->
+          </template>
+        </el-dropdown>
       </div>
     </div>
   </div>
@@ -37,6 +38,11 @@ import { ElMessageBox } from 'element-plus'
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
+import Screenfull from '@/components/Screenfull'
+import SizeSelect from '@/components/SizeSelect'
+import HeaderSearch from '@/components/HeaderSearch'
+import RuoYiGit from '@/components/RuoYi/Git'
+import RuoYiDoc from '@/components/RuoYi/Doc'
 import useAppStore from '@/store/modules/app'
 import useUserStore from '@/store/modules/user'
 import useSettingsStore from '@/store/modules/settings'
@@ -151,7 +157,7 @@ function setLayout() {
         position: relative;
 
         .user-avatar {
-          // cursor: pointer;
+          cursor: pointer;
           width: 40px;
           height: 40px;
           border-radius: 10px;

+ 2 - 2
src/views/login.vue

@@ -52,8 +52,8 @@ const router = useRouter();
 const { proxy } = getCurrentInstance();
 
 const loginForm = ref({
-  username: "admin",
-  password: "admin123",
+  username: "",
+  password: "",
   rememberMe: false,
   // code: "",
   uuid: ""