Merge remote-tracking branch 'origin/codeCheck' into codeCheck

2020-09-07 19:50:47 +08:00
parent 6d6e52b0a0 f5516e5022
commit aa05a8c111
40 changed files with 375 additions and 151 deletions
--- a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
@@ -90,7 +90,7 @@
          intervale: 0,
          rotate: 0,
          formatter: function (value) {
-            value=bus.computeTimezone(value)
+            value=value
            var t_date = new Date(value);
            return [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + "\n"
              + [t_date.getHours(), t_date.getMinutes()].join(':');