From 62f69a129faaf9bd4018b2f594a9cd4daa8a76d4 Mon Sep 17 00:00:00 2001
From: 25604 <ljf25604@163.com>
Date: Fri, 12 Dec 2025 13:50:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E6=9A=96=E7=B3=BB=E7=BB=9F=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=AE=9A=E6=B8=A9=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boilerSys/heatingRunReport/index.vue      | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/views/boilerSys/heatingRunReport/index.vue b/src/views/boilerSys/heatingRunReport/index.vue
index 2ac3156..2b88d65 100644
--- a/src/views/boilerSys/heatingRunReport/index.vue
+++ b/src/views/boilerSys/heatingRunReport/index.vue
@@ -57,6 +57,10 @@
           prop="runStatusBoilerOne"
           label="运行状态"
         ></el-table-column>
+        <el-table-column
+          prop="tempSetBoilerOne"
+          label="设定温度(℃)"
+        ></el-table-column>
         <el-table-column
           prop="tempOutBoilerOne"
           label="出水温度(℃)"
@@ -79,6 +83,10 @@
           prop="runStatusBoilerTwo"
           label="运行状态"
         ></el-table-column>
+        <el-table-column
+          prop="tempSetBoilerTwo"
+          label="设定温度(℃)"
+        ></el-table-column>
         <el-table-column
           prop="tempOutBoilerTwo"
           label="出水温度(℃)"
@@ -169,14 +177,21 @@
           <el-col :span="24" class="oneRowLabel">1号采暖设备</el-col>
         </el-row>
         <el-row type="flex" justify="center">
-          <el-col :span="24">
-            <el-form-item label="运行状态" prop="runStatusBoilerOne">
+          <el-col :span="12">
+            <el-form-item label="运 行 状 态" prop="runStatusBoilerOne">
               <el-input
                 disabled
                 v-model="form.runStatusBoilerOne"
                 placeholder=""
               /> </el-form-item
           ></el-col>
+          <el-col :span="12">
+            <el-form-item label="设定温度℃" prop="tempSetBoilerOne">
+              <el-input
+                v-model="form.tempSetBoilerOne"
+                placeholder=""
+              /> </el-form-item
+          ></el-col>
         </el-row>
         <el-row type="flex" justify="center">
           <el-col :span="12">
@@ -218,14 +233,21 @@
           <el-col :span="24" class="oneRowLabel">2号采暖设备</el-col>
         </el-row>
         <el-row type="flex" justify="center">
-          <el-col :span="24">
-            <el-form-item label="运行状态" prop="runStatusBoilerTwo">
+          <el-col :span="12">
+            <el-form-item label="运 行 状 态" prop="runStatusBoilerTwo">
               <el-input
                 disabled
                 v-model="form.runStatusBoilerTwo"
                 placeholder=""
               /> </el-form-item
           ></el-col>
+          <el-col :span="12">
+            <el-form-item label="设定温度℃" prop="tempSetBoilerTwo">
+              <el-input
+                v-model="form.tempSetBoilerTwo"
+                placeholder=""
+              /> </el-form-item
+          ></el-col>
         </el-row>
         <el-row type="flex" justify="center">
           <el-col :span="12">
@@ -437,15 +459,16 @@ export default {
     },
     tableRowStyle({ row, column, rowIndex, columnIndex }) {
       // 只处理第 2、6、13 列（索引从 0 开始）
-      if ([1, 6, 11, 13, 15].includes(columnIndex)) {
+      if ([1, 2, 7, 8, 11, 13, 15, 17].includes(columnIndex)) {
         const value = row[column.property]; // 获取当前单元格的值
+        console.log("column", column);
         if (value === "停止") {
           return {
             color: "#fd1e00",
             textAlign: "center",
             fontWeight: "bold",
           };
-        } else if (value === "运行") {
+        } else if (value === "运行" || column.label.includes("设定温度")) {
           return {
             color: "#00c250",
             textAlign: "center",