|
@@ -126,8 +126,9 @@
|
|
<div>{{ item.name }}</div>
|
|
<div>{{ item.name }}</div>
|
|
<div class="value">
|
|
<div class="value">
|
|
<!-- oriData.total.activeUser -->
|
|
<!-- oriData.total.activeUser -->
|
|
|
|
+ {{item}}
|
|
<countTo
|
|
<countTo
|
|
- v-if="!item.isNum || item.isSHU"
|
|
|
|
|
|
+ v-if="!item.isNum"
|
|
:startVal="0"
|
|
:startVal="0"
|
|
:endVal="item.value - 0"
|
|
:endVal="item.value - 0"
|
|
:duration="1500"
|
|
:duration="1500"
|
|
@@ -339,8 +340,8 @@ export default {
|
|
for (let i = 0; i < keys.length; i++) {
|
|
for (let i = 0; i < keys.length; i++) {
|
|
const v = keys[i];
|
|
const v = keys[i];
|
|
if (!total[v].value && total[v].value !== 0) continue;
|
|
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 = "";
|
|
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")
|
|
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);
|
|
value = this.timeFormat(total[v].value);
|
|
@@ -354,10 +355,10 @@ export default {
|
|
value,
|
|
value,
|
|
color: color[i % 2],
|
|
color: color[i % 2],
|
|
key: v,
|
|
key: v,
|
|
- isNum,
|
|
|
|
- isSHU
|
|
|
|
|
|
+ isNum
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
+ console.log(p)
|
|
this.oriData = {
|
|
this.oriData = {
|
|
list: oriData.list || [],
|
|
list: oriData.list || [],
|
|
total: p,
|
|
total: p,
|