liyongli преди 2 години
родител
ревизия
c5d91b4969
променени са 1 файла, в които са добавени 6 реда и са изтрити 5 реда
  1. 6 5
      src/views/History/index.vue

+ 6 - 5
src/views/History/index.vue

@@ -126,8 +126,9 @@
           <div>{{ item.name }}</div>
           <div class="value">
             <!-- oriData.total.activeUser -->
+            {{item}}
             <countTo
-              v-if="!item.isNum || item.isSHU"
+              v-if="!item.isNum"
               :startVal="0"
               :endVal="item.value - 0"
               :duration="1500"
@@ -339,8 +340,8 @@ export default {
           for (let i = 0; i < keys.length; i++) {
             const v = keys[i];
             if (!total[v].value && total[v].value !== 0) continue;
-            let isNum = isNaN(total[v]);
-            let isSHU = /次数/g.test(total[v].name) || /下载量/g.test(total[v].name) || /装机量/g.test(total[v].name) || /用户数/g.test(total[v].name)
+            console.log(isNaN(total[v].value),total[v])
+            let isNum = isNaN(total[v].value);
             let value = "";
             if (isNum && !/次数/g.test(total[v].name) &&  !/下载量/g.test(total[v].name) && !/装机量/g.test(total[v].name) && !/用户数/g.test(total[v].name) && typeof total[v].value === "number")
               value = this.timeFormat(total[v].value);
@@ -354,10 +355,10 @@ export default {
               value,
               color: color[i % 2],
               key: v,
-              isNum,
-              isSHU
+              isNum
             });
           }
+          console.log(p)
           this.oriData = {
             list: oriData.list || [],
             total: p,