合并冲突

public/js/version.json

-{"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】存储配置导出"}

src/views/Layout/index.vue

@@ -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 {
           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)