From 0bd8884aa388774f0b4eb66c0252b637eba7681b Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 3 Sep 2020 16:22:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5table=E7=9A=84maxsheight=E7=9A=84?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/result/record/recorddetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 7d3f5d3..1e7a680 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/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)) }, From f3d9a644b47c267db6ec7af0b336feadab3e10c8 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 3 Sep 2020 18:56:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E5=8D=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/main.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/layout/main.vue b/src/views/layout/main.vue index 138c088..c0924a6 100644 --- a/src/views/layout/main.vue +++ b/src/views/layout/main.vue @@ -86,7 +86,7 @@ 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)) + this.$watermark.set(this.realName + ' ' + this.mobile.substr(0, 4)) } else { this.$message.error(res.msg) } From d52a473d28911ee8a25594928933e650c542cf95 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 3 Sep 2020 19:14:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BA=BF=E4=B8=8Aconsole?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B0=B4=E5=8D=B0=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 4 ++-- src/views/layout/main.vue | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 9cfb2fc..e87db19 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,9 +9,9 @@ import Router from 'vue-router' import { apiGetMenuNav } from '@/api/api_menu' import { isURL } from '@/utils/validate' import {clearLoginInfo} from '@/utils' -import VConsole from 'vconsole' +//import VConsole from 'vconsole' -let vConsole = new VConsole() +//let vConsole = new VConsole() Vue.use(Router) // 开发环境不使用懒加载, 因为懒加载页面太多的话会造成webpack热更新太慢, 所以只有生产环境使用懒加载 diff --git a/src/views/layout/main.vue b/src/views/layout/main.vue index c0924a6..f59357d 100644 --- a/src/views/layout/main.vue +++ b/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.realName + ' ' + 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) } From 0a82d7d2fe08edb25875f5a00b439ffc57d9282f Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Sep 2020 11:00:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D3.75=E5=88=86=E8=AF=84?= =?UTF-8?q?=E5=88=86=E6=A0=87=E5=87=86=E6=98=BE=E7=A4=BA3.5=E5=88=86?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/result/record/recorddetail-add-or-update.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/result/record/recorddetail-add-or-update.vue b/src/views/modules/result/record/recorddetail-add-or-update.vue index 8158a8f..6357d05 100644 --- a/src/views/modules/result/record/recorddetail-add-or-update.vue +++ b/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('

无

') } From b99cb1a331a505aa41893fdefd54bda72c961a62 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 7 Sep 2020 15:29:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index e87db19..9ae19c5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,9 +9,9 @@ import Router from 'vue-router' import { apiGetMenuNav } from '@/api/api_menu' import { isURL } from '@/utils/validate' import {clearLoginInfo} from '@/utils' -//import VConsole from 'vconsole' +import VConsole from 'vconsole' -//let vConsole = new VConsole() +let vConsole = new VConsole() Vue.use(Router) // 开发环境不使用懒加载, 因为懒加载页面太多的话会造成webpack热更新太慢, 所以只有生产环境使用懒加载 @@ -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 菜单列表