Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

 <template>
 <template>
   <div class="navbar-con">
   <div class="navbar-con">
     <div class="navbar">
     <div class="navbar">
-      <div class="title">{{ title }}</div>
+      <div class="title">{{ dicData['sysCode'][0].DNAME }}</div>
       <div class="user">欢迎进入系统 {{ name }} <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />退出系统</div>
       <div class="user">欢迎进入系统 {{ name }} <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />退出系统</div>
       <div class="sidebarLeft">
       <div class="sidebarLeft">
         <sidebarLeft />
         <sidebarLeft />
@@ -13,7 +13,6 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import defaultSettings from '@/settings'
 import sidebarLeft from './Sidebar/sidebarLeft'
 import sidebarLeft from './Sidebar/sidebarLeft'
 import sidebarRight from './Sidebar/sidebarRight'
 import sidebarRight from './Sidebar/sidebarRight'
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
@@ -23,16 +22,10 @@ export default {
     sidebarRight
     sidebarRight
   },
   },
   computed: {
   computed: {
-    ...mapGetters(['sidebar', 'avatar', 'name'])
-  },
-  data () {
-    return {
-      title: defaultSettings.title
-    }
+    ...mapGetters(['sidebar', 'dicData', 'name'])
   },
   },
   methods: {
   methods: {
     onCancel () {
     onCancel () {
-
     }
     }
   }
   }
 }
 }

@@ -183,7 +183,6 @@ table th {
 table td {
 table td {
   box-sizing: border-box;
   box-sizing: border-box;
   border-bottom: none !important;
   border-bottom: none !important;
-  ;
 }
 }
 
 
 //去掉最下面的那一条线
 //去掉最下面的那一条线
@@ -197,8 +196,8 @@ table td {
 }
 }
 
 
 .el-table__body tr:hover {
 .el-table__body tr:hover {
-  background: rgba(2, 160, 253, 0.3) !important;
-  box-shadow: inset 0px 0px 18px 0px #02A0FD !important;
+  background: #063160 !important;
+  box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
 }
 }
 
 
 .el-table__body tr:hover>td {
 .el-table__body tr:hover>td {

@@ -10,7 +10,7 @@
         }
         }
 
 
         .el-table__row .cell {
         .el-table__row .cell {
-            color: #ACEFFA !important;
+            color: #DBFAFF !important;
         }
         }
 
 
         .el-table__row {
         .el-table__row {