From 318de0e2190c3ff6c11bf1d5d17d23a1e84d584e Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 06 二月 2026 09:34:58 +0800
Subject: [PATCH] fix: 优化质量大屏样式
---
src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue | 135 +++++++++++++++++++++++++++++++-------------
1 files changed, 95 insertions(+), 40 deletions(-)
diff --git a/src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue b/src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue
index 2f2fb66..fe875d0 100644
--- a/src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue
+++ b/src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue
@@ -1,18 +1,23 @@
<template>
<div>
- <PanelHeader title="宸ュ崟鎵ц鏁堢巼鍒嗘瀽" />
+ <div class="chart-header">
+ <div class="chart-header-title">
+ <PanelHeader title="瀹屾垚妫�楠屾暟" />
+ </div>
+ <div class="warn-range" @click="handleRangeClick">杩�7澶�</div>
+ </div>
<div class="main-panel panel-item-customers">
<Echarts
- ref="chart"
- :chartStyle="chartStyle"
- :grid="grid"
- :legend="barLegend"
- :series="chartSeries"
- :tooltip="tooltip"
- :xAxis="xAxis1"
- :yAxis="yAxis1"
- :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }"
- style="height: 260px"
+ ref="chart"
+ :chartStyle="chartStyle"
+ :grid="grid"
+ :legend="barLegend"
+ :series="chartSeries"
+ :tooltip="tooltip"
+ :xAxis="xAxis1"
+ :yAxis="yAxis1"
+ :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }"
+ style="height: 260px"
/>
</div>
</div>
@@ -20,13 +25,13 @@
<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'
const chartStyle = {
width: '100%',
- height: '135%',
+ height: '140%',
}
const grid = { left: '3%', right: '4%', bottom: '3%', top: '10%', containLabel: true }
@@ -34,13 +39,12 @@
const barLegend = {
show: true,
textStyle: { color: '#B8C8E0' },
- data: ['寮�宸�', '瀹屾垚'],
+ data: ['鍚堟牸', '涓嶅悎鏍�', '鍚堟牸鐜�'],
}
-// 鏌辩姸鍥撅細寮�宸ャ�佸畬鎴愶紱鎶樼嚎鍥撅細鑹搧鐜囷紙棰滆壊 rgba(90, 216, 166, 1)锛�
const chartSeries = ref([
{
- name: '寮�宸�',
+ name: '鍚堟牸',
type: 'bar',
barWidth: 20,
barGap: '40%',
@@ -61,7 +65,7 @@
data: [],
},
{
- name: '瀹屾垚',
+ name: '涓嶅悎鏍�',
type: 'bar',
barGap: '40%',
barWidth: 20,
@@ -81,6 +85,18 @@
},
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 tooltip = {
@@ -89,7 +105,7 @@
formatter(params) {
let result = params[0].axisValueLabel + '<br/>'
params.forEach((item) => {
- const unit = item.seriesName === '杩�7澶�'
+ const unit = item.seriesName === '鍚堟牸鐜�' ? '%' : '浠�'
result += `<div>${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
})
return result
@@ -99,11 +115,12 @@
const xAxis1 = ref([
{ type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] },
])
+
const yAxis1 = [
{ type: 'value', name: '浠�', axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' } },
{
type: 'value',
- name: '杩�7澶�',
+ name: '鍚堟牸鐜�(%)',
min: 0,
max: 100,
axisLabel: { color: '#B8C8E0', formatter: '{value}%' },
@@ -113,26 +130,28 @@
]
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 +160,42 @@
</script>
<style scoped>
+.chart-header {
+ position: relative;
+ display: flex;
+ align-items: center;
+ width: 100%;
+}
+
+.chart-header-title {
+ flex: 1;
+ min-width: 0;
+ width: 100%;
+}
+
+.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;
@@ -151,6 +206,6 @@
border: 1px solid #1a58b0;
padding: 18px;
width: 100%;
- height: 449px;
+ height: 436px;
}
</style>
--
Gitblit v1.9.3