From f68311c42b262298b2187fe5b8b284c31e6a1cdf Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 28 一月 2026 14:53:47 +0800
Subject: [PATCH] fix: 完成进销存大屏数据分析接口联调

---
 src/views/reportAnalysis/PSIDataAnalysis/components/left-bottom.vue       |   87 ++++--------
 src/views/reportAnalysis/PSIDataAnalysis/components/left-top.vue          |   84 +++--------
 src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue     |   37 +++-
 src/views/reportAnalysis/PSIDataAnalysis/components/center-top.vue        |   81 ++++-------
 src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue |    4 
 src/api/viewIndex.js                                                      |   41 +++++
 src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue     |    2 
 src/views/reportAnalysis/PSIDataAnalysis/components/center-center.vue     |   60 ++------
 src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue  |    2 
 9 files changed, 171 insertions(+), 227 deletions(-)

diff --git a/src/api/viewIndex.js b/src/api/viewIndex.js
index 355e1b2..b003dbf 100644
--- a/src/api/viewIndex.js
+++ b/src/api/viewIndex.js
@@ -114,3 +114,44 @@
         method: 'get'
     })
 }
+
+// 浜у搧閿�鍞噾棰濆垎鏋�
+export const productSalesAnalysis = () => {
+    return request({
+        url: '/home/productSalesAnalysis',
+        method: 'get'
+    })
+}
+
+// 鍘熸潗鏂欓噰璐噾棰濆崰姣�
+export const rawMaterialPurchaseAmountRatio = () => {
+    return request({
+        url: '/home/rawMaterialPurchaseAmountRatio',
+        method: 'get'
+    })
+}
+
+// 閿�鍞�/閲囪喘/鍌ㄥ瓨浜у搧鏁�
+export const salesPurchaseStorageProductCount = () => {
+    return request({
+        url: '/home/salesPurchaseStorageProductCount',
+        method: 'get'
+    })
+}
+
+// 浜у搧鍑哄叆搴撳垎鏋愶紙鍙紶 productType: 1 鍘熸潗鏂� 2 鍗婃垚鍝� 3 鎴愬搧锛�
+export const productInOutAnalysis = (params) => {
+    return request({
+        url: '/home/productInOutAnalysis',
+        method: 'get',
+        params
+    })
+}
+
+// 浜у搧鍛ㄨ浆澶╂暟
+export const productTurnoverDays = () => {
+    return request({
+        url: '/home/productTurnoverDays',
+        method: 'get'
+    })
+}
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
index 315d887..87cde44 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
@@ -5,8 +5,8 @@
     @change="handleChange"
   >
     <el-radio-button :label="1">鍘熸潗鏂�</el-radio-button>
-    <el-radio-button :label="2">鍗婃垚鍝�</el-radio-button>
-    <el-radio-button :label="3">鎴愬搧</el-radio-button>
+    <el-radio-button :label="3">鍗婃垚鍝�</el-radio-button>
+    <el-radio-button :label="2">鎴愬搧</el-radio-button>
   </el-radio-group>
 </template>
 
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue
index 3b04ffa..8277650 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue
@@ -28,6 +28,7 @@
 import Echarts from '@/components/Echarts/echarts.vue'
 import PanelHeader from './PanelHeader.vue'
 import ProductTypeSwitch from './ProductTypeSwitch.vue'
+import { productInOutAnalysis } from '@/api/viewIndex.js'
 
 const productType = ref(1) // 1=鍘熸潗鏂� 2=鍗婃垚鍝� 3=鎴愬搧
 
@@ -58,9 +59,9 @@
 const xAxis1 = ref([
   {
     type: 'category',
-    data: ['6/9', '6/10', '6/11', '6/12', '6/13', '6/14', '6/15'],
+    data: [],
     axisTick: { show: false },
-    axisLine: { show: false,lineStyle: { color: 'rgba(184, 200, 224, 0.3)' } },
+    axisLine: { show: false, lineStyle: { color: 'rgba(184, 200, 224, 0.3)' } },
     axisLabel: { color: '#B8C8E0', fontSize: 12 },
     splitLine: { show: false, lineStyle: { type: 'dashed', color: 'rgba(184, 200, 224, 0.2)' } },
   },
@@ -74,7 +75,7 @@
     axisLine: { show: false },
     axisTick: { show: false },
     axisLabel: { color: '#B8C8E0', fontSize: 12 },
-    splitLine: { lineStyle: {  color: '#B8C8E0' } },
+    splitLine: { lineStyle: { color: '#B8C8E0' } },
   },
 ]
 
