From 2088822f2bca6d93ad3e550a166a9b18332747fd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 二月 2026 10:55:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue | 87 +++++++------------------------------------
1 files changed, 14 insertions(+), 73 deletions(-)
diff --git a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
index 981b7e0..8ecd507 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
@@ -23,7 +23,7 @@
<script setup>
import { ref, onMounted } from 'vue'
-import { qualityStatistics } from '@/api/viewIndex.js'
+import { productionAccountingAnalysis } from '@/api/viewIndex.js'
import PanelHeader from './PanelHeader.vue'
import DateTypeSwitch from './DateTypeSwitch.vue'
import Echarts from '@/components/Echarts/echarts.vue'
@@ -40,17 +40,15 @@
const barLegend = {
show: true,
textStyle: { color: '#B8C8E0' },
- data: ['浜ч噺', '宸ヨ祫', '鍚堟牸鐜�'],
+ data: ['鐢熶骇鏍哥畻'],
}
-// 鏌辩姸鍥撅細浜ч噺銆佸伐璧勶紱鎶樼嚎鍥撅細鍚堟牸鐜囷紙缁胯壊锛�
+// 鏌辩姸鍥撅細鐢熶骇鏍哥畻
const chartSeries = ref([
{
- name: '浜ч噺',
+ name: '鐢熶骇鏍哥畻',
type: 'bar',
- barWidth: 20,
- barGap: '40%',
- yAxisIndex: 0,
+ barWidth: 30,
emphasis: { focus: 'series' },
itemStyle: {
color: {
@@ -67,40 +65,6 @@
},
data: [],
},
- {
- name: '宸ヨ祫',
- type: 'bar',
- barGap: '40%',
- barWidth: 20,
- yAxisIndex: 1,
- 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: 2,
- 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 tooltip = {
@@ -109,10 +73,7 @@
formatter(params) {
let result = params[0].axisValueLabel + '<br/>'
params.forEach((item) => {
- let unit = '浠�'
- if (item.seriesName === '鍚堟牸鐜�') unit = '%'
- else if (item.seriesName === '宸ヨ祫') unit = '鍏�'
- result += `<div>${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
+ result += `<div>${item.marker} ${item.seriesName}: ${item.value} 鍏�</div>`
})
return result
},
@@ -122,18 +83,7 @@
{ type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] },
])
const yAxis1 = [
- { type: 'value', name: '浜ч噺(浠�)', position: 'left', axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' } },
- { type: 'value', name: '宸ヨ祫(鍏�)', position: 'left', offset: 50, axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' } },
- {
- type: 'value',
- name: '鍚堟牸鐜�(%)',
- position: 'right',
- min: 0,
- max: 100,
- axisLabel: { color: '#B8C8E0', formatter: '{value}%' },
- nameTextStyle: { color: '#B8C8E0' },
- splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } },
- },
+ { type: 'value', name: '鍗曚綅: 鍏�', axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' }, splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } } },
]
const handleDateTypeChange = () => {
@@ -141,28 +91,19 @@
}
const fetchData = () => {
- qualityStatistics()
+ productionAccountingAnalysis({ dateType: dateType.value })
.then((res) => {
- if (!res?.data?.item || !Array.isArray(res.data.item)) return
- const items = res.data.item
- xAxis1.value[0].data = items.map((d) => d.date)
- // 浜ч噺锛氬嚭鍘傛暟
- chartSeries.value[0].data = items.map((d) => Number(d.factoryNum) || 0)
- // 宸ヨ祫锛氭殏鏃犲崟鐙帴鍙ｏ紝鐢� 0 鍗犱綅锛屽悗缁彲鎺ュ伐璧勬帴鍙�
- chartSeries.value[1].data = items.map(() => 0)
- // 鍚堟牸鐜囷細鍑哄巶鏁�/杩囩▼鏁�*100锛堟棤鍗曠嫭鎺ュ彛鏃剁敤姝ゅ崰浣嶏級
- chartSeries.value[2].data = items.map((d) => {
- const processNum = Number(d.processNum) || 0
- const factoryNum = Number(d.factoryNum) || 0
- if (processNum <= 0) return 0
- return Math.min(100, Math.round((factoryNum / processNum) * 100))
- })
+ 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)
})
.catch((err) => {
- console.error('鑾峰彇浜ч噺銆佸伐璧勪笌鍚堟牸鐜囨暟鎹け璐�:', err)
+ console.error('鑾峰彇鐢熶骇鏍哥畻鍒嗘瀽澶辫触:', err)
})
}
+
onMounted(() => {
fetchData()
})
--
Gitblit v1.9.3