merge 合并logo到main

src/components/menu/SideMenu.vue

@@ -5,7 +5,7 @@
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">
-    <logo />
+    <logo :show-title="!collapsed"/>
     <s-menu
       :collapsed="collapsed"
       :menu="menus"

src/components/tools/Logo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="logo">
+  <div class="logo" :class="!showTitle ? 'h1-logo' : ''">
     <router-link :to="routerLinkTo">
 
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
@@ -7,7 +7,9 @@
       <!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
 
-      <h1 v-if="showTitle">{{ title }}</h1>
+      <img v-if="showTitle" src='../../assets/image/analysisLogo.png' alt="logo"/>
+      <!--<img src="~@/assets/image/analysisLogo.png" alt="logo">-->
+      <h1 v-else>{{ title }}</h1>
     </router-link>
   </div>
 </template>
@@ -21,7 +23,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: '研发云平台',
+      default: 'SRMS',
       required: false
     },
     showTitle: {
@@ -43,7 +45,9 @@ export default {
 
 .sider {
   box-shadow: none !important;
-
+  .h1-logo {
+    padding-left: 10px;
+  }
   .logo {
     height: @height !important;
     line-height: @height !important;
@@ -52,7 +56,8 @@ export default {
     background-color: transparent !important;
 
     h1 {
-      color: #222222 !important;
+      color: @primary-color !important;
+      font-weight: 700;
     }
 
     a {