对照设计图修改页面

jero-web/src/components/tools/Logo.vue

@@ -1,13 +1,11 @@
 <template>
   <div class="logo">
     <router-link :to="{name:'dashboard'}">
-
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-<!--      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo">-->
-<!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
+      <img src="~@/assets/logo.png" alt="logo" class="logoImg">
+      <!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-
-      <h1 v-if="showTitle">{{ title }}</h1>
+      <span v-if="showTitle" class="logoTitle">{{ title }}</span>
     </router-link>
   </div>
 </template>
@@ -21,7 +19,7 @@
     props: {
       title: {
         type: String,
-        default: '蔚来法规',
+        default: 'GPR',
         required: false
       },
       showTitle: {
@@ -38,6 +36,7 @@
 
   .sider {
     box-shadow: none !important;
+
     .logo {
       height: @height !important;
       line-height: @height !important;
@@ -46,6 +45,7 @@
 
       a {
         color: white;
+
         &:hover {
           color: rgba(255, 255, 255, 0.8);
         }
@@ -53,7 +53,22 @@
     }
 
     &.light .logo {
-      background-color: @primary-color;
+      background-color: #EFF1F3;
     }
   }
+
+  // <!--background-color: @primary-color;-->
+  .logoImg {
+    width: 90px;
+    height: 29px;
+  }
+
+  .logoTitle {
+    font-size: 25px;
+    font-weight: 300 !important;
+    color: #040B29;
+    display: inline-block;
+    position: absolute;
+    opacity: 0.5;
+  }
 </style>

jero-web/src/components/tools/UserMenu.vue

@@ -2,27 +2,27 @@
   <div class="user-wrapper" :class="theme">
     <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
     <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
-    <span class="action" @click="showClick">
-      <a-icon type="search"></a-icon>
-    </span>
+<!--    <span class="action" @click="showClick">-->
+<!--      <a-icon type="search"></a-icon>-->
+<!--    </span>-->
     <!-- update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">
-      <a-select
-        class="search-input"
-        showSearch
-        :showArrow="false"
-        placeholder="搜索菜单"
-        optionFilterProp="children"
-        :filterOption="filterOption"
-        :open="isMobile()?true:null"
-        :getPopupContainer="(node) => node.parentNode"
-        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"
-        @change="searchMethods"
-        @blur="hiddenClick"
-      >
-        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>
-      </a-select>
-    </component>
+<!--    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">-->
+<!--      <a-select-->
+<!--        class="search-input"-->
+<!--        showSearch-->
+<!--        :showArrow="false"-->
+<!--        placeholder="搜索菜单"-->
+<!--        optionFilterProp="children"-->
+<!--        :filterOption="filterOption"-->
+<!--        :open="isMobile()?true:null"-->
+<!--        :getPopupContainer="(node) => node.parentNode"-->
+<!--        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"-->
+<!--        @change="searchMethods"-->
+<!--        @blur="hiddenClick"-->
+<!--      >-->
+<!--        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>-->
+<!--      </a-select>-->
+<!--    </component>-->
     <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
@@ -39,7 +39,7 @@
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>
-        <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
+<!--        <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>-->
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
         <a-menu-item key="0">
@@ -70,6 +70,10 @@
           <a-icon type="sync"/>
           <span>清理缓存</span>
         </a-menu-item>
+        <a-menu-item key="6" @click="handleLogout">
+          <a-icon type="logout"/>
+          <span>退出登录</span>
+        </a-menu-item>
        <!-- <a-menu-item key="2" disabled>
           <a-icon type="setting"/>
           <span>测试</span>
@@ -83,12 +87,12 @@
         </a-menu-item>-->
       </a-menu>
     </a-dropdown>
-    <span class="action">
-      <a class="logout_title" href="javascript:;" @click="handleLogout">
-        <a-icon type="logout"/>
-        <span v-if="isDesktop()">&nbsp;退出登录</span>
-      </a>
-    </span>
+<!--    <span class="action">-->
+<!--      <a class="logout_title" href="javascript:;" @click="handleLogout">-->
+<!--        <a-icon type="logout"/>-->
+<!--        <span v-if="isDesktop()">&nbsp;退出登录</span>-->
+<!--      </a>-->
+<!--    </span>-->
     <user-password ref="userPassword"></user-password>
     <depart-select ref="departSelect" :closable="true" title="部门切换"></depart-select>
     <setting-drawer ref="settingDrawer" :closable="true" title="系统设置"></setting-drawer>
@@ -317,4 +321,10 @@
     color: inherit;
     text-decoration: none;
   }
+  .action {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+  .action .avatar{
+     background: #ccc !important;
+  }
 </style>