Prechádzať zdrojové kódy

Merge branch 'hotfix/bugs4' of duanxiaoduan/tmr-group-admin into develop

duanxiaoduan 1 rok pred
rodič
commit
97d5e2dc47
1 zmenil súbory, kde vykonal 1 pridanie a 1 odobranie
  1. 1 1
      src/views/dashboard/index.vue

+ 1 - 1
src/views/dashboard/index.vue

@@ -949,7 +949,7 @@
                   rate2 = 0
                 }
 
-                var res = data[0].marker + data[0].seriesName + '<br/>' + "总占比"+rate1+"%"+ '<span style="margin-left:10px;color:#ccc;">'+ a + '次'+'</span>'+ '<br/>' + data[1].marker + data[1].seriesName+':'+'<br/>' + "总占比"+rate2+"%"+ "<span style='margin-left:10px;color:#ccc;'>"+ data[1].data + '次' + "</span>"
+                var res = "撒料时间"+ '<br/>' +"牧场:" + data[0].name + '<br/>' + data[0].marker + data[0].seriesName + '<br/>' + "总占比"+rate1+"%"+ '<span style="margin-left:10px;color:#ccc;">'+ a + '次'+'</span>'+ '<br/>' + data[1].marker + data[1].seriesName+':'+'<br/>' + "总占比"+rate2+"%"+ "<span style='margin-left:10px;color:#ccc;'>"+ data[1].data + '次' + "</span>"
                 return res
             }
           },