From cbe874c9dcc0ebbbcb87110c26abf6a6d527cb96 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 05 二月 2026 09:38:00 +0800
Subject: [PATCH] fix: 大屏样式修改
---
src/views/reportAnalysis/productionAnalysis/components/right-top.vue | 47 +++++++----
src/api/viewIndex.js | 49 +++++++++++
src/views/reportAnalysis/productionAnalysis/components/left-top.vue | 12 +-
src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue | 86 +++------------------
src/views/reportAnalysis/productionAnalysis/components/center-center.vue | 8 +-
src/views/reportAnalysis/productionAnalysis/components/center-top.vue | 6
6 files changed, 103 insertions(+), 105 deletions(-)
diff --git a/src/api/viewIndex.js b/src/api/viewIndex.js
index 84a2149..a14ed2a 100644
--- a/src/api/viewIndex.js
+++ b/src/api/viewIndex.js
@@ -15,11 +15,30 @@
method: "get",
});
};
-// 璐ㄦ鍒嗘瀽
-export const qualityStatistics = () => {
+// 璐ㄦ鍒嗘瀽锛堝彲浼� dateType: 1鍛� 2鏈� 3瀛ｅ害锛�
+export const qualityStatistics = (params) => {
return request({
url: "/home/qualityStatistics",
method: "get",
+ params,
+ });
+};
+
+// 宸ュ崟鎵ц鏁堢巼鍒嗘瀽锛坉ateType: 1鍛� 2鏈� 3瀛ｅ害锛�
+export const workOrderEfficiencyAnalysis = (params) => {
+ return request({
+ url: "/home/workOrderEfficiencyAnalysis",
+ method: "get",
+ params,
+ });
+};
+
+// 鐢熶骇鏍哥畻鍒嗘瀽锛坉ateType: 1鍛� 2鏈� 3瀛ｅ害锛�
+export const productionAccountingAnalysis = (params) => {
+ return request({
+ url: "/home/productionAccountingAnalysis",
+ method: "get",
+ params,
});
};
// 搴旀敹搴斾粯缁熻
@@ -51,6 +70,14 @@
export const getProgressStatistics = () => {
return request({
url: "/home/progressStatistics",
+ method: "get",
+ });
+};
+
+// 璁㈠崟鏁伴噺缁熻锛堢敓浜ц鍗曟暟銆佸凡瀹屾垚璁㈠崟鏁般�佸緟鐢熶骇璁㈠崟鏁帮級
+export const orderCount = () => {
+ return request({
+ url: "/home/orderCount",
method: "get",
});
};
@@ -123,6 +150,15 @@
});
};
+// 宸ュ簭浜у嚭鍒嗘瀽锛坉ateType: 1鍛� 2鏈� 3瀛ｅ害锛�
+export const processOutputAnalysis = (params) => {
+ return request({
+ url: "/home/processOutputAnalysis",
+ method: "get",
+ params,
+ });
+};
+
// 鍘熸潗鏂欓噰璐噾棰濆崰姣�
export const rawMaterialPurchaseAmountRatio = () => {
return request({
@@ -157,6 +193,15 @@
});
};
+// 鎶曞叆浜у嚭鍒嗘瀽
+export const inputOutputAnalysis = (params) => {
+ return request({
+ url: "/home/inputOutputAnalysis",
+ method: "get",
+ params,
+ });
+};
+
// 浜у搧鍛ㄨ浆澶╂暟
export const productTurnoverDays = () => {
return request({
diff --git a/src/views/reportAnalysis/productionAnalysis/components/center-center.vue b/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
index cd6a6b5..973c68d 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
@@ -30,7 +30,7 @@
import { ref, onMounted } from 'vue'
import * as echarts from 'echarts'
import Echarts from '@/components/Echarts/echarts.vue'
-import { productInOutAnalysis } from '@/api/viewIndex.js'
+import { inputOutputAnalysis } from '@/api/viewIndex.js'
const chartStyle = { width: '100%', height: '100%' }
const grid = {
@@ -132,13 +132,13 @@
}
const fetchData = () => {
- productInOutAnalysis({ type: 1 })
+ inputOutputAnalysis()
.then((res) => {
if (res.code === 200 && Array.isArray(res.data)) {
const list = res.data
xAxis1.value[0].data = list.map((d) => d.date)
- lineSeries.value[0].data = list.map((d) => Number(d.outCount) || 0)
- lineSeries.value[1].data = list.map((d) => Number(d.inCount) || 0)
+ lineSeries.value[0].data = list.map((d) => Number(d.outputSum) || 0)
+ lineSeries.value[1].data = list.map((d) => Number(d.inputSum) || 0)
}
})
.catch((err) => {
diff --git a/src/views/reportAnalysis/productionAnalysis/components/center-top.vue b/src/views/reportAnalysis/productionAnalysis/components/center-top.vue
index 0937b32..ad9e41a 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/center-top.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/center-top.vue
@@ -25,7 +25,7 @@
<script setup>
import { ref, onMounted } from 'vue'
-import { salesPurchaseStorageProductCount } from '@/api/viewIndex.js'
+import { orderCount } from '@/api/viewIndex.js'
const statItems = ref([])
@@ -37,7 +37,7 @@
const compareClass = (val) => (val >= 0 ? 'compare-up' : 'compare-down')
const fetchData = () => {
- salesPurchaseStorageProductCount()
+ orderCount()
.then((res) => {
if (res.code === 200 && Array.isArray(res.data)) {
statItems.value = res.data.map((item) => ({
@@ -48,7 +48,7 @@
}
})
.catch((err) => {
- console.error('鑾峰彇閿�鍞�/閲囪喘/鍌ㄥ瓨浜у搧鏁板け璐�:', err)
+ console.error('鑾峰彇璁㈠崟鏁伴噺缁熻澶辫触:', err)
})
}
diff --git a/src/views/reportAnalysis/productionAnalysis/components/left-top.vue b/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
index 0cce7d6..932def8 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
@@ -24,7 +24,7 @@
<script setup>
import { ref, onMounted, onBeforeUnmount, computed } from 'vue'
-import { productSalesAnalysis } from '@/api/viewIndex.js'
+import { processOutputAnalysis } from '@/api/viewIndex.js'
import PanelHeader from './PanelHeader.vue'
import Echarts from '@/components/Echarts/echarts.vue'
import DateTypeSwitch from '@/views/reportAnalysis/financialAnalysis/components/DateTypeSwitch.vue'
@@ -73,7 +73,7 @@
formatter: function (name) {
const item = pieObjData.value[name]
if (!item) return name
- return `{title|${name}}{value|${item.value}}{unit|鍏儅{percent|${item.rate}}{unit|%}`
+ return `{title|${name}}{value|${item.value}}{unit|浠秨{percent|${item.rate}}{unit|%}`
},
textStyle: {
rich: {
@@ -106,12 +106,12 @@
const pieTooltip = {
trigger: 'item',
- formatter: '{a} <br/>{b} : {c}鍏� ({d}%)',
+ formatter: '{a} <br/>{b} : {c}浠� ({d}%)',
}
const pieSeries = computed(() => [
{
- name: '浜у搧閿�鍞噾棰濆垎鏋�',
+ name: '宸ュ簭浜у嚭鍒嗘瀽',
type: 'pie',
radius: '60%',
center: ['25%', '50%'],
@@ -150,7 +150,7 @@
})
const fetchData = () => {
- productSalesAnalysis()
+ processOutputAnalysis({ dateType: dateType.value })
.then((res) => {
if (res.code === 200 && Array.isArray(res.data)) {
const items = res.data
@@ -162,7 +162,7 @@
}
})
.catch((err) => {
- console.error('鑾峰彇浜у搧閿�鍞噾棰濆垎鏋愬け璐�:', err)
+ console.error('鑾峰彇宸ュ簭浜у嚭鍒嗘瀽澶辫触:', err)
})
}
diff --git a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
index 981b7e0..57b87d0 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,25 +91,15 @@
}
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)
})
}
diff --git a/src/views/reportAnalysis/productionAnalysis/components/right-top.vue b/src/views/reportAnalysis/productionAnalysis/components/right-top.vue
index 9004362..33ef67b 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/right-top.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/right-top.vue
@@ -2,6 +2,9 @@
<div>
<PanelHeader title="宸ュ崟鎵ц鏁堢巼鍒嗘瀽" />
<div class="main-panel panel-item-customers">
+ <div class="filters-row">
+ <DateTypeSwitch v-model="dateType" @change="handleDateTypeChange" />
+ </div>
<Echarts
ref="chart"
:chartStyle="chartStyle"
@@ -20,13 +23,16 @@
<script setup>
import { ref, onMounted } from 'vue'
-import { qualityStatistics } from '@/api/viewIndex.js'
+import { workOrderEfficiencyAnalysis } from '@/api/viewIndex.js'
import PanelHeader from './PanelHeader.vue'
import Echarts from '@/components/Echarts/echarts.vue'
+import DateTypeSwitch from './DateTypeSwitch.vue'
+
+const dateType = ref(1) // 1=鍛� 2=鏈� 3=瀛ｅ害
const chartStyle = {
width: '100%',
- height: '160%',
+ height: '140%',
}
const grid = { left: '3%', right: '4%', bottom: '3%', top: '10%', containLabel: true }
@@ -124,26 +130,25 @@
},
]
+const handleDateTypeChange = () => {
+ fetchData()
+}
+
const fetchData = () => {
- qualityStatistics()
+ workOrderEfficiencyAnalysis({ dateType: dateType.value })
.then((res) => {
- if (!res?.data?.item || !Array.isArray(res.data.item)) return
- const items = res.data.item
+ if (res.code !== 200 || !Array.isArray(res.data)) return
+ const items = res.data
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))
- })
+ // 寮�宸�
+ chartSeries.value[0].data = items.map((d) => Number(d.startQuantity) || 0)
+ // 瀹屾垚
+ chartSeries.value[1].data = items.map((d) => Number(d.finishQuantity) || 0)
+ // 鑹搧鐜�
+ chartSeries.value[2].data = items.map((d) => Math.min(100, parseFloat(d.yieldRate) || 0))
})
.catch((err) => {
- console.error('鑾峰彇寮�宸ヤ笌鑹搧鐜囨暟鎹け璐�:', err)
+ console.error('鑾峰彇宸ュ崟鎵ц鏁堢巼鍒嗘瀽澶辫触:', err)
})
}
@@ -159,6 +164,14 @@
gap: 20px;
}
+.filters-row {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ gap: 12px;
+ margin-bottom: 10px;
+}
+
.panel-item-customers {
border: 1px solid #1a58b0;
padding: 18px;
--
Gitblit v1.9.3