Merge branch 'dev-learning-1120' into 'test-learning-1205'

千位数隔开显示



See merge request !122

src/utils/filter.js

@@ -351,5 +351,8 @@ const vueFilter = {
         return '已完成';
     }
   },
+  toThousands:(value) => {
+    return (value || 0).toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,');
+  },
 }
 export default vueFilter
\ No newline at end of file

src/views/learning/item-data-all.vue

@@ -16,8 +16,8 @@
             </div>
             <div class="vertical"></div>
             <div class="right-content">
-              <p class="has">{{ item.hasKey }}:{{ item.hasNum }}</p>
-              <p class="should">{{ item.shouldKey }}:{{ item.shouldNum }}</p>
+              <p class="has">{{ item.hasKey }}:{{ item.hasNum | toThousands }}</p>
+              <p class="should">{{ item.shouldKey }}:{{ item.shouldNum | toThousands }}</p>
             </div>
           </div>
         <!-- </div> -->
@@ -135,8 +135,8 @@
             </div>
             <div class="vertical"></div>
             <div class="right-content">
-              <p class="has">{{ item.hasKey }}:{{ item.hasNum }}</p>
-              <p class="should">{{ item.shouldKey }}:{{ item.shouldNum }}</p>
+              <p class="has">{{ item.hasKey }}:{{ item.hasNum | toThousands }}</p>
+              <p class="should">{{ item.shouldKey }}:{{ item.shouldNum | toThousands }}</p>
             </div>
           <!-- </el-card> -->
         </div>