From c67c97444459800614ba2a20d2f1cd4097f237e5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 11 六月 2026 21:33:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/components/Echarts/echarts.vue | 4 ++++
src/views/reportAnalysis/productionAnalysis/components/center-center.vue | 21 +++++++++++++++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/components/Echarts/echarts.vue b/src/components/Echarts/echarts.vue
index 54a6c39..626f60d 100644
--- a/src/components/Echarts/echarts.vue
+++ b/src/components/Echarts/echarts.vue
@@ -203,6 +203,10 @@
clearInitTimer()
})
+defineExpose({
+ resize: windowResizeListener,
+})
+
// Watch all reactive props that affect the chart
watch(
() => [props.xAxis, props.yAxis, props.series, props.legend, props.tooltip, props.visualMap],
diff --git a/src/views/reportAnalysis/productionAnalysis/components/center-center.vue b/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
index e660a45..7221b47 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
@@ -15,7 +15,7 @@
<DateTypeSwitch v-model="dateType" @change="handleDateTypeChange" />
</div>
<Echarts
- ref="chart"
+ ref="chartRef"
:chartStyle="chartStyle"
:grid="grid"
:legend="lineLegend"
@@ -31,13 +31,14 @@
</template>
<script setup>
-import { ref, onMounted, inject, watch } from 'vue'
+import { ref, onMounted, inject, watch, nextTick } from 'vue'
import * as echarts from 'echarts'
import Echarts from '@/components/Echarts/echarts.vue'
import { inputOutputAnalysis } from '@/api/viewIndex.js'
import DateTypeSwitch from "@/views/reportAnalysis/productionAnalysis/components/DateTypeSwitch.vue";
const dateType = ref(3) // 1=鍛� 2=鏈� 3=瀛ｅ害
+const chartRef = ref(null)
const chartStyle = { width: '100%', height: '100%' }
const grid = {
left: '3%',
@@ -149,11 +150,20 @@
xAxis1.value[0].data = list.map((d) => d.date)
lineSeries.value[0].data = list.map((d) => Number(d.outputSum) || 0)
lineSeries.value[1].data = list.map((d) => Number(d.inputSum) || 0)
+ scheduleChartResize()
}
})
.catch((err) => {
console.error('鑾峰彇鎶曞叆浜у嚭鍒嗘瀽澶辫触:', err)
})
+}
+
+const scheduleChartResize = () => {
+ nextTick(() => {
+ ;[0, 150, 400].forEach((ms) => {
+ setTimeout(() => chartRef.value?.resize?.(), ms)
+ })
+ })
}
const dataDashboardRefreshTick = inject('dataDashboardRefreshTick', null)
@@ -165,6 +175,7 @@
onMounted(() => {
fetchData()
+ scheduleChartResize()
})
</script>
@@ -207,4 +218,10 @@
width: 50px;
height: 50px;
}
+
+.filters-row {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+}
</style>
--
Gitblit v1.9.3