Browse Source

Merge branch 'feature/ci-test10' of duanxiaoduan/tmr-group-admin into develop

duanxiaoduan 1 year ago
parent
commit
12790a710f
1 changed files with 14 additions and 9 deletions
  1. 14 9
      src/views/dashboard/index.vue

+ 14 - 9
src/views/dashboard/index.vue

@@ -756,12 +756,12 @@
               var item = {
                 name: chartLine_data.pasture_name[i],
                 data: chartLine_data.data_list[i],
-                type: 'line',
-                smooth: true,
-                itemStyle: {
-                  borderColor: '#fff',
-                  borderWidth: 2
-                },
+                type: 'bar',
+                // smooth: true,
+                // itemStyle: {
+                //   borderColor: '#fff',
+                //   borderWidth: 2
+                // },
                 label: {
                   // normal: {  show: true },
                 },
@@ -805,7 +805,8 @@
             top: 0,
             bottom: 10
           },
-          color: ['#42C7FF', '#20DB7C','#FCC858'],
+          // color: ['#42C7FF', '#20DB7C','#FCC858'],
+          color: ['#42C7FF', '#FCC858'],
           xAxis: { // 此处设置与其他图表类似
             type: `category`,
             data:chartLine_data.title,
@@ -892,7 +893,9 @@
                   rate2 = 0
                 }
 
-                var res = data[0].marker + data[0].seriesName + '<br/>'+ a + '次'+ "<span style='margin-left:10px;color:#ccc;'>总占比"+rate1+"%</span>"+'<br/>' + data[1].marker + data[1].seriesName+':'+'<br/>' + data[1].data + '次'+ "<span style='margin-left:10px;color:#ccc;'>总占比"+rate2+"%</span>"
+                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>"
                 return res
             }
           },
@@ -924,12 +927,14 @@
           series: [{
               name: '正常撒料次数',
               type: 'bar',
-              barWidth:50,
+              barWidth:50,
+              stack: 'Ad',
               data: chartLine_data.sprinkle_number_list[0]
             },
             {
               name: '异常撒料次数',
               type: 'bar',
+              stack: 'Ad',
               barWidth:50,
               data: chartLine_data.sprinkle_number_list[1]
             },