From d26482d4cbb4f12ddce225087349e9b9b158899a Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Fri, 30 Jan 2026 17:01:37 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E7=BA=BF=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E7=9C=8B=E6=9D=BF-=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0orgId=E5=85=A5=E5=8F=82=EF=BC=8C=E4=BA=A7=E9=87=8F?=
 =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E6=A8=A1=E5=9D=97=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dashboard/index.ts                    |  12 +-
 src/api/iot/device/index.ts                   |   2 +-
 src/api/iot/deviceWarningRecord/index.ts      |   4 +
 src/api/mes/energytype/index.ts               |   4 +-
 .../dashboard1/components/DashboardHeader.vue |   4 +-
 .../dashboard1/components/EnergyMonitor.vue   |   2 +-
 .../dashboard1/components/ProductionTrend.vue | 104 +++++++++++-------
 .../report/dashboardPage/dashboard1/index.vue |   9 +-
 .../dashboard8/components/DashboardHeader.vue |   4 +-
 .../dashboard8/components/EnergyTrend.vue     |  10 +-
 10 files changed, 88 insertions(+), 67 deletions(-)

diff --git a/src/api/dashboard/index.ts b/src/api/dashboard/index.ts
index 7a138d73..c17cc640 100644
--- a/src/api/dashboard/index.ts
+++ b/src/api/dashboard/index.ts
@@ -73,8 +73,8 @@ getPlan: async () => {
   getTodoList: async () => {
     return await request.get({ url: `/mes/dashboard/getTodoList` })
   },
-  getDeviceOperationalStatus: async () => {
-    return await request.get({ url: `/iot/device/getDeviceOperationalStatus` })
+  getDeviceOperationalStatus: async (params?: any) => {
+    return await request.get({ url: `/iot/device/getDeviceOperationalStatus`, params })
   },
   getDeviceRepairLineOptions: async () => {
     return await request.get({ url: `/mes/dashboard/getDeviceRepairLineOptions` })
@@ -85,11 +85,11 @@ getDeviceTypePieOptions: async () => {
   getMoldTypeBarOptions: async () => {
     return await request.get({ url: `/mes/dashboard/getMoldTypeBarOptions` })
   },
-  getTaskStatistics: async () => {
-    return await request.get<TaskStatisticsResponse>({ url: `/mes/dashboard/getTaskStatistics` })
+  getTaskStatistics: async (params?: any) => {
+    return await request.get<TaskStatisticsResponse>({ url: `/mes/dashboard/getTaskStatistics`, params })
   },
-  getAllTaskList: async () => {
-    return await request.get<DashboardTaskListResponse>({ url: `/mes/dashboard/getAllTaskList` })
+  getAllTaskList: async (params?: any) => {
+    return await request.get<DashboardTaskListResponse>({ url: `/mes/dashboard/getAllTaskList`, params })
   }
 }
 
diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts
index fe1610e7..46bc9046 100644
--- a/src/api/iot/device/index.ts
+++ b/src/api/iot/device/index.ts
@@ -98,7 +98,7 @@ export const DeviceApi = {
   },
 
   // 批量获取设备属性列表
-  getDeviceAttributeBatchList: async (params: { deviceIds: string }) => {
+  getDeviceAttributeBatchList: async (params: { deviceIds: string; orgId?: number | string }) => {
     return await request.get({ url: `/iot/device/device-attribute/batchList`, params })
   },
   // 修改物联设备
diff --git a/src/api/iot/deviceWarningRecord/index.ts b/src/api/iot/deviceWarningRecord/index.ts
index b15cd8a3..311c904f 100644
--- a/src/api/iot/deviceWarningRecord/index.ts
+++ b/src/api/iot/deviceWarningRecord/index.ts
@@ -24,5 +24,9 @@ export const DeviceWarningRecordApi = {
   // 获得实时报警记录列表
   getList: async (params?: any) => {
     return await request.get({ url: `/iot/device-warinning-record/getList`, params })
+  },
+  // 获得最近7小时产量
+  getLastSevenHoursCount: async (params?: any) => {
+    return await request.get({ url: `/iot/device-warinning-record/getLastSevenHoursCount`, params })
   }
 }
diff --git a/src/api/mes/energytype/index.ts b/src/api/mes/energytype/index.ts
index 62677641..da4ff0a7 100644
--- a/src/api/mes/energytype/index.ts
+++ b/src/api/mes/energytype/index.ts
@@ -43,7 +43,7 @@ export const EnergyTypeApi = {
   },
 
       // 获得能耗类型列表
-      getEnergyTypeList: async () => {
-        return await request.get({ url: `/mes/energy-type/list`})
+      getEnergyTypeList: async (params?: any) => {
+        return await request.get({ url: `/mes/energy-type/list`, params })
       },
 }
diff --git a/src/views/report/dashboardPage/dashboard1/components/DashboardHeader.vue b/src/views/report/dashboardPage/dashboard1/components/DashboardHeader.vue
index ee07885b..41670787 100644
--- a/src/views/report/dashboardPage/dashboard1/components/DashboardHeader.vue
+++ b/src/views/report/dashboardPage/dashboard1/components/DashboardHeader.vue
@@ -47,10 +47,10 @@
         </div>
       </div>
       <div class="header-right">
-        <div class="back-btn" @click="goBack">
+        <!-- <div class="back-btn" @click="goBack">
           <Icon icon="ep:back" />
           <span>返回</span>
-        </div>
+        </div> -->
         <div class="weather">
           <Icon icon="fa-solid:cloud-sun" class="weather-icon" />
           <div class="weather-meta">
diff --git a/src/views/report/dashboardPage/dashboard1/components/EnergyMonitor.vue b/src/views/report/dashboardPage/dashboard1/components/EnergyMonitor.vue
index fb19dd4e..62e581cc 100644
--- a/src/views/report/dashboardPage/dashboard1/components/EnergyMonitor.vue
+++ b/src/views/report/dashboardPage/dashboard1/components/EnergyMonitor.vue
@@ -37,7 +37,7 @@ let chart: echarts.ECharts | null = null
 
 const getEnergyTypes = async () => {
   try {
-    const res = await EnergyTypeApi.getEnergyTypeList()
+    const res = await EnergyTypeApi.getEnergyTypeList({ orgId })
     const list = (res as any).data || (Array.isArray(res) ? res : [])
     energyTypes.value = list
     if (list.length > 0) {
diff --git a/src/views/report/dashboardPage/dashboard1/components/ProductionTrend.vue b/src/views/report/dashboardPage/dashboard1/components/ProductionTrend.vue
index 144de130..3a1fae63 100644
--- a/src/views/report/dashboardPage/dashboard1/components/ProductionTrend.vue
+++ b/src/views/report/dashboardPage/dashboard1/components/ProductionTrend.vue
@@ -13,52 +13,76 @@
 
 <script setup lang="ts">
 import { onMounted, onUnmounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
 import * as echarts from 'echarts'
 import { colors, style } from '../utils'
+import { DeviceWarningRecordApi } from '@/api/iot/deviceWarningRecord'
 
+const route = useRoute()
 const chartRef = ref<HTMLElement | null>(null)
 let chart: echarts.ECharts | null = null
 
-const render = () => {
-  if (!chart) return
-  const x = ['9:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00']
-  const output = [320, 460, 520, 610, 720, 690, 780]
-  const passRate = [98.5, 99.2, 98.1, 98.9, 99.0, 98.6, 99.3]
-
-  chart.setOption({
-    backgroundColor: 'transparent',
-    tooltip: { trigger: 'axis' },
-    grid: { top: '18%', left: '6%', right: '6%', bottom: '12%', containLabel: true },
-    xAxis: { type: 'category', data: x, axisLine: style.axisLine, axisLabel: { ...style.axisLabel, fontSize: 10 } },
-    yAxis: [
-      { type: 'value', axisLine: { show: false }, axisLabel: { ...style.axisLabel, fontSize: 10 }, splitLine: style.splitLine },
-      { type: 'value', min: 96, max: 100, axisLine: { show: false }, axisLabel: { ...style.axisLabel, fontSize: 10 }, splitLine: { show: false } }
-    ],
-    series: [
-      {
-        name: '产量',
-        type: 'bar',
-        barWidth: 12,
-        itemStyle: {
-          borderRadius: [6, 6, 0, 0],
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: colors.purple },
-            { offset: 1, color: 'rgba(139,92,246,0.10)' }
-          ])
-        },
-        data: output
-      },
-      {
-        name: '良率',
-        type: 'line',
-        yAxisIndex: 1,
-        smooth: true,
-        showSymbol: false,
-        lineStyle: { width: 2, color: colors.cyan },
-        data: passRate
-      }
-    ]
-  })
+const render = async () => {
+	if (!chart) return
+
+	let x: string[] = []
+	let output: number[] = []
+
+	try {
+		const orgId = route.query.orgId
+		const res = await DeviceWarningRecordApi.getLastSevenHoursCount({ orgId })
+		const raw = res && typeof res === 'object' && 'data' in (res as any) ? (res as any).data : res
+		const list = Array.isArray(raw) ? raw : []
+		if (list.length > 0) {
+			x = list.map((item: any) => {
+				const h = item.hour || item.time || item.key || item.name || ''
+				if (typeof h === 'string' && h.includes(' ')) {
+					return h.split(' ')[1]
+				}
+				return h
+			})
+			output = list.map((item: any) => {
+				const val = item.count ?? item.value ?? item.output ?? 0
+				const n = Number(val)
+				return Number.isFinite(n) ? n : 0
+			})
+		}
+	} catch (e) {
+		console.error('Fetch production trend failed:', e)
+	}
+
+	chart.setOption({
+		backgroundColor: 'transparent',
+		tooltip: { trigger: 'axis' },
+		grid: { top: '18%', left: '6%', right: '6%', bottom: '16%', containLabel: true },
+		xAxis: {
+			type: 'category',
+			data: x,
+			axisLine: style.axisLine,
+			axisLabel: { ...style.axisLabel, fontSize: 10, rotate: 40 }
+		},
+		yAxis: {
+			type: 'value',
+			axisLine: { show: false },
+			axisLabel: { ...style.axisLabel, fontSize: 10 },
+			splitLine: style.splitLine
+		},
+		series: [
+			{
+				name: '产量',
+				type: 'bar',
+				barWidth: 12,
+				itemStyle: {
+					borderRadius: [6, 6, 0, 0],
+					color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+						{ offset: 0, color: colors.purple },
+						{ offset: 1, color: 'rgba(139,92,246,0.10)' }
+					])
+				},
+				data: output
+			}
+		]
+	})
 }
 
 const resize = () => {
diff --git a/src/views/report/dashboardPage/dashboard1/index.vue b/src/views/report/dashboardPage/dashboard1/index.vue
index a3d8fa68..35ebe61e 100644
--- a/src/views/report/dashboardPage/dashboard1/index.vue
+++ b/src/views/report/dashboardPage/dashboard1/index.vue
@@ -99,6 +99,7 @@ import ProductionTrend from './components/ProductionTrend.vue'
 
 const route = useRoute()
 const deviceIds = route.query.deviceIds as string
+const orgId = route.query.orgId
 
 interface DeviceAttribute {
   attributeName: string
@@ -127,10 +128,10 @@ const getBottomLeft = (index: number) => {
 }
 
 const loadDeviceAttributes = async () => {
-  if (!deviceIds) return
-  try {
-    const res = await DeviceApi.getDeviceAttributeBatchList({ deviceIds })
-    const list = (res && Array.isArray(res) ? res : []) as any[]
+    if (!deviceIds) return
+    try {
+      const res = await DeviceApi.getDeviceAttributeBatchList({ deviceIds, orgId })
+      const list = (res && Array.isArray(res) ? res : []) as any[]
     
     // 假设返回的 list 顺序对应传入的 deviceIds 顺序，或者根据 deviceId 匹配
     // 这里简单按顺序分配前4个给 top，后4个给 bottom
diff --git a/src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue b/src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue
index c9ba2ec3..581b99f6 100644
--- a/src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue
+++ b/src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue
@@ -11,10 +11,10 @@
         </div>
       </div>
       <div class="header-right">
-        <el-button class="back-btn" type="primary" size="small" plain @click="goBack">
+        <!-- <el-button class="back-btn" type="primary" size="small" plain @click="goBack">
           <Icon icon="fa-solid:arrow-left" class="back-icon" />
           <span>返回</span>
-        </el-button>
+        </el-button> -->
         <span class="chip">
           <Icon icon="fa-regular:clock" class="chip-icon" />
           <span>{{ timeStr }}</span>
diff --git a/src/views/report/dashboardPage/dashboard8/components/EnergyTrend.vue b/src/views/report/dashboardPage/dashboard8/components/EnergyTrend.vue
index 5e03082a..12eeb558 100644
--- a/src/views/report/dashboardPage/dashboard8/components/EnergyTrend.vue
+++ b/src/views/report/dashboardPage/dashboard8/components/EnergyTrend.vue
@@ -39,7 +39,7 @@ let chart: echarts.ECharts | null = null
 
 const getEnergyTypes = async () => {
   try {
-    const res = await EnergyTypeApi.getEnergyTypeList()
+    const res = await EnergyTypeApi.getEnergyTypeList({ orgId })
     const list = (res as any).data || (Array.isArray(res) ? res : [])
     energyTypes.value = list
     if (list.length > 0 && !selectedEnergyTypeId.value) {
@@ -110,14 +110,6 @@ const render = (data: any = []) => {
           ])
         },
         data: actual
-      },
-      {
-        name: '基准能耗(kWh)',
-        type: 'line',
-        smooth: true,
-        showSymbol: false,
-        lineStyle: { width: 2, color: colors.green },
-        data: baseline
       }
     ]
   })