Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/src/pages/home/Home.vue

@@ -281,16 +281,15 @@ export default {
   },
   filters: {
     filterCount(val) {
-      if (val >= 1000 && val < 10000) {
+      if (val < 1000) {
+        return val + "g";
+      }
+      let unit = "kg";
+      if (val >= 1000 && val <= 999000) {
         let num = val / 1000;
-        return num.toFixed(2) + "kg";
-      } else if (val >= 10000 && val < 999000) {
-        let num = val / 10000;
-        return num.toFixed(1) + "万kg";
-      } else if (val >= 999000) {
-        return `999+万kg`;
+        return num.toFixed(1) + unit;
       } else {
-        return val + "g";
+        return `999+${unit}`;
       }
     },
   },