框架调整

yudao-ui/yudao-ui-admin-vue/src/assets/styles/index.scss

@@ -122,6 +122,12 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 20px;
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  position: absolute;
+  right: 0;
+  top:50px;
 }
 
 .components-container {

yudao-ui/yudao-ui-admin-vue/src/components/AppList/index.vue

@@ -43,7 +43,7 @@
         </div>
       </div> -->
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane v-for="item in appList" :label="item.name" :name="item.type">
+        <el-tab-pane v-for="item,index in appList" :label="item.name" :name="item.type" :key="index">
           <div class="app-item" v-for="(childItem,index) in item.list" :key="index" @click="handleSelect(childItem)" @mouseover="showContent=index" @mouseleave="showContent=null">
             <svg-icon :icon-class="childItem.icon" style="width: 40px;height: 40px"/>
             {{ childItem.title }}
@@ -115,7 +115,7 @@ export default {
             },
             {
               type:2,
-              path: '/',
+              path: '/system/user',
               title: '请假',
               icon: 'qingjia',
             },

yudao-ui/yudao-ui-admin-vue/src/layout/components/AppMain.vue

@@ -29,7 +29,8 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  // min-height: calc(100vh - 50px);
+  min-height: calc(100vh - 0px);
   width: 100%;
   position: relative;
   overflow: hidden;

yudao-ui/yudao-ui-admin-vue/src/layout/components/Navbar.vue

@@ -7,10 +7,10 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" /> -->
 
         <!-- 站内信 -->
-        <notify-message class="right-menu-item hover-effect" />
+        <!-- <notify-message class="right-menu-item hover-effect" />
 
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
@@ -24,22 +24,31 @@
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
+        <el-tooltip content="文档地址" effect="dark" placement="bottom">
+          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
+        </el-tooltip>
+        <el-tooltip content="联系我们" effect="dark" placement="bottom">
+          <div class="right-menu-item hover-effect">
+            <i class="el-icon-service" @click="childMethod()"></i>
+          </div>
+        </el-tooltip>
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <!-- <img :src="avatar" class="user-avatar"> -->
+          <img src="https://static-legacy.dingtalk.com/media/lQLPD4bTZ9hFfEHNAl_NAl-wu2M_jTTO8eEGNqKVr0MUAA_607_607.png" class="user-avatar">
           <span v-if="nickname" class="user-nickname">{{ nickname }}</span>
-          <i class="el-icon-caret-bottom" />
+          <!-- <i class="el-icon-caret-bottom" /> -->
         </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
           </router-link>
           <el-dropdown-item @click.native="setting = true">
-            <span>布局设置</span>
+            <span>企业管理</span>
           </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
@@ -100,6 +109,9 @@ export default {
     }
   },
   methods: {
+    childMethod() {
+        this.$parent.fatherMethod();
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },

yudao-ui/yudao-ui-admin-vue/src/layout/index.vue

@@ -12,6 +12,10 @@
         <settings />
       </right-panel>
     </div>
+    <el-dialog title="联系我们" :visible.sync="dialogVisible" width="30%">
+      <img width="100%" src="../assets/images/wx.jpg" alt="">
+
+    </el-dialog>
   </div>
 </template>
 
@@ -24,6 +28,11 @@ import variables from '@/assets/styles/variables.scss'
 
 export default {
   name: 'Layout',
+  data() {
+    return {
+      dialogVisible: false,
+    }
+  },
   components: {
     AppMain,
     Navbar,
@@ -55,6 +64,9 @@ export default {
     }
   },
   methods: {
+    fatherMethod() {
+      this.dialogVisible = true;
+    },
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     }