Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0

* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  优化
  优化
  优化

src/components/kpi-layout/NavBar.vue

@@ -20,8 +20,10 @@
         </div> -->
        </transition>
        <div>{{isNav}}---{{this.userInfo.realName}}</div>
-       <div class="navBar-right" v-if="isNav">
+       <div class="navBar-right">
-          <span>{{this.userInfo.realName}}</span>
+          <span>{{this.userInfo.realName}}</span><span>{{this.userInfo}}</span><span>熊承强</span>
+          <img  src="/static/default.jpg" />
+          <img src="../../..//static/default.jpg" />
           <img onerror="javascript:this.src='/static/default.jpg';" :src="this.userInfo.avatar || ''" alt="">
         </div>
     </div>
@@ -54,6 +56,7 @@ export default {
   },
   beforeMount () {},
   mounted () {
+    console.log('userInfo: ', this.userInfo)
   },
   methods: {
     handleToRouter (item) {

src/components/kpi-layout/NavHeader.vue

@@ -33,7 +33,9 @@ export default {
       console.log('this.isPopup: ', this.isPopup)
       if (this.isPopup) return this.open()
       history.go(-1)
-      // this.$router.go(-1)
+      console.log('history: ', history)
+      console.log('this.$router: ', this.$router)
+      this.$router.go(-1)
     },
     open () {
       const obj = {

src/router/index.js

@@ -13,6 +13,6 @@ const router = [
 
 export default new Router({
   base: '/digitization/',
-  mode: 'history',
+  // mode: 'history',
   routes: [...configRouter, ...kpiRouter, ...router]
 })