Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
platform
/
fanxing_new
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 6f6a48e2
authored
3 years ago
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
合并冲突
2 parents
dd726b75
1fd77efe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
public/js/version.json
src/views/Layout/index.vue
public/js/version.json
View file @
6f6a48e
{
"commit"
:
"4b64e700aabddfd8a3571739b1bece4194641df5"
,
"commitDate"
:
"2021-9-27 18:45"
,
"buildDate"
:
"2021-11-11 16:23"
,
"version"
:
"2.1.0"
,
"info"
:
"【BUG】存储配置导出"
}
\ No newline at end of file
{
"commit"
:
"4b64e700aabddfd8a3571739b1bece4194641df5"
,
"commitDate"
:
"2021-9-27 18:45"
,
"buildDate"
:
"2021-11-11 16:23"
,
"version"
:
"2.1.0"
,
"info"
:
"【BUG】存储配置导出"
}
This diff is collapsed.
Click to expand it.
src/views/Layout/index.vue
View file @
6f6a48e
...
...
@@ -102,7 +102,7 @@ export default {
getDate
()
{
let
date
=
new
Date
();
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
h
=
date
.
getHours
()
>
9
?
date
.
getHours
()
:
`0
${
date
.
getHours
()}
`
;
let
m
=
...
...
@@ -228,7 +228,7 @@ export default {
type
:
"warning"
,
});
this
.
logout
();
},
600000
);
},
1000
*
60
*
60
*
6
);
});
// window.onresize = function() {
// console.log("full",that.isfull)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment