Skip to content

platform / fanxing_new

Go to a project
Commit 6f6a48e2 by 潘建波
Options

合并冲突

2 parents dd726b75 1fd77efe
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
src/views/Layout/index.vue
...@@ -102,7 +102,7 @@ export default { ...@@ -102,7 +102,7 @@ export default {
getDate() { getDate() {
let date = new Date(); let date = new Date();
let Y = date.getFullYear(); let Y = date.getFullYear();
let M = date.getMonth() > 9 ? date.getMonth() : `0${date.getMonth() + 1}`; let M = date.getMonth() > 9 ? date.getMonth() + 1 : `0${date.getMonth() + 1}`;
let D = date.getDate() > 9 ? date.getDate() : `0${date.getDate()}`; let D = date.getDate() > 9 ? date.getDate() : `0${date.getDate()}`;
let h = date.getHours() > 9 ? date.getHours() : `0${date.getHours()}`; let h = date.getHours() > 9 ? date.getHours() : `0${date.getHours()}`;
let m = let m =
...@@ -228,7 +228,7 @@ export default { ...@@ -228,7 +228,7 @@ export default {
type: "warning", type: "warning",
}); });
this.logout(); this.logout();
}, 600000); }, 1000 * 60 * 60 * 6);
}); });
// window.onresize = function() { // window.onresize = function() {
// console.log("full",that.isfull) // console.log("full",that.isfull)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!