1

resources/views/admin/home.blade.php

@@ -22,10 +22,10 @@
             margin-left: 20px;
         }
         .static-container > .card1:nth-child(1) {
-            flex-basis: 60%;
+            flex-basis: 40%;
         }
         .static-container > .card1:nth-child(2) {
-            flex-basis: calc(40% - 20px);
+            flex-basis: calc(60% - 20px);
         }
         .static-container > .card1:nth-child(3) {
             flex-basis: 68%;
@@ -349,6 +349,14 @@
                     {
                         name: item.name,
                         value: parseFloat(item.total??"0") * item.rate,
+                        label: {
+                            show: true,
+                            position: 'center',
+                            fontWeight: "bold",
+                            formatter: function (params) {
+                                return params.name + "\n" + (item.rate * 100) + "%"
+                            }
+                        }
                     },
                     {
                         name: '未完成',
@@ -382,12 +390,8 @@
                         },
                         label: {
                             normal: {
-                                show: true,
-                                position: 'center',
-                                fontWeight: "bold",
-                                formatter: function (params) {
-                                    return params.name + "\n" + params.value + "%"
-                                }
+                                show: false,
+                                position: 'center'
                             },
                             emphasis: {
                                 label: {