From 17539eecb0a46793cad68152c6337aa61e0b369d Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 09:32:24 +0800
Subject: [PATCH 01/10] =?UTF-8?q?style=EF=BC=9A=E7=BB=B4=E4=BF=AE=E5=8D=95?=
 =?UTF-8?q?-=E5=B1=8F=E8=94=BD=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95=E8=A1=8C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dvrepair/components/DvRepairLineForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/dvrepair/components/DvRepairLineForm.vue b/src/views/mes/dvrepair/components/DvRepairLineForm.vue
index eae05c50..e08428fd 100644
--- a/src/views/mes/dvrepair/components/DvRepairLineForm.vue
+++ b/src/views/mes/dvrepair/components/DvRepairLineForm.vue
@@ -86,9 +86,9 @@
       </el-table-column> -->
     </el-table>
   </el-form>
-  <el-row justify="center" class="mt-3">
+  <!-- <el-row justify="center" class="mt-3">
     <el-button @click="handleAdd" round>+ 添加设备维修记录行</el-button>
-  </el-row>
+  </el-row> -->
 </template>
 <script setup lang="ts">
 import { DvRepairApi } from '@/api/mes/dvrepair'

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

---
 src/api/erp/mold/index.ts                  | 1 +
 src/views/erp/mold/components/MoldForm.vue | 5 +++++
 src/views/erp/mold/components/MoldList.vue | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/api/erp/mold/index.ts b/src/api/erp/mold/index.ts
