Authored by 王涛

Merge branch 'master-v32-lushangqing' into 'master'

大屏及电子税务局页面样式修改,数据中心,



See merge request !65
@@ -190,7 +190,19 @@ export default { @@ -190,7 +190,19 @@ export default {
190 backgroundColor:'rgba(50,50,50,0.7)', 190 backgroundColor:'rgba(50,50,50,0.7)',
191 borderColor:"#333", 191 borderColor:"#333",
192 formatter:function(params){ 192 formatter:function(params){
193 - let str="<div style='display:flex;justify-content: space-between'><span>"+params.marker+params.name+"</span><span style='margin-left:10px;'>"+params.value+"个</span></div>" 193 + let val =params.value;
  194 + let valData='';
  195 +
  196 + if(!params.value&&params.value!==0) {
  197 + valData=0;
  198 + }else{
  199 + let valStr=val.toString()
  200 + let reg = valStr.indexOf(".") > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g;
  201 + valData=valStr.replace(reg,"$1,");
  202 + }
  203 +
  204 +
  205 + let str="<div style='display:flex;justify-content: space-between'><span>"+params.marker+params.name+"</span><span style='margin-left:10px;'>"+valData+"个</span></div>"
194 206
195 for(let i=0;i<params.length;i++){ 207 for(let i=0;i<params.length;i++){
196 } 208 }