Merge branch 'master' of http://gogs.langye.net:3000/langye/cz-hjjc-admin

src/views/system/DashboardComponents/department.vue

@@ -137,17 +137,17 @@ export default {
               color: '#188df0',
               position: 'top',
               formatter: (params) => {
-                const m2 = this.list[params.dataIndex]?.money_total_2 || 0
-                const m1 = this.list[params.dataIndex]?.money_total_1 || 0
-                const m3 = this.list[params.dataIndex]?.use_money_total || 0
+                const m2 = isNaN(Number(this.list[params.dataIndex]?.money_total_2)) ? 0 : Number(this.list[params.dataIndex]?.money_total_2)
+                const m1 = isNaN(Number(this.list[params.dataIndex]?.money_total_1)) ? 0 : Number(this.list[params.dataIndex]?.money_total_1)
+                const m3 = isNaN(Number(this.list[params.dataIndex]?.use_money_total)) ? 0 : Number(this.list[params.dataIndex]?.use_money_total)
                 let per = 0
 
                 if (m2 !== 0) {
-                  per = m2 === 0 ? ((m3 / m2) * 100) : 0
+                  per = (m3 / m2) * 100
                 } else if (m1 !== 0) {
-                  per = m1 === 0 ? ((m3 / m1) * 100) : 0
+                  per = (m3 / m1) * 100
                 }
-                return Number(per) + '%'
+                return Number(per).toFixed(2) + '%'
               }
             },
             itemStyle: {