From c1afd811abb7879a2b7359e419ce99d52235ded9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 07 八月 2025 10:01:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004
---
src/views/index.vue | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 163366a..95fe72c 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -277,7 +277,7 @@
}])
const yAxis = [{
type: 'category',
- data: ['棰勪粯璐︽', '搴斾粯璐︽', '棰勬敹璐︽', '搴旀敹璐︽',]
+ data: [ '搴斾粯璐︽', '搴旀敹璐︽',]
}]
const yAxis1 = [{
type: 'value'
@@ -337,16 +337,6 @@
}
])
-// 鍚堝悓閲戦鍒嗘瀽鏁版嵁
-const contractList = [
- { name: '娣卞湷绉戞妧鏈夐檺鍏徃', percent: 36, value: 4544, color: '#4fc3f7' },
- { name: '鍖椾含绉戞妧鏈夐檺鍏徃', percent: 20, value: 4000, color: '#81c784' },
- { name: '骞垮窞绉戞妧鏈夐檺鍏徃', percent: 16, value: 3113, color: '#ffb74d' },
- { name: '涓婃捣绉戞妧鏈夐檺鍏徃', percent: 10, value: 2341, color: '#ba68c8' },
- { name: '鍗椾含绉戞妧鏈夐檺鍏徃', percent: 9, value: 1231, color: '#e57373' },
- { name: '鍖椾含鏈潵绉戞妧鏈夐檺鍏徃', percent: 9, value: 1231, color: '#64b5f6' }
-]
-
// 寰呭姙浜嬮」
const todoList = ref([])
const radio1 = ref(1)
@@ -399,10 +389,10 @@
console.log(type)
statisticsReceivablePayable({type: radio1.value}).then((res) => {
barSeries.value[0].data = [
- { value: res.data.prepayMoney, itemStyle: { color: barColors2[0] } },
- { value: res.data.payableMoney, itemStyle: { color: barColors2[1] } },
- { value: res.data.advanceMoney, itemStyle: { color: barColors2[2] } },
- { value: res.data.receivableMoney, itemStyle: { color: barColors2[3] } }
+ // { value: res.data.prepayMoney, itemStyle: { color: barColors2[0] } },
+ { value: res.data.payableMoney, itemStyle: { color: barColors2[0] } },
+ // { value: res.data.advanceMoney, itemStyle: { color: barColors2[2] } },
+ { value: res.data.receivableMoney, itemStyle: { color: barColors2[1] } }
]
})
}
@@ -581,7 +571,7 @@
.data-card {
background: #fff;
border-radius: 12px;
- padding: 14px;
+ padding: 14px 10px 10px 10px;
min-width: 160px;
box-shadow: 0 2px 8px #eee;
display: flex;
--
Gitblit v1.9.3