@@ -86,7 +87,7 @@
     showSymbol: true,
     symbol: 'circle',
     symbolSize: 8,
-    lineStyle: { color: 'rgba(11, 137, 254,1', width: 2 },
+    lineStyle: { color: 'rgba(11, 137, 254, 1)', width: 2 },
     itemStyle: { color: 'rgba(11, 137, 254, 1)', borderWidth: 0 },
     areaStyle: {
       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -94,7 +95,7 @@
         { offset: 1, color: 'rgba(11, 137, 254, 0.05)' },
       ]),
     },
-    data: [80, 100, 140, 160, 120, 150, 180],
+    data: [],
     emphasis: { focus: 'series' },
   },
   {
@@ -104,7 +105,6 @@
     showSymbol: true,
     symbol: 'circle',
     symbolSize: 8,
-    
     lineStyle: { color: 'rgba(11, 249, 254, 1)', width: 2 },
     itemStyle: { color: 'rgba(11, 249, 254, 1)', borderWidth: 0 },
     areaStyle: {
@@ -113,7 +113,7 @@
         { offset: 1, color: 'rgba(11, 249, 254, 0.05)' },
       ]),
     },
-    data: [160, 200, 200, 200, 170, 200, 200],
+    data: [],
     emphasis: { focus: 'series' },
   },
 ])
@@ -132,11 +132,28 @@
   },
 }
 
-const handleFilterChange = () => {
-  // 鍙寜 productType 鍒囨崲鍚庤姹傚嚭鍏ュ簱鎺ュ彛锛屾澶勪粎棰勭暀
+const fetchData = () => {
+  productInOutAnalysis({ type: productType.value })
+    .then((res) => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        const list = res.data
+        xAxis1.value[0].data = list.map((d) => d.date)
+        lineSeries.value[0].data = list.map((d) => Number(d.outCount) || 0)
+        lineSeries.value[1].data = list.map((d) => Number(d.inCount) || 0)
+      }
+    })
+    .catch((err) => {
+      console.error('鑾峰彇浜у搧鍑哄叆搴撳垎鏋愬け璐�:', err)
+    })
 }
 
