diff --git a/src/views/plan/EnamellingMachineStatus.vue b/src/views/plan/EnamellingMachineStatus.vue index d96b988..9c81685 100644 --- a/src/views/plan/EnamellingMachineStatus.vue +++ b/src/views/plan/EnamellingMachineStatus.vue @@ -177,7 +177,36 @@ - + + +
+ 时间范围: + + + + + + + 显示单位: + + 箱数 + 重量 + +
+
+
+ 暂无销售和库存数据 +
+
+
+ +

销售历史 - {{ salesChartTitle }}

@@ -230,8 +259,6 @@ const selectedEquipment = ref('all') // 完成度筛选相关状态 const selectedCompletionLevel = ref('all') // 默认显示全部 -// 销售图表相关状态 -const showChart = ref(false) const salesChartLoading = ref(false) const historyChartLoading = ref(false) const salesData = ref([]) @@ -243,8 +270,13 @@ const chartUnit = ref('box') const salesChartTitle = ref('') const currentSalesAxle = ref(null) const salesChartRef = ref(null) +const salesChartDialogRef = ref(null) let salesChart = null +// 销售图表相关状态 +const showChart = ref(false) +const showChartDialog = ref(false) + // 当组件加载时,使用父组件传递的数据 equipmentData.value = props.equipmentData @@ -480,7 +512,12 @@ const showSalesHistory = (row) => { currentSalesAxle.value = { ...row }; salesChartTitle.value = `${row.equipment_code} - ${row.axle_number} - ${row.specification} - ${row.model}`; - showChart.value = true; + + if (selectedEquipment.value === 'all') { + showChartDialog.value = true; + } else { + showChart.value = true; + } salesData.value = []; historyData.value = []; @@ -494,6 +531,7 @@ const showSalesHistory = (row) => { // 方法:关闭图表 const closeChart = () => { showChart.value = false; + showChartDialog.value = false; if (salesChart) { salesChart.dispose(); salesChart = null; @@ -603,7 +641,10 @@ const initSalesChart = (retryCount = 0) => { return; } - if (!salesChartRef.value) { + const isDialog = showChartDialog.value; + const chartRef = isDialog ? salesChartDialogRef.value : salesChartRef.value; + + if (!chartRef) { if (retryCount >= 20) { return; } @@ -617,7 +658,7 @@ const initSalesChart = (retryCount = 0) => { salesChart.dispose(); } - salesChart = echarts.init(salesChartRef.value); + salesChart = echarts.init(chartRef); const salesDateMap = new Map(); const historyDateMap = new Map();