Browse Source

Merge pull request '时间更新' (#149) from liwei into develop

Reviewed-on: #149
Reviewed-by: wangxy <xinyao.wang@le-it.com.cn>
pull/150/head
wangxy 3 years ago
parent
commit
28d59a86f5
2 changed files with 5 additions and 3 deletions
  1. +1
    -1
      src/permission.js
  2. +4
    -2
      src/views/DataP/index.vue

+ 1
- 1
src/permission.js View File

@ -18,7 +18,7 @@ router.beforeEach(async(to, from, next) => {
// determine whether the user has logged in // determine whether the user has logged in
const hasToken = getToken(); const hasToken = getToken();
// 如果是大屏展示,直接跳转至页面 // 如果是大屏展示,直接跳转至页面
if(to.path=='/datal' || to.path=='/dataL'){
if(to.path.toLowerCase()=='/datal' || to.path.toLowerCase()=='/datap'){
next(); next();
return; return;
} }


+ 4
- 2
src/views/DataP/index.vue View File

@ -135,10 +135,12 @@ export default {
}, },
// //
getData() { getData() {
const _this = this
const _this = this;
_this.time=moment().format('YYYY-MM-DD');
console.log('time', _this.time);
getWorkorder({ getWorkorder({
workLineId:this.titleData[this.getQueryVariable('type')]?this.titleData[this.getQueryVariable('type')].workLineId:'', workLineId:this.titleData[this.getQueryVariable('type')]?this.titleData[this.getQueryVariable('type')].workLineId:'',
date:moment().format('YYYY-MM-DD')
date:_this.time
}).then(({ }).then(({
code, code,
data data


Loading…
Cancel
Save