-onMounted(() => {})
+const handleFilterChange = () => {
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <style scoped>
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/center-center.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/center-center.vue
index a0c892a..0f3ec84 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/center-center.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/center-center.vue
@@ -29,19 +29,14 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import Echarts from '@/components/Echarts/echarts.vue'
-import { customerRevenueAnalysis } from '@/api/viewIndex.js'
-import { listCustomer } from '@/api/basicData/customerFile.js'
-
-const dateType = ref(1)
-const customerValue = ref(null)
-const customerOptions = ref([])
+import { productTurnoverDays } from '@/api/viewIndex.js'
 
 const chartStyle = { width: '100%', height: '100%' }
 const grid = { left: '3%', right: '4%', bottom: '3%', top: '4%', containLabel: true }
-const barLegend = { show: false, textStyle: { color: '#B8C8E0' }, data: ['钀ユ敹'] }
+const barLegend = { show: false, textStyle: { color: '#B8C8E0' }, data: ['鍛ㄨ浆澶╂暟'] }
 const barSeries1 = ref([
   {
-    name: '钀ユ敹',
+    name: '鍛ㄨ浆澶╂暟',
     type: 'bar',
     barGap: 0,
     barWidth: 30,
@@ -65,7 +60,7 @@
   formatter(params) {
     let result = params[0].axisValueLabel + '<br/>'
     params.forEach((item) => {
-      result += `<div>${item.marker} ${item.seriesName}: ${item.value}</div>`
+      result += `<div>${item.marker} ${item.seriesName}: ${item.value} 澶�</div>`
     })
     return result
   },
@@ -73,47 +68,22 @@
 const xAxis1 = ref([{ type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] }])
 const yAxis1 = [{ type: 'value', axisLabel: { color: '#B8C8E0' } }]
 
-const getCustomerRevenueAnalysis = () => {
-  if (customerOptions.value.length > 0 && !customerValue.value) customerValue.value = customerOptions.value[0].value
-  if (!customerValue.value) return
-  customerRevenueAnalysis({ customerId: customerValue.value, type: dateType.value })
+const fetchData = () => {
+  productTurnoverDays()
     .then((res) => {
-      xAxis1.value[0].data = []
-      barSeries1.value[0].data = []
-      const items = res.data?.items || []
-      items.forEach((item) => {
-        xAxis1.value[0].data.push(item.name)
-        barSeries1.value[0].data.push(item.value)
-      })
+      if (res.code === 200 && Array.isArray(res.data)) {
+        const list = res.data
+        xAxis1.value[0].data = list.map((d) => d.name)
+        barSeries1.value[0].data = list.map((d) => Number(d.value) || 0)
+      }
     })
-    .catch((e) => console.error('鑾峰彇瀹㈡埛钀ユ敹鍒嗘瀽澶辫触:', e))
-}
-
-const fetchCustomerOptions = async () => {
-  try {
-    const res = await listCustomer({ pageNum: 1, pageSize: 200 })
-    const records = res?.records || res?.data?.records || res?.rows || []
-    customerOptions.value = records.map((r) => ({
-      label: r.customerName || r.name || r.customer || '-',
-      value: r.id ?? r.customerId ?? r.customerCode ?? r.customerName,
-    }))
-    if (customerOptions.value.length > 0 && !customerValue.value) {
-      customerValue.value = customerOptions.value[0].value
-      getCustomerRevenueAnalysis()
-    }
-  } catch (e) {
-    customerOptions.value = [
-      { label: '鍗庝笢绮惧瘑', value: '鍗庝笢绮惧瘑' },
-      { label: '鏄熻景鐢靛瓙', value: '鏄熻景鐢靛瓙' },
-      { label: '鍚埅绉戞妧', value: '鍚埅绉戞妧' },
-      { label: '閾瘹鍒堕��', value: '閾瘹鍒堕��' },
-      { label: '杩滄櫙鏉愭枡', value: '杩滄櫙鏉愭枡' },
-    ]
-  }
+    .catch((err) => {
+      console.error('鑾峰彇浜у搧鍛ㄨ浆澶╂暟澶辫触:', err)
+    })
 }
 
 onMounted(() => {
-  fetchCustomerOptions()
+  fetchData()
 })
 </script>
 
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/center-top.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/center-top.vue
index 15df549..0937b32 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/center-top.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/center-top.vue
@@ -2,39 +2,19 @@
   <div>
     <!-- 椤堕儴缁熻鍗$墖 -->
     <div class="stats-cards">
-      <div class="stat-card">
+      <div
+        v-for="item in statItems"
+        :key="item.name"
+        class="stat-card"
+      >
         <img src="@/assets/BI/icon@2x.png" alt="鍥炬爣" class="card-icon" />
         <div class="card-content">
-          <span class="card-label">閿�鍞骇鍝佹暟</span>
-          <span class="card-value">{{ totalStaff }}</span>
-          <div class="card-compare" :class="compareClass(staffYoY)">
+          <span class="card-label">{{ item.name }}</span>
+          <span class="card-value">{{ item.value }}</span>
+          <div class="card-compare" :class="compareClass(Number(item.rate))">
             <span>鍚屾瘮</span>
-            <span class="compare-value">{{ formatPercent(staffYoY) }}</span>
-            <span class="compare-icon">{{ staffYoY >= 0 ? '鈫�' : '鈫�' }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="stat-card">
-        <img src="@/assets/BI/icon@2x.png" alt="鍥炬爣" class="card-icon" />
-        <div class="card-content">
-          <span class="card-label">閲囪喘浜у搧鏁�</span>
-          <span class="card-value">{{ totalCustomers }}</span>
-          <div class="card-compare" :class="compareClass(customersYoY)">
-            <span>鍚屾瘮</span>
-            <span class="compare-value">{{ formatPercent(customersYoY) }}</span>
-            <span class="compare-icon">{{ customersYoY >= 0 ? '鈫�' : '鈫�' }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="stat-card">
-        <img src="@/assets/BI/icon@2x.png" alt="鍥炬爣" class="card-icon" />
-        <div class="card-content">
-          <span class="card-label">搴撳瓨鏁�</span>
-          <span class="card-value">{{ totalSuppliers }}</span>
-          <div class="card-compare" :class="compareClass(suppliersYoY)">
-            <span>鍚屾瘮</span>
-            <span class="compare-value">{{ formatPercent(suppliersYoY) }}</span>
-            <span class="compare-icon">{{ suppliersYoY >= 0 ? '鈫�' : '鈫�' }}</span>
+            <span class="compare-value">{{ formatPercent(item.rate) }}</span>
+            <span class="compare-icon">{{ Number(item.rate) >= 0 ? '鈫�' : '鈫�' }}</span>
           </div>
         </div>
       </div>
@@ -45,40 +25,35 @@
 
 <script setup>
 import { ref, onMounted } from 'vue'
-import { summaryStatistics } from '@/api/viewIndex.js'
+import { salesPurchaseStorageProductCount } from '@/api/viewIndex.js'
 
-// 缁熻鏁版嵁
-const totalStaff = ref(0)
-const totalCustomers = ref(0)
-const totalSuppliers = ref(0)
-// 鍚屾瘮
-const staffYoY = ref(0)
-const customersYoY = ref(0)
-const suppliersYoY = ref(0)
+const statItems = ref([])
 
 const formatPercent = (val) => {
   const num = Number(val) || 0
-  return `${Math.abs(num).toFixed(2)}%`
+  return `${num.toFixed(2)}%`
 }
 
 const compareClass = (val) => (val >= 0 ? 'compare-up' : 'compare-down')
 
-// 鑾峰彇鍛樺伐銆佸鎴枫�佷緵搴斿晢鏁伴噺
-const getNum = () => {
-  summaryStatistics().then((res) => {
-    totalStaff.value = res.data.totalStaff
-    staffYoY.value = res.data.staffGrowthRate
-    totalCustomers.value = res.data.totalCustomer
-    customersYoY.value = res.data.customerGrowthRate
-    totalSuppliers.value = res.data.totalSupplier
-    suppliersYoY.value = res.data.supplierGrowthRate
-  }).catch(err => {
-    console.error('鑾峰彇鍩虹缁熻鏁版嵁澶辫触:', err)
-  })
+const fetchData = () => {
+  salesPurchaseStorageProductCount()
+    .then((res) => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        statItems.value = res.data.map((item) => ({
+          name: item.name,
+          value: item.value,
+          rate: item.rate,
+        }))
+      }
+    })
+    .catch((err) => {
+      console.error('鑾峰彇閿�鍞�/閲囪喘/鍌ㄥ瓨浜у搧鏁板け璐�:', err)
+    })
 }
 
 onMounted(() => {
-  getNum()
+  fetchData()
 })
 </script>
 
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/left-bottom.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/left-bottom.vue
index 9ddab7f..3970b71 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/left-bottom.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/left-bottom.vue
@@ -26,7 +26,7 @@
 import Echarts from '@/components/Echarts/echarts.vue'
 import PanelHeader from './PanelHeader.vue'
 import CarouselCards from './CarouselCards.vue'
-import { productCategoryDistribution } from '@/api/viewIndex.js'
+import { rawMaterialPurchaseAmountRatio } from '@/api/viewIndex.js'
 
 /**
  * @introduction 鎶婃暟缁勪腑key鍊肩浉鍚岀殑閭d竴椤规彁鍙栧嚭鏉ワ紝缁勬垚涓�涓璞�
@@ -48,16 +48,6 @@
 // 鍗$墖鏁版嵁
 const cardItems = ref([])
 
-// 鍋囨暟鎹�
-const mockCardData = [
-  { name: '鐢靛瓙浜у搧', value: 156, rate: '28.5' },
-  { name: '鏈烘璁惧', value: 132, rate: '24.1' },
-  { name: '鍘熸潗鏂�', value: 98, rate: '17.9' },
-  { name: '鍖栧伐浜у搧', value: 87, rate: '15.9' },
-  { name: '绾虹粐鍝�', value: 45, rate: '8.2' },
-  { name: '鍏朵粬', value: 31, rate: '5.7' },
-]
-
 // 棰滆壊鍒楄〃
 const landColors = ['#26FFCB', '#24CBFF', '#35FBF4', '#2651FF', '#D1E4F5', '#5782F7', '#2F67EF', '#82BAFF']
 
@@ -77,13 +67,13 @@
   return {
     orient: 'vertical',
     top: 'center',
-    left: '60%',
+    left: '52%',
     itemGap: 30,
     data: data,
     formatter: function (name) {
       const item = landObjData.value[name]
       if (!item) return name
-      return `{title|${name}}{value|${item.value}}{unit|浠秨{percent|${item.rate}}{unit|%}`
+      return `{title|${name}}{value|${item.value}}{unit|鍏儅{percent|${item.rate}}{unit|%}`
     },
     textStyle: {
       rich: {
@@ -91,7 +81,7 @@
           color: '#43e8fc',
           fontSize: 14,
           fontWeight: 600,
-          padding: [0, 0, 0, 30],
+          padding: [0, 0, 0, 10],
         },
         unit: {
           color: '#82baff',
@@ -117,7 +107,7 @@
 // 鎻愮ず妗�
 const landTooltip = {
   trigger: 'item',
-  formatter: '{a} <br/>{b} : {c} ({d}%)',
+  formatter: '{a} <br/>{b} : {c}鍏� ({d}%)',
 }
 
 // 鍙屽眰鐜舰楗煎浘
@@ -174,52 +164,33 @@
   textStyle: { color: '#B8C8E0' },
 }
 
-const setMockData = () => {
-  // 鍗$墖鏁版嵁
-  cardItems.value = mockCardData.map(item => ({
-    label: item.name,
-    value: item.value,
-    unit: '浠�',
-    rate: item.rate
-  }))
-  // 鍥捐〃鏁版嵁
-  dataList.value = mockCardData.map((it) => ({
-    name: it.name,
-    value: Number(it.value || 0),
-    rate: it.rate,
-    children: [],
-  }))
-  landSeries.value[0].data = dataList.value
-}
-
-const loadData = async () => {
-  setMockData()
-  // 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 : [],
-  //   }))
-  //   // 鍗$墖鏁版嵁
-  //   cardItems.value = items.map(item => ({
-  //     label: item.name,
-  //     value: parseInt(item.value),
-  //     unit: '浠�',
-  //     rate: item.rate
-  //   }))
-  //   landLegend.data = dataList.value.map((d) => d.name)
-  //   landSeries.value[0].data = dataList.value
-  // } catch (e) {
-  //   console.error('鑾峰彇浜у搧澶х被鍒嗗竷澶辫触:', e)
-  //   setMockData()
-  // }
+const fetchData = () => {
+  rawMaterialPurchaseAmountRatio()
+    .then((res) => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        const items = res.data
+        cardItems.value = items.map((item) => ({
+          label: item.name,
+          value: item.value,
+          unit: '鍏�',
+          rate: item.rate,
+        }))
+        dataList.value = items.map((it) => ({
+          name: it.name,
+          value: parseFloat(it.value) || 0,
+          rate: it.rate,
+          children: [],
+        }))
+        landSeries.value[0].data = dataList.value
+      }
+    })
+    .catch((err) => {
+      console.error('鑾峰彇鍘熸潗鏂欓噰璐噾棰濆崰姣斿け璐�:', err)
+    })
 }
 
 onMounted(() => {
-  loadData()
+  fetchData()
 })
 </script>
 
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/left-top.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/left-top.vue
index a282389..d4c1b76 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/left-top.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/left-top.vue
@@ -22,7 +22,7 @@
 
 <script setup>
 import { ref, onMounted, computed } from 'vue'
-import { deptStaffDistribution } from '@/api/viewIndex.js'
+import { productSalesAnalysis } from '@/api/viewIndex.js'
 import PanelHeader from './PanelHeader.vue'
 import CarouselCards from './CarouselCards.vue'
 import Echarts from '@/components/Echarts/echarts.vue'
@@ -65,13 +65,13 @@
   return {
     orient: 'vertical',
     top: 'center',
-    left: '60%',
+    left: '52%',
     itemGap: 30,
     data: data,
     formatter: function (name) {
       const item = pieObjData.value[name]
       if (!item) return name
-      return `{title|${name}}{value|${item.value}}{unit|浜簘{percent|${item.rate}}{unit|%}`
+      return `{title|${name}}{value|${item.value}}{unit|鍏儅{percent|${item.rate}}{unit|%}`
     },
     textStyle: {
       rich: {
@@ -79,7 +79,7 @@
           color: '#43e8fc',
           fontSize: 14,
           fontWeight: 600,
-          padding: [0, 0, 0, 30],
+          padding: [0, 0, 0, 10],
         },
         unit: {
           color: '#82baff',
@@ -104,7 +104,7 @@
 
 const pieTooltip = {
   trigger: 'item',
-  formatter: '{a} <br/>{b} : {c} ({d}%)',
+  formatter: '{a} <br/>{b} : {c}鍏� ({d}%)',
 }
 
 const pieSeries = computed(() => [
@@ -137,61 +137,31 @@
 
 const cardItems = ref([])
 
-// 鍋囨暟鎹�
-const mockData = [
-  { name: '鐢熶骇閮�', value: 125, rate: '35.2' },
-  { name: '鎶�鏈儴', value: 85, rate: '23.9' },
-  { name: '閿�鍞儴', value: 65, rate: '18.3' },
-  { name: '璐㈠姟閮�', value: 32, rate: '9.0' },
-  { name: '浜轰簨閮�', value: 28, rate: '7.9' },
-  { name: '琛屾斂閮�', value: 20, rate: '5.6' },
-]
-
-const getDeptStaffDistribution = () => {
-  setMockData()
-  // deptStaffDistribution().then(res => {
-  //   if (res.code === 200) {
-  //     const items = res.data.items || []
-  //     // 鍗$墖鏁版嵁
-  //     cardItems.value = items.map(item => ({
-  //       label: item.name,
-  //       value: parseInt(item.value),
-  //       unit: '浜�'
-  //     }))
-  //     // 鍥捐〃鏁版嵁
-  //     pieDatas.value = items.map(item => ({
-  //       name: item.name,
-  //       value: parseInt(item.value),
-  //       rate: item.rate
-  //     }))
-  //   } else {
-  //     // 浣跨敤鍋囨暟鎹�
-  //     setMockData()
-  //   }
-  // }).catch(err => {
-  //   console.error('鑾峰彇閮ㄩ棬浜哄憳鍒嗗竷鏁版嵁澶辫触:', err)
-  //   // 浣跨敤鍋囨暟鎹�
-  //   setMockData()
-  // })
-}
-
-const setMockData = () => {
-  // 鍗$墖鏁版嵁
-  cardItems.value = mockData.map(item => ({
-    label: item.name,
-    value: item.value,
-    unit: '浜�'
-  }))
-  // 鍥捐〃鏁版嵁
-  pieDatas.value = mockData.map(item => ({
-    name: item.name,
-    value: item.value,
-    rate: item.rate
-  }))
+const fetchData = () => {
+  productSalesAnalysis()
+    .then((res) => {
+      if (res.code === 200 && Array.isArray(res.data)) {
+        const items = res.data
+        cardItems.value = items.map((item) => ({
+          label: item.name,
+          value: item.value,
+          unit: '鍏�',
+          rate: item.rate,
+        }))
+        pieDatas.value = items.map((item) => ({
+          name: item.name,
+          value: parseFloat(item.value) || 0,
+          rate: item.rate,
+        }))
+      }
+    })
+    .catch((err) => {
+      console.error('鑾峰彇浜у搧閿�鍞噾棰濆垎鏋愬け璐�:', err)
+    })
 }
 
 onMounted(() => {
-  getDeptStaffDistribution()
+  fetchData()
 })
 </script>
 
diff --git a/src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue b/src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue
index 9d4e983..4b99833 100644
--- a/src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue
+++ b/src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue
@@ -104,7 +104,7 @@
   formatter: function (params) {
     let result = params[0].axisValueLabel + '<br/>'
     params.forEach((item) => {
-      result += `<div>${item.marker} ${item.seriesName}: ${item.value}</div>`
+      result += `<div>${item.marker} ${item.seriesName}: ${item.value}鍏�</div>`
     })
     return result
   },
diff --git a/src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue b/src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue
index 77ed111..21696fa 100644
--- a/src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue
+++ b/src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue
@@ -120,7 +120,7 @@
     textStyle: { fontSize: '100%' },
     formatter: function (params) {
       let result = params[0].axisValueLabel + '<br/>'
-      result += `<div>${params[0].marker}${params[0].value}</div>`
+      result += `<div>${params[0].marker}${params[0].value}鍏�</div>`
       return result
     },
   }

--
Gitblit v1.9.3