index 96bbc19d..775bd7ae 100644
--- a/src/api/erp/mold/index.ts
+++ b/src/api/erp/mold/index.ts
@@ -25,6 +25,7 @@ export interface MoldVO {
   inTime: Date // 入库时间
   status: number // 状态
   images: string // 模具图片
+  fileUrl?: string
   remark: string // 备注
   isEnable: boolean // 是否启用
   brandId: number // 型号id
diff --git a/src/views/erp/mold/components/MoldForm.vue b/src/views/erp/mold/components/MoldForm.vue
index d191c5fb..8367bbd7 100644
--- a/src/views/erp/mold/components/MoldForm.vue
+++ b/src/views/erp/mold/components/MoldForm.vue
@@ -76,6 +76,9 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="资料" prop="fileUrl">
+        <UploadFile v-model="formData.fileUrl" :limit="1" :isShowTip="false"/>
+      </el-form-item>
      </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -108,6 +111,7 @@ const formData = ref({
   images: undefined,
   remark: undefined,
   isEnable: undefined,
+  fileUrl: '',
   brandId: undefined
 })
 const formRules = reactive({
@@ -180,6 +184,7 @@ const resetForm = () => {
     images: undefined,
     remark: undefined,
     isEnable: undefined,
+    fileUrl: '',
     brandId: undefined
   }
   formRef.value?.resetFields()
diff --git a/src/views/erp/mold/components/MoldList.vue b/src/views/erp/mold/components/MoldList.vue
index 3f580671..e54b62c9 100644
--- a/src/views/erp/mold/components/MoldList.vue
+++ b/src/views/erp/mold/components/MoldList.vue
@@ -26,7 +26,7 @@
           <dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="机台" align="center" prop="machineId" /> -->
+      <el-table-column label="使用设备" align="center" prop="machineId" />
       <!-- <el-table-column label="模具图片" align="center" prop="images" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="是否启用" align="center" prop="isEnable" >

From 060d0f41161bb8b08aa227173adbed5c2f3c07b0 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 10:40:46 +0800
Subject: [PATCH 03/10] =?UTF-8?q?style=EF=BC=9A=E6=A8=A1=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/dvsubject/index.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/mes/dvsubject/index.ts b/src/api/mes/dvsubject/index.ts
index 02b9ac41..b719aeee 100644
--- a/src/api/mes/dvsubject/index.ts
+++ b/src/api/mes/dvsubject/index.ts
@@ -20,31 +20,31 @@ export interface DvSubjectVO {
 export const DvSubjectApi = {
   // 查询维保项目分页
   getDvSubjectPage: async (params: any) => {
-    return await request.get({ url: `/mes/dv-subject/page`, params })
+    return await request.get({ url: `/mes/mold-subject/page`, params })
   },
 
   // 查询维保项目详情
   getDvSubject: async (id: number) => {
-    return await request.get({ url: `/mes/dv-subject/get?id=` + id })
+    return await request.get({ url: `/mes/mold-subject/get?id=` + id })
   },
 
   // 新增维保项目
   createDvSubject: async (data: DvSubjectVO) => {
-    return await request.post({ url: `/mes/dv-subject/create`, data })
+    return await request.post({ url: `/mes/mold-subject/create`, data })
   },
 
   // 修改维保项目
   updateDvSubject: async (data: DvSubjectVO) => {
-    return await request.put({ url: `/mes/dv-subject/update`, data })
+    return await request.put({ url: `/mes/mold-subject/update`, data })
   },
 
   // 删除维保项目
   deleteDvSubject: async (ids: string) => {
-    return await request.delete({ url: `/mes/dv-subject/delete?ids=` + ids })
+    return await request.delete({ url: `/mes/mold-subject/delete?ids=` + ids })
   },
 
   // 导出维保项目 Excel
   exportDvSubject: async (params) => {
-    return await request.download({ url: `/mes/dv-subject/export-excel`, params })
+    return await request.download({ url: `/mes/mold-subject/export-excel`, params })
   },
 }

From 9ae8012a8b827b06c293528c6990448fc0d9e839 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 11:58:13 +0800
Subject: [PATCH 04/10] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=A8=A1?=
 =?UTF-8?q?=E5=85=B7=E7=AE=A1=E7=90=86-=E6=A3=80=E9=AA=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=8E=A5=E5=8F=A3api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/dvsubject/index.ts                | 12 ++---
 src/api/mold/inspectionItems/index.ts         | 50 +++++++++++++++++++
 .../inspectionItems/InspectionItemsForm.vue   |  2 +-
 src/views/mold/inspectionItems/index.vue      |  2 +-
 4 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 src/api/mold/inspectionItems/index.ts

diff --git a/src/api/mes/dvsubject/index.ts b/src/api/mes/dvsubject/index.ts
index b719aeee..02b9ac41 100644
--- a/src/api/mes/dvsubject/index.ts
+++ b/src/api/mes/dvsubject/index.ts
@@ -20,31 +20,31 @@ export interface DvSubjectVO {
 export const DvSubjectApi = {
   // 查询维保项目分页
   getDvSubjectPage: async (params: any) => {
-    return await request.get({ url: `/mes/mold-subject/page`, params })
+    return await request.get({ url: `/mes/dv-subject/page`, params })
   },
 
   // 查询维保项目详情
   getDvSubject: async (id: number) => {
-    return await request.get({ url: `/mes/mold-subject/get?id=` + id })
+    return await request.get({ url: `/mes/dv-subject/get?id=` + id })
   },
 
   // 新增维保项目
   createDvSubject: async (data: DvSubjectVO) => {
-    return await request.post({ url: `/mes/mold-subject/create`, data })
+    return await request.post({ url: `/mes/dv-subject/create`, data })
   },
 
   // 修改维保项目
   updateDvSubject: async (data: DvSubjectVO) => {
-    return await request.put({ url: `/mes/mold-subject/update`, data })
+    return await request.put({ url: `/mes/dv-subject/update`, data })
   },
 
   // 删除维保项目
   deleteDvSubject: async (ids: string) => {
-    return await request.delete({ url: `/mes/mold-subject/delete?ids=` + ids })
+    return await request.delete({ url: `/mes/dv-subject/delete?ids=` + ids })
   },
 
   // 导出维保项目 Excel
   exportDvSubject: async (params) => {
-    return await request.download({ url: `/mes/mold-subject/export-excel`, params })
+    return await request.download({ url: `/mes/dv-subject/export-excel`, params })
   },
 }
diff --git a/src/api/mold/inspectionItems/index.ts b/src/api/mold/inspectionItems/index.ts
new file mode 100644
index 00000000..b719aeee
--- /dev/null
+++ b/src/api/mold/inspectionItems/index.ts
@@ -0,0 +1,50 @@
+import request from '@/config/axios'
+
+// 维保项目 VO
+export interface DvSubjectVO {
+  id?: number // ID
+  subjectCode: string // 项目编码
+  subjectName: string // 项目名称
+  subjectType?: string // 项目类型
+  subjectContent?: string // 项目内容
+  subjectStandard?: string // 标准
+  isEnable: string // 是否启用
+  inspectionMethod: string // 检验方式
+  valueType: string // 值类型
+  judgmentCriteria: string // 判定基准
+  creator?: string // 创建人
+  createTime?: string | number | Date // 创建时间
+}
+
+// 维保项目 API
+export const DvSubjectApi = {
+  // 查询维保项目分页
+  getDvSubjectPage: async (params: any) => {
+    return await request.get({ url: `/mes/mold-subject/page`, params })
+  },
+
+  // 查询维保项目详情
+  getDvSubject: async (id: number) => {
+    return await request.get({ url: `/mes/mold-subject/get?id=` + id })
+  },
+
+  // 新增维保项目
+  createDvSubject: async (data: DvSubjectVO) => {
+    return await request.post({ url: `/mes/mold-subject/create`, data })
+  },
+
+  // 修改维保项目
+  updateDvSubject: async (data: DvSubjectVO) => {
+    return await request.put({ url: `/mes/mold-subject/update`, data })
+  },
+
+  // 删除维保项目
+  deleteDvSubject: async (ids: string) => {
+    return await request.delete({ url: `/mes/mold-subject/delete?ids=` + ids })
+  },
+
+  // 导出维保项目 Excel
+  exportDvSubject: async (params) => {
+    return await request.download({ url: `/mes/mold-subject/export-excel`, params })
+  },
+}
diff --git a/src/views/mold/inspectionItems/InspectionItemsForm.vue b/src/views/mold/inspectionItems/InspectionItemsForm.vue
index 23f52964..024abc94 100644
--- a/src/views/mold/inspectionItems/InspectionItemsForm.vue
+++ b/src/views/mold/inspectionItems/InspectionItemsForm.vue
@@ -42,7 +42,7 @@
 </template>
 <script setup lang="ts">
 import { getBoolDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
-import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'
+import { DvSubjectApi, DvSubjectVO } from '@/api/mold/inspectionItems'
 import { useDictStoreWithOut } from '@/store/modules/dict'
 
 /** 维保项目 表单 */
diff --git a/src/views/mold/inspectionItems/index.vue b/src/views/mold/inspectionItems/index.vue
index 09aadd6c..7c987a06 100644
--- a/src/views/mold/inspectionItems/index.vue
+++ b/src/views/mold/inspectionItems/index.vue
@@ -102,7 +102,7 @@ link type="primary" @click="openForm('update', scope.row.id)"
 import { getStrDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'
+import { DvSubjectApi, DvSubjectVO } from '@/api/mold/inspectionItems'
 import InspectionItemsForm from './InspectionItemsForm.vue'
 import { isHexColor } from '@/utils/color'
 import { useDictStoreWithOut } from '@/store/modules/dict'

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 05/10] =?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>

From 24a8a6d74573051db3f2dfe9b007007b6f462b3d Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 14:15:13 +0800
Subject: [PATCH 06/10] =?UTF-8?q?style=EF=BC=9A=E6=A8=A1=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mold/planmaintenance/index.ts         | 47 +++++++++++++++++++
 .../inspectionPlan/InspectionPlanForm.vue     |  4 +-
 src/views/mold/inspectionPlan/index.vue       |  2 +-
 3 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 src/api/mold/planmaintenance/index.ts

diff --git a/src/api/mold/planmaintenance/index.ts b/src/api/mold/planmaintenance/index.ts
new file mode 100644
index 00000000..5bc7cdac
--- /dev/null
+++ b/src/api/mold/planmaintenance/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export interface PlanMaintenanceVO {
+  id?: number | string
+  planName: string
+  planType: number | string
+  description?: string
+  subjectIdS?: string
+  creator?: string
+  creatorName?: string
+  createTime?: string | number | Date
+  updateTime?: string | number | Date
+}
+
+export interface PlanMaintenanceSubjectVO {
+  id?: number | string
+  subjectCode?: string
+  subjectName?: string
+  inspectionMethod?: string
+  judgmentCriteria?: string
+}
+
+export const PlanMaintenanceApi = {
+  getPlanMaintenancePage: async (params: any) => {
+    return await request.get({ url: `/mes/mold-plan-maintenance/page`, params })
+  },
+
+  getSubjectList: async (id: number | string) => {
+    return await request.get({ url: `/mes/mold-plan-maintenance/getSubjectList`, params: { id } })
+  },
+
+  createPlanMaintenance: async (data: any) => {
+    return await request.post({ url: `/mes/mold-plan-maintenance/create`, data })
+  },
+
+  updatePlanMaintenance: async (data: any) => {
+    return await request.put({ url: `/mes/mold-plan-maintenance/update`, params: data })
+  },
+
+  deletePlanMaintenance: async (ids: string) => {
+    return await request.delete({ url: `/mes/mold-plan-maintenance/delete?ids=` + ids })
+  },
+
+  exportPlanMaintenance: async (params: any) => {
+    return await request.download({ url: `/mes/mold-plan-maintenance/export-excel`, params })
+  }
+}
diff --git a/src/views/mold/inspectionPlan/InspectionPlanForm.vue b/src/views/mold/inspectionPlan/InspectionPlanForm.vue
index 2eed48e6..36f85cc7 100644
--- a/src/views/mold/inspectionPlan/InspectionPlanForm.vue
+++ b/src/views/mold/inspectionPlan/InspectionPlanForm.vue
@@ -39,8 +39,8 @@
 
 <script setup lang="ts">
 import type { FormRules } from 'element-plus'
-import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'
-import { PlanMaintenanceApi, PlanMaintenanceVO } from '@/api/mes/planmaintenance'
+import { DvSubjectApi, DvSubjectVO } from '@/api/mold/inspectionItems'
+import { PlanMaintenanceApi, PlanMaintenanceVO } from '@/api/mold/planmaintenance'
 
 defineOptions({ name: 'MoldInspectionPlanForm' })
 
diff --git a/src/views/mold/inspectionPlan/index.vue b/src/views/mold/inspectionPlan/index.vue
index bc8c0711..c4ee6be0 100644
--- a/src/views/mold/inspectionPlan/index.vue
+++ b/src/views/mold/inspectionPlan/index.vue
@@ -139,7 +139,7 @@
 import { getStrDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import { PlanMaintenanceApi, PlanMaintenanceSubjectVO, PlanMaintenanceVO } from '@/api/mes/planmaintenance'
+import { PlanMaintenanceApi, PlanMaintenanceSubjectVO, PlanMaintenanceVO } from '@/api/mold/planmaintenance'
 import InspectionPlanForm from './InspectionPlanForm.vue'
 import { isHexColor } from '@/utils/color'
 import { useDictStoreWithOut } from '@/store/modules/dict'

From 720438a8ff0fd1db17cc379320405418f5df9f68 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 14:32:51 +0800
Subject: [PATCH 07/10] =?UTF-8?q?style=EF=BC=9A=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB/=E6=A8=A1?=
 =?UTF-8?q?=E5=85=B7=E7=AE=A1=E7=90=86-=E7=82=B9=E6=A3=80=E4=BF=9D?=
 =?UTF-8?q?=E5=85=BB=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAbody?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/planmaintenance/index.ts  | 2 +-
 src/api/mold/planmaintenance/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/mes/planmaintenance/index.ts b/src/api/mes/planmaintenance/index.ts
index a2a875ad..1f0a9658 100644
--- a/src/api/mes/planmaintenance/index.ts
+++ b/src/api/mes/planmaintenance/index.ts
@@ -34,7 +34,7 @@ export const PlanMaintenanceApi = {
   },
 
   updatePlanMaintenance: async (data: any) => {
-    return await request.put({ url: `/mes/plan-maintenance/update`, params: data })
+    return await request.put({ url: `/mes/plan-maintenance/update`, data })
   },
 
   deletePlanMaintenance: async (ids: string) => {
diff --git a/src/api/mold/planmaintenance/index.ts b/src/api/mold/planmaintenance/index.ts
index 5bc7cdac..cc2747e9 100644
--- a/src/api/mold/planmaintenance/index.ts
+++ b/src/api/mold/planmaintenance/index.ts
@@ -34,7 +34,7 @@ export const PlanMaintenanceApi = {
   },
 
   updatePlanMaintenance: async (data: any) => {
-    return await request.put({ url: `/mes/mold-plan-maintenance/update`, params: data })
+    return await request.put({ url: `/mes/mold-plan-maintenance/update`, data })
   },
 
   deletePlanMaintenance: async (ids: string) => {

From c65aa6a949cb5351c96178e338eac897dd57046c Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 15:58:21 +0800
Subject: [PATCH 08/10] =?UTF-8?q?style=EF=BC=9A=E8=A1=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=8F=8A=E5=88=97=E8=A1=A8=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/energydevice/index.ts             |   7 +
 .../mes/energydevice/EnergyDeviceForm.vue     | 304 ++++++++++++++----
 src/views/mes/energydevice/index.vue          |  17 +-
 3 files changed, 253 insertions(+), 75 deletions(-)

diff --git a/src/api/mes/energydevice/index.ts b/src/api/mes/energydevice/index.ts
index 3094d114..5164e784 100644
--- a/src/api/mes/energydevice/index.ts
+++ b/src/api/mes/energydevice/index.ts
@@ -1,6 +1,12 @@
 import request from '@/config/axios'
 
 // 能源设备 VO
+export interface EnergyDeviceOperationRuleVO {
+  deviceId: number
+  pointId: number
+  operator?: string
+}
+
 export interface EnergyDeviceVO {
   id: number // ID
   name: string // 名称
@@ -16,6 +22,7 @@ export interface EnergyDeviceVO {
   orgId: number // 所属区域id
   orgName: string  // 所属区域名称
   rules: string // 计算规则
+  operationRulesVOList?: EnergyDeviceOperationRuleVO[]
 }
 
 // 能源设备 API
diff --git a/src/views/mes/energydevice/EnergyDeviceForm.vue b/src/views/mes/energydevice/EnergyDeviceForm.vue
index 912da23e..d543ce37 100644
--- a/src/views/mes/energydevice/EnergyDeviceForm.vue
+++ b/src/views/mes/energydevice/EnergyDeviceForm.vue
@@ -7,78 +7,97 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="编码" prop="code">
-            <el-input v-model="formData.code" placeholder="请输入编码" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="名称" prop="name">
-            <el-input v-model="formData.name" placeholder="请输入名称" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="能耗类型" prop="deviceTypeId">
+      <el-form-item label="表编码" prop="code">
+        <el-input v-model="formData.code" placeholder="请输入表编码" />
+      </el-form-item>
+
+      <el-form-item label="表名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入表名称" />
+      </el-form-item>
+
+      <el-form-item label="能源类型" prop="deviceTypeId">
         <el-select
           v-model="formData.deviceTypeId"
-          @change="handleQuery"
-          placeholder="请选择能耗类型"
+          @change="handleDeviceTypeChange"
+          placeholder="请选择能源类型"
           clearable
+          filterable
+          class="!w-full"
         >
-          <el-option
-            v-for="item in typeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="单位" prop="unitName">
-            <el-input disabled v-model="formData.unitName" placeholder="" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="抄表周期cron" prop="checkCron">
-            <el-input v-model="formData.checkCron" placeholder="" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="是否启用" prop="isEnable">
-            <el-radio-group v-model="formData.isEnable">
-              <el-radio
-                v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-                :key="dict.value"
-                :label="dict.value"
+
+      <el-form-item label="所属区域" prop="orgId">
+        <el-select
+          v-model="formData.orgId"
+          placeholder="根据区域结构筛选列表"
+          clearable
+          filterable
+          class="!w-full"
+          :loading="analysisLoading"
+          @change="handleOrgChange"
+        >
+          <el-option v-for="org in analysisList" :key="org.id" :label="org.name" :value="org.id" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="计算规则" prop="operationRulesVOList">
+        <div class="w-full flex flex-col gap-8px">
+          <div
+            v-for="(rule, index) in formData.operationRulesVOList"
+            :key="index"
+            class="w-full flex items-center gap-8px"
+          >
+            <el-tree-select
+              v-model="rule.pointValue"
+              :data="equipmentTree"
+              :props="treeSelectProps"
+              check-strictly
+              filterable
+              clearable
+              class="!w-full"
+              placeholder="根据设备选择点位"
+              :disabled="!formData.orgId"
+              @change="(val) => handlePointSelected(index, val)"
+            />
+
+            <template v-if="index < formData.operationRulesVOList.length - 1">
+              <el-select
+                v-model="formData.operationRulesVOList[index].operator"
+                placeholder="运算符"
+                class="!w-110px"
+                clearable
               >
-                {{ dict.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="所属区域" prop="orgName">
-            <el-input v-model="formData.orgName" placeholder="" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-         <el-form-item label="计算规则" prop="rules">
-            <el-input v-model="formData.rules" placeholder="" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+                <el-option v-for="op in operatorOptions" :key="op" :label="op" :value="op" />
+              </el-select>
+            </template>
+            <template v-else>
+              <div class="flex items-center gap-4px">
+                <el-button link type="primary" @click="addRule">
+                  <Icon icon="ep:plus" />
+                </el-button>
+                <el-button
+                  link
+                  type="danger"
+                  :disabled="formData.operationRulesVOList.length <= 1"
+                  @click="removeRule"
+                >
+                  <Icon icon="ep:minus" />
+                </el-button>
+              </div>
+            </template>
+          </div>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="是否启用" prop="isEnable">
+        <el-switch v-model="formData.isEnable" />
+      </el-form-item>
     </el-form>
-    <el-form-item label="信息资料" prop="info">
+    <!-- <el-form-item label="信息资料" prop="info">
       <Editor v-model="formData.info" height="250px" />
-    </el-form-item>
+    </el-form-item> -->
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -86,9 +105,9 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import {getStrDictOptions, DICT_TYPE, getBoolDictOptions} from '@/utils/dict'
 import { EnergyDeviceApi, EnergyDeviceVO } from '@/api/mes/energydevice'
 import {EnergyTypeApi, EnergyTypeVO} from "@/api/mes/energytype";
+import { OrganizationApi, DeviceParameterAnalysisNodeVO } from '@/api/mes/organization'
 
 /** 能源设备 表单 */
 defineOptions({ name: 'EnergyDeviceForm' })
@@ -113,27 +132,68 @@ const formData = ref({
   lastCheckValue: undefined,
   unitName: undefined,
   isEnable: undefined,
+  orgId: undefined,
   orgName: undefined,
   rules: undefined,
+  operationRulesVOList: [{ deviceId: undefined, pointId: undefined, operator: undefined, pointValue: undefined }],
 })
 const formRules = reactive({
-  name: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
-  code: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '表名称不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '表编码不能为空', trigger: 'blur' }],
+  orgId: [{ required: true, message: '所属区域不能为空', trigger: 'change' }],
+  operationRulesVOList: [{ required: true, validator: (_rule, _value, callback) => validateRules(callback), trigger: 'change' }],
   isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
+const analysisLoading = ref(false)
+const analysisList = ref<DeviceParameterAnalysisNodeVO[]>([])
+
+const treeSelectProps = {
+  label: 'name',
+  children: 'children',
+  disabled: 'disabled',
+  value: 'id'
+}
+
+const operatorOptions = ['+', '-', '*', '/']
+
+const currentOrgNode = computed(() => {
+  return analysisList.value.find((o) => o.id === formData.value.orgId)
+})
+
+const equipmentTree = computed(() => {
+  const equipments = currentOrgNode.value?.equipments ?? []
+  return equipments.map((eq) => ({
+    id: `device:${eq.id}`,
+    name: eq.name,
+    disabled: true,
+    children: (eq.parameters ?? []).map((p) => ({
+      id: `${eq.id}:${p.id}`,
+      name: `${eq.name}: ${p.name}`
+    }))
+  }))
+})
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+
+  await loadAnalysis()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
       formData.value = await EnergyDeviceApi.getEnergyDevice(id)
+      if (!Array.isArray((formData.value as any).operationRulesVOList)) {
+        ;(formData.value as any).operationRulesVOList = [
+          { deviceId: undefined, pointId: undefined, operator: undefined, pointValue: undefined }
+        ]
+      }
+      hydratePointValues()
     } finally {
       formLoading.value = false
     }
@@ -151,6 +211,14 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as EnergyDeviceVO
     data.deviceTypeName =  typeList.value.find(item => item.id === data.deviceTypeId)?.name
+
+    const org = analysisList.value.find((o) => o.id === data.orgId)
+    if (org) {
+      ;(data as any).orgName = org.name
+    }
+
+    ;(data as any).operationRulesVOList = buildOperationRulesPayload()
+
     if (formType.value === 'create') {
       await EnergyDeviceApi.createEnergyDevice(data)
       message.success(t('common.createSuccess'))
@@ -179,7 +247,11 @@ const resetForm = () => {
     lastCheckTime: undefined,
     lastCheckValue: undefined,
     unitName: undefined,
-    isEnable: true
+    isEnable: true,
+    orgId: undefined,
+    orgName: undefined,
+    rules: undefined,
+    operationRulesVOList: [{ deviceId: undefined, pointId: undefined, operator: undefined, pointValue: undefined }]
   }
   formRef.value?.resetFields()
 }
@@ -189,8 +261,102 @@ onMounted(async () => {
   typeList.value = await EnergyTypeApi.getEnergyTypeList()
 })
 
-/** 下拉框 */
-const handleQuery = () => {
+const loadAnalysis = async () => {
+  if (analysisList.value.length > 0) {
+    return
+  }
+  analysisLoading.value = true
+  try {
+    analysisList.value = await OrganizationApi.deviceParameterAnalysis({})
+  } finally {
+    analysisLoading.value = false
+  }
+}
+
+const handleDeviceTypeChange = () => {
   formData.value.unitName = typeList.value.find(item => item.id === formData.value.deviceTypeId)?.unit
 }
+
+const handleOrgChange = () => {
+  const org = analysisList.value.find((o) => o.id === formData.value.orgId)
+  formData.value.orgName = org?.name
+  formData.value.operationRulesVOList = [
+    { deviceId: undefined, pointId: undefined, operator: undefined, pointValue: undefined }
+  ]
+}
+
+const handlePointSelected = (index: number, val: any) => {
+  if (!val || typeof val !== 'string' || !val.includes(':')) {
+    formData.value.operationRulesVOList[index].deviceId = undefined
+    formData.value.operationRulesVOList[index].pointId = undefined
+    return
+  }
+  const [deviceIdStr, pointIdStr] = val.split(':')
+  const deviceId = Number(deviceIdStr)
+  const pointId = Number(pointIdStr)
+  formData.value.operationRulesVOList[index].deviceId = Number.isNaN(deviceId) ? undefined : deviceId
+  formData.value.operationRulesVOList[index].pointId = Number.isNaN(pointId) ? undefined : pointId
+}
+
+const addRule = () => {
+  formData.value.operationRulesVOList.push({
+    deviceId: undefined,
+    pointId: undefined,
+    operator: undefined,
+    pointValue: undefined
+  })
+}
+
+const removeRule = () => {
+  if (formData.value.operationRulesVOList.length <= 1) {
+    return
+  }
+  formData.value.operationRulesVOList.pop()
+}
+
+const buildOperationRulesPayload = () => {
+  const list = (formData.value.operationRulesVOList ?? []).map((r, idx) => {
+    const item: any = {
+      deviceId: r.deviceId,
+      pointId: r.pointId
+    }
+    if (r.operator) {
+      item.operator = r.operator
+    }
+    return item
+  })
+  return list
+}
+
+const hydratePointValues = () => {
+  const list = (formData.value as any).operationRulesVOList as any[]
+  if (!Array.isArray(list)) {
+    return
+  }
+  list.forEach((r) => {
+    if (r?.deviceId && r?.pointId) {
+      r.pointValue = `${r.deviceId}:${r.pointId}`
+    }
+  })
+}
+
+const validateRules = (callback: any) => {
+  const list = formData.value.operationRulesVOList ?? []
+  if (!list.length) {
+    callback(new Error('计算规则不能为空'))
+    return
+  }
+  for (let i = 0; i < list.length; i++) {
+    const r = list[i] as any
+    if (!r?.deviceId || !r?.pointId) {
+      callback(new Error('请选择设备点位'))
+      return
+    }
+    if (i > 0 && !list[i - 1]?.operator) {
+      callback(new Error('请选择运算符'))
+      return
+    }
+  }
+  callback()
+}
 </script>
diff --git a/src/views/mes/energydevice/index.vue b/src/views/mes/energydevice/index.vue
index e111d0e1..d6af71f8 100644
--- a/src/views/mes/energydevice/index.vue
+++ b/src/views/mes/energydevice/index.vue
@@ -3,7 +3,8 @@
     <!-- 搜索工作栏 -->
     <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"
+        <el-input
+v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="能耗类型" prop="deviceType">
@@ -21,7 +22,8 @@
         <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"
+        <el-button
+type="success" plain @click="handleExport" :loading="exportLoading"
           v-hasPermi="['mes:energy-device:export']">
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
@@ -31,13 +33,14 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" highlight-current-row
+    <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="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" /> -->
@@ -73,7 +76,8 @@
           >
             重置
           </el-button> -->
-          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+          <el-button
+link type="primary" @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:energy-device:update']">
             编辑
           </el-button>
@@ -84,7 +88,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+    <Pagination
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
   </ContentWrap>
 

From 4c8759596ddd9310bbda09b47e3611bcde27d35a Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 16:01:26 +0800
Subject: [PATCH 09/10] =?UTF-8?q?style=EF=BC=9A=E8=A1=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E7=BC=96=E8=BE=91=E6=97=B6=E7=BC=96=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/energydevice/EnergyDeviceForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/energydevice/EnergyDeviceForm.vue b/src/views/mes/energydevice/EnergyDeviceForm.vue
index d543ce37..73861c1f 100644
--- a/src/views/mes/energydevice/EnergyDeviceForm.vue
+++ b/src/views/mes/energydevice/EnergyDeviceForm.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">

From 6100765fd193b5e64dbd3e4b6c6c077a5ba17ae4 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 13 Jan 2026 16:08:17 +0800
Subject: [PATCH 10/10] =?UTF-8?q?style=EF=BC=9A=E8=AE=BE=E5=A4=87=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E5=8F=82=E6=95=B0=E5=88=86=E6=9E=90-=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=A0=91=E7=8A=B6=E5=9B=BE=E6=98=BE=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/deviceParamAnalysis/index.vue | 67 ++++++++++++---------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/src/views/iot/deviceParamAnalysis/index.vue b/src/views/iot/deviceParamAnalysis/index.vue
index 0353ca11..45dc7b84 100644
--- a/src/views/iot/deviceParamAnalysis/index.vue
+++ b/src/views/iot/deviceParamAnalysis/index.vue
@@ -78,6 +78,7 @@ import dayjs from 'dayjs'
 import { Echart as EChart } from '@/components/Echart'
 import { OrganizationApi } from '@/api/mes/organization'
 import { DeviceModelAttributeApi } from '@/api/iot/devicemodelattribute'
+import { handleTree } from '@/utils/tree'
 
 defineOptions({ name: 'DeviceParamAnalysis' })
 
@@ -110,7 +111,9 @@ type ApiTreeEquipment = {
 type ApiTreeOrg = {
   id: number
   name: string
+  parentId?: number | null
   equipments?: ApiTreeEquipment[]
+  children?: ApiTreeOrg[]
 }
 
 const message = useMessage()
@@ -215,37 +218,47 @@ const handleKeywordChange = () => {
 }
 
 const buildTreeFromApi = (orgs: ApiTreeOrg[]): DeviceTreeNode[] => {
-  return (
-    orgs?.map((org) => {
-      const equipments = Array.isArray(org?.equipments) ? org.equipments : []
-      const equipmentNodes: DeviceTreeNode[] = equipments.map((eq) => {
-        const params = Array.isArray(eq?.parameters) ? eq.parameters : []
-        const paramNodes: DeviceTreeNode[] = params.map((p) => ({
-          id: `param-${eq.id}-${p.id}`,
-          label: p?.name ?? p?.code ?? String(p?.id ?? ''),
-          type: 'param',
-          deviceId: Number(eq.id),
-          modelId: Number(p.id),
-          paramKey: p?.code ? String(p.code) : undefined,
-          unit: p?.unit ? String(p.unit) : undefined
-        }))
-
-        return {
-          id: `equipment-${org.id}-${eq.id}`,
-          label: eq?.name ?? String(eq?.id ?? ''),
-          type: 'device',
-          children: paramNodes.length ? paramNodes : undefined
-        }
-      })
+  const normalizedOrgs: ApiTreeOrg[] = (Array.isArray(orgs) ? orgs : []).map((o) => ({
+    ...o,
+    parentId: typeof o?.parentId === 'number' ? o.parentId : Number(o?.parentId ?? 0) || 0
+  }))
+
+  const orgTree = handleTree(normalizedOrgs, 'id', 'parentId', 'children') as ApiTreeOrg[]
+
+  const toOrgNode = (org: ApiTreeOrg): DeviceTreeNode => {
+    const orgChildren = Array.isArray(org?.children) ? org.children.map(toOrgNode) : []
+
+    const equipments = Array.isArray(org?.equipments) ? org.equipments : []
+    const equipmentNodes: DeviceTreeNode[] = equipments.map((eq) => {
+      const params = Array.isArray(eq?.parameters) ? eq.parameters : []
+      const paramNodes: DeviceTreeNode[] = params.map((p) => ({
+        id: `param-${eq.id}-${p.id}`,
+        label: p?.name ?? p?.code ?? String(p?.id ?? ''),
+        type: 'param',
+        deviceId: Number(eq.id),
+        modelId: Number(p.id),
+        paramKey: p?.code ? String(p.code) : undefined,
+        unit: p?.unit ? String(p.unit) : undefined
+      }))
 
       return {
-        id: `org-${org.id}`,
-        label: org?.name ?? String(org?.id ?? ''),
+        id: `equipment-${org.id}-${eq.id}`,
+        label: eq?.name ?? String(eq?.id ?? ''),
         type: 'device',
-        children: equipmentNodes.length ? equipmentNodes : undefined
+        children: paramNodes.length ? paramNodes : undefined
       }
-    }) ?? []
-  )
+    })
+
+    const children = [...orgChildren, ...equipmentNodes]
+    return {
+      id: `org-${org.id}`,
+      label: org?.name ?? String(org?.id ?? ''),
+      type: 'device',
+      children: children.length ? children : undefined
+    }
+  }
+
+  return Array.isArray(orgTree) ? orgTree.map(toOrgNode) : []
 }
 
 const loadTree = async () => {