From 5def50f85ec4f7f118aa565aacad4669950605f1 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 13:57:19 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E6=A8=A1=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/energydevice/index.vue        | 119 ++++++--------------
 src/views/mes/energytype/EnergyTypeForm.vue |   4 +-
 2 files changed, 39 insertions(+), 84 deletions(-)

diff --git a/src/views/mes/energydevice/index.vue b/src/views/mes/energydevice/index.vue
index d2a34e69..e111d0e1 100644
--- a/src/views/mes/energydevice/index.vue
+++ b/src/views/mes/energydevice/index.vue
@@ -1,55 +1,28 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="能耗类型" prop="deviceType">
-        <el-select
-          v-model="queryParams.deviceType"
-          placeholder="请选择设备类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in typeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
+        <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable class="!w-240px">
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['mes:energy-device:create']"
-        >
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['mes:energy-device:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['mes:energy-device:export']"
-        >
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['mes:energy-device:export']">
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
@@ -58,38 +31,33 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      highlight-current-row
-      @current-change="handleCurrentChange"
-    >
-      <el-table-column label="编码" align="center" prop="code" />
-      <el-table-column label="名称" align="center" prop="name" />
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" highlight-current-row
+      @current-change="handleCurrentChange">
+      <el-table-column label="表编码" align="center" prop="code" />
+      <el-table-column label="表名称" align="center" prop="name" />
       <el-table-column label="能耗类型" align="center" prop="deviceTypeName" />
-      <el-table-column label="所属区域" align="center" prop="orgName" /> 
-      <el-table-column label="计算规则" align="center" prop="rules" /> 
-      <el-table-column label="抄表周期" align="center" prop="checkCron" />
+      <el-table-column label="所属区域" align="center" prop="orgName" />
+      <el-table-column label="计算规则" align="center" prop="rules" />
+      <!-- <el-table-column label="抄表周期" align="center" prop="checkCron" />
       <el-table-column label="最后抄表值" align="center" prop="lastCheckValue" />
-      <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column
+      <el-table-column label="单位" align="center" prop="unitName" /> -->
+      <!-- <el-table-column
         label="最后抄表时间"
         align="center"
         prop="lastCheckTime"
         :formatter="dateFormatter"
         width="180px"
-      />
+      /> -->
       <!-- <el-table-column label="设备资料" align="center" prop="info" /> -->
       <el-table-column label="是否启用" align="center" prop="isEnable">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
         </template>
       </el-table-column>
+      <el-table-column label="最近更新时间" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="操作" fixed="right" align="center" width="250px">
         <template #default="scope">
-          <el-button
+          <!-- <el-button
             link
             type="warning"
             @click="newRecordForm(scope.row.id,scope.row.name )"
@@ -104,33 +72,20 @@
             v-hasPermi="['mes:energy-device:update']"
           >
             重置
-          </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['mes:energy-device:update']"
-          >
+          </el-button> -->
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:energy-device:update']">
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['mes:energy-device:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:energy-device:delete']">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 新增设备表单弹窗：添加/修改 -->
@@ -140,14 +95,14 @@
   <!-- 抄表弹窗：添加/修改 -->
   <EnergyDeviceCheckRecordForm ref="newRecordFormRef" @success="getList" />
 
-  <!-- 子表的列表 -->
+  <!-- 子表的列表
   <ContentWrap>
     <el-tabs model-value="energyDeviceCheckRecord">
       <el-tab-pane :label="'抄表记录: '+currentRow.name" name="energyDeviceCheckRecord">
         <EnergyDeviceCheckRecordList :device-id="currentRow.id" :device-name="currentRow.name" />
       </el-tab-pane>
     </el-tabs>
-  </ContentWrap>
+  </ContentWrap> -->
 </template>
 
 <script setup lang="ts">
@@ -160,7 +115,7 @@ import ResetForm from './ResetForm.vue'
 import EnergyDeviceCheckRecordList from './components/EnergyDeviceCheckRecordList.vue'
 import EnergyDeviceCheckRecordForm
   from "@/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue";
-import {EnergyTypeApi, EnergyTypeVO} from "@/api/mes/energytype";
+import { EnergyTypeApi, EnergyTypeVO } from "@/api/mes/energytype";
 
 /** 能源设备 列表 */
 defineOptions({ name: 'EnergyDevice' })
@@ -196,7 +151,7 @@ const getList = async () => {
     const data = await EnergyDeviceApi.getEnergyDevicePage(queryParams)
     list.value = data.list
     total.value = data.total
-    if(list.value.length>0){
+    if (list.value.length > 0) {
       currentRow.value = list.value[0]
     }
   } finally {
@@ -236,7 +191,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */
diff --git a/src/views/mes/energytype/EnergyTypeForm.vue b/src/views/mes/energytype/EnergyTypeForm.vue
index 356f19a0..4d06a1f3 100644
--- a/src/views/mes/energytype/EnergyTypeForm.vue
+++ b/src/views/mes/energytype/EnergyTypeForm.vue
@@ -8,7 +8,7 @@
       v-loading="formLoading"
     >
       <el-form-item label="能耗类型编码" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入能耗类型编码" />
+        <el-input v-model="formData.code" placeholder="请输入能耗类型编码" :disabled="formType === 'update'" />
       </el-form-item>
       <el-form-item label="能耗类型名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入能耗类型名称" />
@@ -121,4 +121,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>