From 6c7375701b519377752df5da89e8c3910c1661d8 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 27 一月 2026 17:40:23 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/reportAnalysis/dataDashboard/components/basic/left-top.vue | 268 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 164 insertions(+), 104 deletions(-)
diff --git a/src/views/reportAnalysis/dataDashboard/components/basic/left-top.vue b/src/views/reportAnalysis/dataDashboard/components/basic/left-top.vue
index 4f88f0b..3840aa0 100644
--- a/src/views/reportAnalysis/dataDashboard/components/basic/left-top.vue
+++ b/src/views/reportAnalysis/dataDashboard/components/basic/left-top.vue
@@ -2,19 +2,18 @@
<div>
<PanelHeader title="浜у搧澶х被" />
<div class="panel-item-customers">
- <div style="height: 70%">
+ <div style="height: 70%">
+ <div style="height: 100%">
<Echarts
ref="chart"
:chartStyle="chartStyle"
- :grid="grid"
- :legend="workInProcessBarLegend"
- :series="workInProcessBarSeries"
- :tooltip="tooltip"
- :xAxis="workInProcessXAxis"
- :yAxis="workInProcessYAxis"
+ :legend="landLegend"
+ :series="landSeries"
+ :tooltip="landTooltip"
+ :color="landColors"
:options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }"
style="height: 100%"
- class="work-in-process-chart"
+ class="land-chart"
/>
</div>
</div>
@@ -25,21 +24,39 @@
import { ref, onMounted } from 'vue'
import Echarts from '@/components/Echarts/echarts.vue'
import PanelHeader from '../PanelHeader.vue'
-import { getWorkInProcessTurnover } from '@/api/viewIndex.js'
+import { productCategoryDistribution } from '@/api/viewIndex.js'
-// 鍦ㄥ埗鍝佸懆杞粺璁″璞�
-const workInProcessStatistics = ref({
- totalQuantity: 0,
- avgTurnoverDays: 0,
- turnoverEfficiency: 0,
-})
+// 鏁版嵁鍒楄〃锛堟潵鑷帴鍙ｏ級
+const dataList = ref([])
+import { productCategoryDistribution } from '@/api/viewIndex.js'
+// 棰滆壊鍒楄〃
+const landColors = ['#26FFCB', '#24CBFF', '#35FBF4', '#2651FF', '#D1E4F5', '#5782F7', '#2F67EF', '#82BAFF']
+
+// label 瀵屾枃鏈細涓烘瘡涓鑹茬敓鎴愪竴涓皬鍦嗙偣鏍峰紡锛堢‘淇濆湪 label 涓彲瑙侊級
+const dotRich = landColors.reduce((acc, color, idx) => {
+ acc[`dot${idx}`] = {
+ width: 8,
+ height: 8,
+ borderRadius: 8,
+ backgroundColor: color,
+ align: 'center',
+ }
+ return acc
+}, {})
+
+// 鍥句緥閰嶇疆锛堝彸渚х珫鎺掞級
+const landLegend = {
// 鍦ㄥ埗鍝佸伐搴忔煴鐘跺浘閰嶇疆
const workInProcessXAxis = ref([
{
type: 'category',
axisTick: { show: false },
- axisLabel: { color: '#B8C8E0' },
+ axisLabel: {
+ color: '#B8C8E0',
+ interval: 0,
+ rotate: 25
+ },
data: [],
},
])
@@ -54,13 +71,89 @@
const workInProcessBarLegend = {
show: false,
- textStyle: { color: '#B8C8E0' },
+ icon: 'circle',
data: [],
+ right: '8%',
+ top: '40%',
+ orient: 'vertical',
+ itemGap: 14,
+ itemWidth: 6,
+ itemHeight: 6,
+ textStyle: {
+ fontSize: 12,
+ rich: {
+ unit: {
+ color: '#fff',
+ fontSize: 12,
+ padding: [0, 10, 0, 0],
+ },
+ text: {
+ width: 60,
+ color: '#fff',
+ fontSize: 12,
+ },
+ },
+ },
+ formatter: function (name) {
+ const list = dataList.value || []
+ const item = list.find((d) => d.name === name)
+ if (!item) return name
+ const val = Number(item.value || 0)
+ const totalValue = list.reduce((sum, it) => sum + Number(it.value || 0), 0)
+ const percent = totalValue ? ((val / totalValue) * 100).toFixed(2) : '0.00'
+ return `{text|${name}}${val}{unit| 鍏》}${percent}{unit|%}`
+ },
}
-const workInProcessBarSeries = ref([
+// 鎻愮ず妗�
+const landTooltip = {
+ triggerOn: 'click',
+ alwaysShowContent: true,
+ position: function (pt) {
+ return [pt[0], 130]
+ },
+}
+
+// 鍙屽眰鐜舰楗煎浘
+const landSeries = ref([
{
- name: '鍦ㄥ埗鍝佹暟閲�',
+ name: '澶栧湀',
+ type: 'pie',
+ radius: ['35%', '55%'],
+ center: ['50%', '50%'],
+ label: {
+ show: true,
+ position: 'outside',
+ color: '#fff',
+ fontSize: 12,
+ lineHeight: 18,
+ rich: {
+ ...dotRich,
+ parent: { fontSize: 14, fontWeight: 600, color: '#fff', lineHeight: 20 },
+ child: { fontSize: 12, color: '#fff', lineHeight: 18 },
+ },
+ formatter: function (params) {
+ const children = params?.data?.children || []
+ const parentName = params?.data?.name || ''
+ const parentValue = params?.data?.value ?? 0
+ const dotKey = `dot${(params?.dataIndex || 0) % landColors.length}`
+ const dot = `{${dotKey}|} `
+ if (!children.length) return `${dot}{parent|${parentName} ${parentValue}}`
+ // 鐢� marker 鏄剧ず涓庢墖鍖哄悓鑹茬殑灏忓渾鐐癸紝鍐嶆樉绀虹埗绾у悕绉帮紝鍚庨潰鍒楀嚭 children 鐨� name + value
+ return [
+ `${dot}{parent|${parentName} ${parentValue}}`,
+ ...children.map((c) => `{child|${c.name} ${c.value || 0}}`),
+ ].join('\n')
+ },
+ },
+ labelLine: {
+ show: true,
+ length: 40,
+ length2: 40,
+ lineStyle: {
+ color: '#B8C8E0',
+ },
+ name: '浜у搧鏁伴噺',
type: 'bar',
barWidth: 25,
barGap: 0,
@@ -68,6 +161,19 @@
focus: 'series',
},
itemStyle: {
+ color: function (params) {
+ return landColors[params.dataIndex % landColors.length]
+ },
+ },
+ // 鍒濆缁戝畾涓哄搷搴斿紡鏁版嵁婧愶紝鍚庣画閫氳繃鎺ュ彛濉厖
+ data: dataList.value,
+ },
+ {
+ // 鍐呭湀
+ type: 'pie',
+ radius: ['35%', '40%'],
+ center: ['50%', '50%'],
+ silent: true,
color: {
type: 'linear',
x: 0,
@@ -79,25 +185,49 @@
{ offset: 1, color: '#00A4ED' },
],
},
+ borderRadius: [4, 4, 0, 0]
},
label: {
- show: true,
- position: 'top',
- color: '#B8C8E0',
+ show: false,
},
- data: [],
+ labelLine: {
+ show: false,
+ },
+ itemStyle: {
+ color: 'rgba(0, 127, 255, 0.25)',
+ },
+ data: [1],
},
])
const chartStyle = {
width: '100%',
- height: '115%',
+ height: '150%',
+ height: '100%',
}
+const loadData = async () => {
+ try {
+ const res = await productCategoryDistribution()
+ const items = res?.data?.items || []
+ dataList.value = items.map((it) => ({
+ name: it.name,
+ value: Number(it.value || 0),
+ rate: it.rate,
+ children: Array.isArray(it.children) ? it.children : [],
+ }))
+ landLegend.data = dataList.value.map((d) => d.name)
+ landSeries.value[0].data = dataList.value
+ } catch (e) {
+ console.error('鑾峰彇浜у搧澶х被鍒嗗竷澶辫触:', e)
+ dataList.value = []
+ landLegend.data = []
+ landSeries.value[0].data = []
+ }
const grid = {
left: '3%',
right: '4%',
- bottom: '3%',
+ bottom: '15%',
containLabel: true,
}
@@ -115,51 +245,23 @@
},
}
-// 鍦ㄥ埗鍝佸懆杞粺璁�
-const workInProcessTurnoverInfo = () => {
- getWorkInProcessTurnover()
+// 鑾峰彇鍚勪骇鍝佸ぇ绫诲垎甯�
+const getProductCategoryDistribution = () => {
+ productCategoryDistribution()
.then((res) => {
- console.log('鍦ㄥ埗鍝佸懆杞粺璁℃暟鎹�:', res)
-
- if (!res || !res.data) {
- console.warn('鍦ㄥ埗鍝佸懆杞粺璁℃暟鎹负绌�')
- return
- }
-
- // 浠庢帴鍙ｈ幏鍙栫粺璁℃暟鎹�
- workInProcessStatistics.value = {
- totalQuantity: res.data.totalOrderCount || 0,
- avgTurnoverDays: res.data.averageTurnoverDays || 0,
- turnoverEfficiency: res.data.turnoverEfficiency || 0,
- }
-
- // 璁剧疆宸ュ簭鏌辩姸鍥炬暟鎹�
- // X杞达細processDetails (宸ュ簭璇︽儏鏁扮粍)
- // Y杞达細processQuantityDetails (宸ュ簭鏁伴噺璇︽儏鏁扮粍)
- if (res.data.processDetails && Array.isArray(res.data.processDetails)) {
- // 璁剧疆X杞存暟鎹紙宸ュ簭鍚嶇О锛�
- workInProcessXAxis.value[0].data = res.data.processDetails
- } else {
- workInProcessXAxis.value[0].data = []
- }
-
- if (
- res.data.processQuantityDetails &&
- Array.isArray(res.data.processQuantityDetails)
- ) {
- // 璁剧疆Y杞存暟鎹紙鍦ㄥ埗鍝佹暟閲忥級
- workInProcessBarSeries.value[0].data = res.data.processQuantityDetails
- } else {
- workInProcessBarSeries.value[0].data = []
+ if (res.code === 200 && res.data && res.data.items) {
+ workInProcessXAxis.value[0].data = res.data.items.map(item => item.name)
+ workInProcessBarSeries.value[0].data = res.data.items.map(item => parseInt(item.value))
}
})
.catch((error) => {
- console.error('鑾峰彇鍦ㄥ埗鍝佸懆杞粺璁″け璐�:', error)
+ console.error('鑾峰彇鍚勪骇鍝佸ぇ绫诲垎甯冨け璐�:', error)
})
}
onMounted(() => {
- workInProcessTurnoverInfo()
+ loadData()
+ getProductCategoryDistribution()
})
</script>
@@ -169,47 +271,5 @@
padding: 18px;
width: 100%;
height: 420px;
-}
-
-.quality-cards {
- display: flex;
- gap: 12px;
- width: 100%;
- height: 54px;
- justify-content: space-between;
- align-items: center;
-}
-
-.quality-cardSec {
- display: flex;
-}
-
-.quality-cardTitle {
- font-weight: 400;
- font-size: 14px;
- color: #ffffff;
- display: flex;
- align-items: flex-start;
- flex-direction: column;
-}
-
-.quality-card {
- width: 80px;
- height: 60px;
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
-}
-
-.quality-card.one {
- background-image: url('@/assets/BI/yuancailiaoyijianicon@2x.png');
-}
-
-.quality-card.two {
- background-image: url('@/assets/BI/guochengyijianicon@2x.png');
-}
-
-.quality-card.three {
- background-image: url('@/assets/BI/chuchangyijianicon@2x.png');
}
</style>
--
Gitblit v1.9.3