From 9de3eb49d1623b014ffd1e719c94cce6de36fc7a Mon Sep 17 00:00:00 2001 From: liwei Date: Mon, 15 Nov 2021 10:36:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DataP/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/DataP/index.vue b/src/views/DataP/index.vue index 4d45cb8..bfe1fae 100644 --- a/src/views/DataP/index.vue +++ b/src/views/DataP/index.vue @@ -135,7 +135,9 @@ export default { }, // 获取列表数据 getData() { - const _this = this + const _this = this; + _this.time=moment().format('YYYY-MM-DD'); + console.log('time', _this.time); getWorkorder({ workLineId:this.titleData[this.getQueryVariable('type')]?this.titleData[this.getQueryVariable('type')].workLineId:'', date:moment().format('YYYY-MM-DD') From 73d2d4d553c3c81ae1cb903b02237d160eb3b3c0 Mon Sep 17 00:00:00 2001 From: liwei Date: Mon, 15 Nov 2021 10:37:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DataP/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/DataP/index.vue b/src/views/DataP/index.vue index bfe1fae..fd38d59 100644 --- a/src/views/DataP/index.vue +++ b/src/views/DataP/index.vue @@ -140,7 +140,7 @@ export default { console.log('time', _this.time); getWorkorder({ workLineId:this.titleData[this.getQueryVariable('type')]?this.titleData[this.getQueryVariable('type')].workLineId:'', - date:moment().format('YYYY-MM-DD') + date:_this.time }).then(({ code, data From a535129590a7c04739d37fbe848303e14b88a1cd Mon Sep 17 00:00:00 2001 From: liwei Date: Mon, 15 Nov 2021 13:37:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/permission.js b/src/permission.js index b559eb9..affa410 100644 --- a/src/permission.js +++ b/src/permission.js @@ -18,7 +18,7 @@ router.beforeEach(async(to, from, next) => { // determine whether the user has logged in const hasToken = getToken(); // 如果是大屏展示，直接跳转至页面 - if(to.path=='/datal' || to.path=='/dataL'){ + if(to.path.toLowerCase()=='/datal' || to.path.toLowerCase()=='/datap'){ next(); return; }