Browse Source

逻辑修改

zpf 1 year ago
parent
commit
e4b136be0e

+ 3 - 2
src/views/cockpit/common/ThreeStackedBarAndLine.vue

@@ -157,9 +157,10 @@ export default {
                     },
                 }],
                 series: [
+                
                     {
 
-                        name: "正常使用",
+                        name: "临时用地面积",
                         type: 'line',
                         smooth: true,
                         itemStyle: {
@@ -187,7 +188,7 @@ export default {
                         data: [24, 12, 12, 0, 1, 2],
                     },
                     {
-                        name: '临时用地面积',
+                        name: '正常使用',
                         barWidth: 14,
 
                         type: 'bar',

+ 2 - 1
src/views/cockpit/common/XZQHPieChart.vue

@@ -179,8 +179,9 @@ export default {
                                     echartData.forEach(function (value, index, array) {
                                         total += value.value;
                                     });
+
                                     percent = ((params.value / total) * 100).toFixed(1);
-                                    return '{yellow|' + params.name + '}\n{blue|' + percent + '%}';
+                                    return '{yellow|' + params.name + '}\n{blue|' + '占比:' + percent + '%}' + '\n{blue|' + '面积:' + params.value + '公顷}';
                                 },
                                 rich: rich
                             },