liyongli 2 年之前
父节点
当前提交
ab6f337e33
共有 2 个文件被更改,包括 6 次插入5 次删除
  1. 2 1
      src/main.js
  2. 4 4
      src/views/report/Mobile/index.vue

+ 2 - 1
src/main.js

@@ -9,7 +9,8 @@ Vue.use(ElementUI);
 
 router.beforeEach((to, from, next) => {
   if (to.meta.title) document.title = to.meta.title;
-  if (to.path === '/traditional' || to.path === '/advertisement') return next();
+  console.log(to.path)
+  if (to.path === '/traditional' || to.path === '/advertisement' || to.path === '/Mobile') return next();
   if (!localStorage.user) {
     // apply 必须拿到oa用户数据
     getUser(() => next())

+ 4 - 4
src/views/report/Mobile/index.vue

@@ -295,10 +295,10 @@ export default {
       let N = this.formatNum(num, 2);
       let wei = "";
       if (N >= 100000000) {
-        N = (N / 100000000).toFixed(0);
+        N = (N / 100000000).toFixed(1);
         wei = "亿";
       } else if (N >= 10000) {
-        N = (N / 10000).toFixed(1);
+        N = (N / 10000).toFixed(0);
         wei = "万";
       }
       N = N.toString().split(".");
@@ -310,8 +310,8 @@ export default {
     },
     timeFormat(t) {
       let Time = t || 0;
-      if (Time >= 100000000) Time = (Time / 100000000).toFixed(0) - 0 + "亿";
-      else if (Time >= 10000) Time = (Time / 10000).toFixed(1) - 0 + "万";
+      if (Time >= 100000000) Time = (Time / 100000000).toFixed(1) - 0 + "亿";
+      else if (Time >= 10000) Time = (Time / 10000).toFixed(0) - 0 + "万";
       return Time;
     },
     showPopup(i) {