From 1c829f9177eab675b22be4d20ef2761ed1bbb423 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 15 九月 2026 16:15:48 +0800
Subject: [PATCH] refactor(layout): 调整布局样式并优化轮播卡片组件
---
src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue | 135 +++++++++++++++++++--------------------------
1 files changed, 57 insertions(+), 78 deletions(-)
diff --git a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
index 981b7e0..0562fba 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
@@ -1,7 +1,7 @@
<template>
<div>
<PanelHeader title="鐢熶骇鏍哥畻鍒嗘瀽" />
- <div class="main-panel panel-item-customers">
+ <div class="main-panel panel-item-customers bi-panel">
<div class="filters-row">
<DateTypeSwitch v-model="dateType" @change="handleDateTypeChange" />
</div>
@@ -14,7 +14,7 @@
:tooltip="tooltip"
:xAxis="xAxis1"
:yAxis="yAxis1"
- :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }"
+ :options="{ backgroundColor: 'transparent', textStyle: { color: BI_COLORS.text } }"
style="height: 260px"
/>
</div>
@@ -23,143 +23,122 @@
<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'
+import { BI_COLORS, BI_TOOLTIP, barGradient } from '../theme.js'
-const dateType = ref(1) // 1=鍛� 2=鏈� 3=瀛ｅ害
+const dateType = ref(3) // 1=鍛� 2=鏈� 3=瀛ｅ害锛岄粯璁ゅ搴�
const chartStyle = {
width: '100%',
- height: '140%',
+ height: '100%',
}
-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: ['浜ч噺', '宸ヨ祫', '鍚堟牸鐜�'],
+ textStyle: { color: BI_COLORS.text },
+ data: ['瀹屾垚鏁伴噺', '宸ヨ祫閲戦', '鍚堟牸鐜�'],
}
-// 鏌辩姸鍥撅細浜ч噺銆佸伐璧勶紱鎶樼嚎鍥撅細鍚堟牸鐜囷紙缁胯壊锛�
const chartSeries = ref([
{
- name: '浜ч噺',
+ name: '瀹屾垚鏁伴噺',
type: 'bar',
barWidth: 20,
barGap: '40%',
- yAxisIndex: 0,
emphasis: { focus: 'series' },
itemStyle: {
- color: {
- type: 'linear',
- x: 0,
- y: 0,
- x2: 0,
- y2: 1,
- colorStops: [
- { offset: 1, color: 'rgba(0, 164, 237, 0)' },
- { offset: 0, color: 'rgba(78, 228, 255, 1)' },
- ],
- },
+ borderRadius: [3, 3, 0, 0],
+ color: barGradient(BI_COLORS.primary),
},
data: [],
},
{
- name: '宸ヨ祫',
+ 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)' },
- ],
- },
+ borderRadius: [3, 3, 0, 0],
+ color: barGradient(BI_COLORS.violet),
},
data: [],
},
{
name: '鍚堟牸鐜�',
type: 'line',
- yAxisIndex: 2,
+ yAxisIndex: 1,
+ smooth: true,
showSymbol: true,
symbol: 'circle',
- symbolSize: 8,
- lineStyle: { color: 'rgba(90, 216, 166, 1)', width: 2 },
- itemStyle: { color: 'rgba(90, 216, 166, 1)' },
+ symbolSize: 6,
+ lineStyle: { color: BI_COLORS.amber, width: 2 },
+ itemStyle: { color: BI_COLORS.amber },
data: [],
emphasis: { focus: 'series' },
},
])
+const xAxis1 = ref([
+ { type: 'category', axisTick: { show: false }, axisLine: { lineStyle: { color: BI_COLORS.axisLine } }, axisLabel: { color: BI_COLORS.text }, data: [] },
+])
+
+const yAxis1 = [
+ {
+ type: 'value',
+ name: '鏁伴噺/閲戦',
+ axisLabel: { color: BI_COLORS.text },
+ nameTextStyle: { color: BI_COLORS.text },
+ splitLine: { lineStyle: { color: BI_COLORS.splitLine } },
+ },
+ {
+ type: 'value',
+ name: '鍚堟牸鐜�(%)',
+ min: 0,
+ max: 100,
+ axisLabel: { color: BI_COLORS.text, formatter: '{value}%' },
+ nameTextStyle: { color: BI_COLORS.text },
+ splitLine: { show: false },
+ },
+]
+
const tooltip = {
trigger: 'axis',
axisPointer: { type: 'cross' },
+ ...BI_TOOLTIP,
formatter(params) {
let result = params[0].axisValueLabel + '<br/>'
params.forEach((item) => {
- let unit = '浠�'
- if (item.seriesName === '鍚堟牸鐜�') unit = '%'
- else if (item.seriesName === '宸ヨ祫') unit = '鍏�'
+ 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: '浜ч噺(浠�)', 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)' } },
- },
-]
-
const handleDateTypeChange = () => {
fetchData()
}
const fetchData = () => {
- qualityStatistics()
+ productionAccountingAnalysis({ type: 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)) {
+ 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)
})
}
@@ -184,9 +163,9 @@
}
.panel-item-customers {
- border: 1px solid #1a58b0;
padding: 18px;
width: 100%;
height: 449px;
+ box-sizing: border-box;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3