Merge branch 'master' of http://gitlab.ldxinyong.com/entut push -u or maerpriseManagement/lz_management_vue

src/router/index.js

@@ -75,7 +75,17 @@ router.beforeEach((to, from, next) => {
   // 2. 获取菜单列表, 添加并保存本地存储
   if (router.options.isAddDynamicMenuRoutes || fnCurrentRouteType(to, globalRoutes) === 'global') {
     next()
-  } else {
+  } /*else if (fnIsInRoutes(to, configRoutes)) {//判断是否全屏路由
+    console.log(to)
+    let newpage = router.resolve({ 
+      name: to.path,
+      query:to.query
+    })
+    
+    console.log(newpage.href)
+    window.open(newpage.href, '_blank')
+    next()
+  }*/ else {
     apiGetMenuNav({}).then(res => {
       if (res && res.code === 0) {
         fnAddDynamicMenuRoutes(res.menuList)
@@ -108,6 +118,15 @@ function fnCurrentRouteType (route, globalRoutes = []) {
   return temp.length >= 1 ? fnCurrentRouteType(route, temp) : 'main'
 }
 
+function fnIsInRoutes(route, routes = []){
+  for(var i = 0; i < routes.length; i++) {
+    if(route.path === routes[i].path){
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
  * 添加动态(菜单)路由
  * @param {*} menuList 菜单列表

src/views/layout/main.vue

@@ -86,7 +86,9 @@
             this.userName = res.user.username
             this.$store.state.user = res.user
             this.mobile = res.user.mobile
-            this.$watermark.set(this.userName + ' ' + this.mobile.substr(0, 4))
+            console.log('真实姓名' + res.user.realName);
+
+            this.$watermark.set(res.user.realName + ' ' + this.mobile.substr(7, 4))
           } else {
             this.$message.error(res.msg)
           }

src/views/modules/result/record/recorddetail-add-or-update.vue

@@ -297,7 +297,7 @@ export default {
             }
             if (this.keyResultEditorElem3_7 !== null) {
               if (this.dataForm.keyResult37 !== null) {
-                this.keyResultEditorElem3_7.txt.html(this.dataForm.keyResult35 || '')
+                this.keyResultEditorElem3_7.txt.html(this.dataForm.keyResult37 || '')
               } else {
                 this.keyResultEditorElem3_7.txt.html('<p>无</p>')
               }

src/views/modules/result/record/recorddetail.vue

@@ -147,7 +147,7 @@ import UploadAddOrUpdate from './upload-add-or-update.vue'
 export default {
   created () {
     console.log(window.innerHeight)
-    this.clientHeight = window.innerHeight - 273
+    this.clientHeight = window.innerHeight - 343
     console.log(this.clientHeight)
     this.stepList.forEach(item => item.name = item.name.slice(-2))
   },