From e1535c267711c7c8d560e8916437167bbcd3156b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 02 二月 2026 17:54:31 +0800
Subject: [PATCH] feat: 进销质量类分析接口对接
---
src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue | 182 +++++++++++++++++++++++++++++++++++----------
1 files changed, 140 insertions(+), 42 deletions(-)
diff --git a/src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue b/src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue
index 2f2fb66..24d9552 100644
--- a/src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue
+++ b/src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue
@@ -1,6 +1,9 @@
<template>
<div>
- <PanelHeader title="宸ュ崟鎵ц鏁堢巼鍒嗘瀽" />
+ <div class="chart-header">
+ <PanelHeader title="瀹屾垚妫�楠屾暟" />
+ <div class="warn-range" @click="handleRangeClick">杩�7澶�</div>
+ </div>
<div class="main-panel panel-item-customers">
<Echarts
ref="chart"
@@ -20,7 +23,7 @@
<script setup>
import { ref, onMounted } from 'vue'
-import { qualityStatistics } from '@/api/viewIndex.js'
+import { completedInspectionCount } from '@/api/viewIndex.js'
import PanelHeader from './PanelHeader.vue'
import Echarts from '@/components/Echarts/echarts.vue'
@@ -29,21 +32,25 @@
height: '135%',
}
-const grid = { left: '3%', right: '4%', bottom: '3%', top: '10%', containLabel: true }
+const grid = { left: '8%', right: '8%', bottom: '8%', top: '15%', containLabel: true }
const barLegend = {
show: true,
- textStyle: { color: '#B8C8E0' },
- data: ['寮�宸�', '瀹屾垚'],
+ top: '5%',
+ left: 'center',
+ textStyle: { color: '#B8C8E0', fontSize: 14 },
+ itemGap: 30,
+ data: ['鍚堟牸', '涓嶅悎鏍�', '鍚堟牸鐜�'],
}
-// 鏌辩姸鍥撅細寮�宸ャ�佸畬鎴愶紱鎶樼嚎鍥撅細鑹搧鐜囷紙棰滆壊 rgba(90, 216, 166, 1)锛�
+// 鏌辩姸鍥撅細鍚堟牸锛堥粍鑹诧級銆佷笉鍚堟牸锛堢传鑹诧級锛涙姌绾垮浘锛氬悎鏍肩巼锛堣摑鑹诧級
const chartSeries = ref([
{
- name: '寮�宸�',
+ name: '鍚堟牸',
type: 'bar',
barWidth: 20,
- barGap: '40%',
+ barGap: '20%',
+ yAxisIndex: 0,
emphasis: { focus: 'series' },
itemStyle: {
color: {
@@ -53,18 +60,19 @@
x2: 0,
y2: 1,
colorStops: [
- { offset: 1, color: 'rgba(0, 164, 237, 0)' },
- { offset: 0, color: 'rgba(78, 228, 255, 1)' },
+ { offset: 0, color: 'rgba(255, 215, 0, 1)' }, // 閲戦粍鑹查《閮�
+ { offset: 1, color: 'rgba(255, 215, 0, 0.5)' }, // 鍗婇�忔槑搴曢儴
],
},
},
data: [],
},
{
- name: '瀹屾垚',
+ name: '涓嶅悎鏍�',
type: 'bar',
- barGap: '40%',
+ barGap: '20%',
barWidth: 20,
+ yAxisIndex: 0,
emphasis: { focus: 'series' },
itemStyle: {
color: {
@@ -74,9 +82,34 @@
x2: 0,
y2: 1,
colorStops: [
- { offset: 1, color: 'rgba(83, 126, 245, 0.19)' },
- { offset: 0, color: 'rgba(144, 97, 248, 1)' },
+ { offset: 0, color: 'rgba(144, 97, 248, 1)' }, // 绱壊椤堕儴
+ { offset: 1, color: 'rgba(144, 97, 248, 0.6)' }, // 鍗婇�忔槑搴曢儴
],
+ },
+ },
+ data: [],
+ },
+ {
+ name: '鍚堟牸鐜�',
+ type: 'line',
+ yAxisIndex: 1,
+ smooth: true,
+ symbol: 'circle',
+ symbolSize: 8,
+ lineStyle: {
+ color: 'rgba(78, 228, 255, 1)', // 闈掕壊
+ width: 2,
+ },
+ itemStyle: {
+ color: 'rgba(78, 228, 255, 1)',
+ borderWidth: 2,
+ borderColor: '#fff',
+ },
+ emphasis: {
+ focus: 'series',
+ itemStyle: {
+ shadowBlur: 10,
+ shadowColor: 'rgba(78, 228, 255, 0.8)',
},
},
data: [],
@@ -86,53 +119,87 @@
const tooltip = {
trigger: 'axis',
axisPointer: { type: 'cross' },
+ backgroundColor: 'rgba(0, 0, 0, 0.8)',
+ borderColor: 'rgba(78, 228, 255, 0.5)',
+ borderWidth: 1,
+ textStyle: { color: '#B8C8E0' },
formatter(params) {
let result = params[0].axisValueLabel + '<br/>'
params.forEach((item) => {
- const unit = item.seriesName === '杩�7澶�'
- result += `<div>${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
+ let unit = ''
+ if (item.seriesName === '鍚堟牸鐜�') {
+ unit = '%'
+ } else {
+ unit = '浠�'
+ }
+ result += `<div style="margin: 4px 0;">${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
})
return result
},
}
const xAxis1 = ref([
- { type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] },
+ {
+ type: 'category',
+ axisTick: { show: false },
+ axisLabel: { color: '#B8C8E0', fontSize: 12 },
+ axisLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.3)' } },
+ data: [],
+ },
])
+
const yAxis1 = [
- { type: 'value', name: '浠�', axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' } },
{
type: 'value',
- name: '杩�7澶�',
+ name: '鍗曚綅: 浠�',
+ nameLocation: 'start',
+ nameTextStyle: { color: '#B8C8E0', fontSize: 12, padding: [0, 0, 0, 10] },
+ axisLabel: { color: '#B8C8E0', fontSize: 12 },
+ axisLine: { show: false },
+ splitLine: {
+ show: true,
+ lineStyle: { color: 'rgba(184, 200, 224, 0.2)', type: 'dashed' },
+ },
+ },
+ {
+ type: 'value',
+ name: '鍗曚綅: %',
+ nameLocation: 'end',
+ nameTextStyle: { color: '#B8C8E0', fontSize: 12, padding: [0, 0, 0, 10] },
min: 0,
max: 100,
- axisLabel: { color: '#B8C8E0', formatter: '{value}%' },
- nameTextStyle: { color: '#B8C8E0' },
- splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } },
+ axisLabel: { color: '#B8C8E0', fontSize: 12, formatter: '{value}' },
+ axisLine: { show: false },
+ splitLine: {
+ show: true,
+ lineStyle: { color: 'rgba(184, 200, 224, 0.2)', type: 'dashed' },
+ },
},
]
const fetchData = () => {
- qualityStatistics()
- .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.processNum) || 0)
- // 瀹屾垚锛氬嚭鍘傛暟
- chartSeries.value[1].data = items.map((d) => Number(d.factoryNum) || 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))
- })
- })
- .catch((err) => {
- console.error('鑾峰彇寮�宸ヤ笌鑹搧鐜囨暟鎹け璐�:', err)
- })
+ completedInspectionCount()
+ .then((res) => {
+ if (res?.code === 200 && Array.isArray(res?.data)) {
+ const items = res.data
+ // 鏇存柊X杞存棩鏈熸暟鎹�
+ xAxis1.value[0].data = items.map((d) => d.dateStr || '')
+ // 鏇存柊鍚堟牸鏁帮紙榛勮壊鏌辩姸鍥撅級
+ chartSeries.value[0].data = items.map((d) => Number(d.qualifiedCount) || 0)
+ // 鏇存柊涓嶅悎鏍兼暟锛堢传鑹叉煴鐘跺浘锛�
+ chartSeries.value[1].data = items.map((d) => Number(d.unqualifiedCount) || 0)
+ // 鏇存柊鍚堟牸鐜囷紙钃濊壊鎶樼嚎鍥撅級
+ chartSeries.value[2].data = items.map((d) => Number(d.passRate) || 0)
+ }
+ })
+ .catch((err) => {
+ console.error('鑾峰彇瀹屾垚妫�楠屾暟鏁版嵁澶辫触:', err)
+ })
+}
+
+const handleRangeClick = () => {
+ // 鍏堟寜鎴浘鍋氶潤鎬�"杩�7澶�"锛屽悗缁湁鐪熷疄绛涢�夐渶姹傚啀鎺ュ叆
+ fetchData()
}
onMounted(() => {
@@ -141,6 +208,35 @@
</script>
<style scoped>
+.chart-header {
+ position: relative;
+ display: flex;
+ align-items: center;
+}
+
+.warn-range {
+ position: absolute;
+ right: 0;
+ top: 0;
+ height: 32px;
+ padding: 0 14px;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 4px;
+ color: #ffffff;
+ font-weight: 600;
+ font-size: 14px;
+ background: linear-gradient(180deg, rgba(51, 120, 255, 1) 0%, rgba(0, 164, 237, 1) 100%);
+ border: 1px solid rgba(78, 228, 255, 0.25);
+ cursor: pointer;
+ z-index: 10;
+}
+
+.warn-range:hover {
+ background: linear-gradient(180deg, rgba(51, 140, 255, 1) 0%, rgba(0, 184, 237, 1) 100%);
+}
+
.main-panel {
display: flex;
flex-direction: column;
@@ -152,5 +248,7 @@
padding: 18px;
width: 100%;
height: 449px;
+ position: relative;
+ background: radial-gradient(circle at 50% 50%, rgba(78, 228, 255, 0.05) 0%, rgba(0, 0, 0, 0) 70%);
}
</style>
--
Gitblit v1.9.3