From 93979953f60aab4394aa077cba2784bf06e259cf Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Tue, 3 Dec 2024 17:45:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9tkx=20=E6=A3=80?=
 =?UTF-8?q?=E5=AE=9A=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipmentjl.vue   | 4 ++--
 src/views/enm_rm/logDetail.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index 0d6537c4..b7cb118f 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -72,8 +72,6 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="下次检定日期" prop="next_check_date" width="70">
-        </el-table-column>
         <el-table-column label="精度等级" prop="accuracy_level" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="安装位置" prop="place" show-overflow-tooltip>
@@ -98,6 +96,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="下次检定日期" prop="next_check_date" width="70">
+        </el-table-column>
         <el-table-column label="备注" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.description }}</template>
         </el-table-column>
diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue
index 00c7bfbf..36c2f992 100644
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@@ -115,7 +115,7 @@
 									:sm="24"
 									v-if="form.mgroup_name == '回转窑' && (form.shift_name == '白班' || form.shift_name == '早班')"
 								>
-									<el-form-item label="煤粉热值(大卡)">
+									<el-form-item label="煤粉热值">
 										<el-input-number
 											v-model="form.pcoal_heat"
 											controls-position="right"