From e0cb2008ffb01348b54a7370180a100f3c975877 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 06 二月 2026 10:49:24 +0800
Subject: [PATCH] Merge branch 'dev_New' into dev_天津军泰伟业

---
 src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue |   97 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
index 57b87d0..28de03b 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
@@ -28,27 +28,27 @@
 import DateTypeSwitch from './DateTypeSwitch.vue'
 import Echarts from '@/components/Echarts/echarts.vue'
 
-const dateType = ref(1) // 1=鍛� 2=鏈� 3=瀛ｅ害
+const dateType = ref(1)
 
 const chartStyle = {
   width: '100%',
   height: '140%',
 }
 
-const grid = { left: '10%', right: '4%', bottom: '3%', top: '10%', containLabel: true }
+const grid = { left: '3%', right: '4%', bottom: '3%', top: '10%', containLabel: true }
 
 const barLegend = {
   show: true,
   textStyle: { color: '#B8C8E0' },
-  data: ['鐢熶骇鏍哥畻'],
+  data: ['瀹屾垚鏁伴噺', '宸ヨ祫閲戦', '鍚堟牸鐜�'],
 }
 
-// 鏌辩姸鍥撅細鐢熶骇鏍哥畻
 const chartSeries = ref([
   {
-    name: '鐢熶骇鏍哥畻',
+    name: '瀹屾垚鏁伴噺',
     type: 'bar',
-    barWidth: 30,
+    barWidth: 20,
+    barGap: '40%',
     emphasis: { focus: 'series' },
     itemStyle: {
       color: {
@@ -65,7 +65,63 @@
     },
     data: [],
   },
+  {
+    name: '宸ヨ祫閲戦',
+    type: 'bar',
+    barGap: '40%',
+    barWidth: 20,
+    emphasis: { focus: 'series' },
+    itemStyle: {
+      color: {
+        type: 'linear',
+        x: 0,
+        y: 0,
+        x2: 0,
+        y2: 1,
+        colorStops: [
+          { offset: 1, color: 'rgba(83, 126, 245, 0.19)' },
+          { offset: 0, color: 'rgba(144, 97, 248, 1)' },
+        ],
+      },
+    },
+    data: [],
+  },
+  {
+    name: '鍚堟牸鐜�',
+    type: 'line',
+    yAxisIndex: 1,
+    showSymbol: true,
+    symbol: 'circle',
+    symbolSize: 8,
+    lineStyle: { color: 'rgba(90, 216, 166, 1)', width: 2 },
+    itemStyle: { color: 'rgba(90, 216, 166, 1)' },
+    data: [],
+    emphasis: { focus: 'series' },
+  },
 ])
+
+const xAxis1 = ref([
+  { type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] },
+])
+
+const yAxis1 = [
+  {
+    type: 'value',
+    name: '鏁伴噺/閲戦',
+    axisLabel: { color: '#B8C8E0' },
+    nameTextStyle: { color: '#B8C8E0' },
+    // splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } },
+  },
+  {
+    type: 'value',
+    name: '鍚堟牸鐜�(%)',
+    min: 0,
+    max: 100,
+    axisLabel: { color: '#B8C8E0', formatter: '{value}%' },
+    nameTextStyle: { color: '#B8C8E0' },
+    splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } },
+  },
+]
 
 const tooltip = {
   trigger: 'axis',
@@ -73,33 +129,31 @@
   formatter(params) {
     let result = params[0].axisValueLabel + '<br/>'
     params.forEach((item) => {
-      result += `<div>${item.marker} ${item.seriesName}: ${item.value} 鍏�</div>`
+      const unit = item.seriesName === '鍚堟牸鐜�' ? '%' : (item.seriesName === '宸ヨ祫閲戦' ? ' 鍏�' : ' 涓�')
+      result += `<div>${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
     })
     return result
   },
 }
-
-const xAxis1 = ref([
-  { type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] },
-])
-const yAxis1 = [
-  { type: 'value', name: '鍗曚綅: 鍏�', axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' }, splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } } },
-]
 
 const handleDateTypeChange = () => {
   fetchData()
 }
 
 const fetchData = () => {
-  productionAccountingAnalysis({ dateType: dateType.value })
+  productionAccountingAnalysis({ type: dateType.value })
     .then((res) => {
-      if (res.code !== 200 || !Array.isArray(res.data)) return
-      const items = res.data
-      xAxis1.value[0].data = items.map((d) => d.name)
-      chartSeries.value[0].data = items.map((d) => parseFloat(d.value) || 0)
+      if (res.code === 200 && Array.isArray(res.data)) {
+        const items = res.data
+
+        xAxis1.value[0].data = items.map(item => item.dateStr)
+        chartSeries.value[0].data = items.map(item => Number(item.numberOfCompleted) || 0)
+        chartSeries.value[1].data = items.map(item => Number(item.amount) || 0)
+        chartSeries.value[2].data = items.map(item => Number(item.passRate) || 0)
+      }
     })
     .catch((err) => {
-      console.error('鑾峰彇鐢熶骇鏍哥畻鍒嗘瀽澶辫触:', err)
+      console.error('鏁版嵁鍔犺浇澶辫触', err)
     })
 }
 
@@ -128,5 +182,6 @@
   padding: 18px;
   width: 100%;
   height: 449px;
+  box-sizing: border-box;
 }
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.3