diff --git a/src/api/mes/application.js b/src/api/mes/application.js
index 50a84e8..15e47a9 100644
--- a/src/api/mes/application.js
+++ b/src/api/mes/application.js
@@ -1,29 +1,55 @@
 import request from '@/utils/request'
 
+// 新增能源设备
+export function createEnergyDevice(data) {
+    return request({
+        url: '/admin-api/mes/energy-device/create',
+        method: 'POST',
+        data: data
+    })
+}
 
-// 查询能源设备列表
-export function getEnergyDevice(params) {
+// 查询能源设备详情
+export function getEnergyDeviceById(id) {
     return request({
-        url: '/admin-api/mes/energy-device/page',
-        method: 'get',
-        params: params
+        url: '/admin-api/mes/energy-device/get?id=' + id,
+        method: 'GET',
     })
 }
 
 // 修改能源设备
-export function updateEnergyDeviceCheckRecord(data) {
+export function updateEnergyDevice(data) {
     return request({
         url: '/admin-api/mes/energy-device/update',
-        method: 'put',
+        method: 'PUT',
         data: data
     })
 }
 
+
+// 查询能源设备列表
+export function getEnergyDevice(params) {
+    return request({
+        url: '/admin-api/mes/energy-device/page',
+        method: 'GET',
+        params: params
+    })
+}
+
 // 删除能源设备
 export function deleteEnergyDevice(id) {
     return request({
         url: '/admin-api/mes/energy-device/delete?id='+id,
-        method: 'delete'
+        method: 'DELETE'
+    })
+}
+
+// 新增抄表记录
+export function createEnergyDeviceCheckRecord(data) {
+    return request({
+        url: '/admin-api/mes/energy-device/energy-device-check-record/create',
+        method: 'POST',
+        data: data
     })
 }
 
@@ -31,16 +57,16 @@ export function deleteEnergyDevice(id) {
 export function getEnergyDeviceCheckRecord(params) {
     return request({
         url: '/admin-api/mes/energy-device/energy-device-check-record/page',
-        method: 'get',
+        method: 'GET',
         params
     })
 }
 
-// 新增抄表记录
-export function createEnergyDeviceCheckRecord(data) {
+// 修改抄表记录
+export function updateEnergyDeviceCheckRecord(data) {
     return request({
-        url: '/admin-api/mes/energy-device/energy-device-check-record/create',
-        method: 'post',
+        url: '/admin-api/mes/energy-device/update',
+        method: 'PUT',
         data: data
     })
 }
@@ -49,6 +75,6 @@ export function createEnergyDeviceCheckRecord(data) {
 export function deleteEnergyDeviceCheckRecordById(id) {
     return request({
         url: '/admin-api/mes/energy-device/energy-device-check-record/delete?id='+id,
-        method: 'delete'
+        method: 'DELETE'
     })
 }
diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js
index ca0c999..008d281 100644
--- a/src/api/system/dict/data.js
+++ b/src/api/system/dict/data.js
@@ -51,6 +51,15 @@ export function delData(dictCode) {
   })
 }
 //
+export const deviceTypes=[
+  {text: '电表', value: '电表'},
+  {text: '水表', value: '水表'},
+  {text: '燃气表', value: '燃气表'},
+]
+export const isEnable=[
+  {text: '是', value: true},
+  {text: '否', value: false},
+]
 export const processTypes = [
   {text: '制浆', value: 'zhijiang'}, {text: '成型', value: 'chengxing'},
   {text: '烘干', value: 'honggan'}, {text: '转移', value: 'zhuanyi'},
diff --git a/src/pages.json b/src/pages.json
index 45d8db9..0344f26 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -76,6 +76,12 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/application/components/energyEquipmentCreateOrEdit",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/application/components/energyEquipmentDetail",
       "style": {
diff --git a/src/pages/application/components/energyEquipment.vue b/src/pages/application/components/energyEquipment.vue
index f29ee1b..3f24552 100644
--- a/src/pages/application/components/energyEquipment.vue
+++ b/src/pages/application/components/energyEquipment.vue
@@ -23,7 +23,7 @@
             font-size="12"
             @click="getEnergyDeviceList"
         />
-        <uni-data-select  v-model="queryParams.deviceType" placeholder="请选择设备类型"  @change="getEnergyDeviceList" >
+        <uni-data-select  v-model="queryParams.deviceType" placeholder="请选择设备类型" :localdata="deviceTypes"  @click="getEnergyDeviceList" >
         </uni-data-select>
       </view>
     </u-sticky>
@@ -78,7 +78,7 @@
             <view class="u-flex justify-end">
               <view class="u-m-r-20" @click.stop="tab.navigateTo('/pages/application/components/energyEquipmentForm', { name: item.name, id: item.id, time: item.lastCheckTime, value: item.lastCheckValue })"> <u-button type="success" plain>抄表</u-button></view>
               <view class="u-m-r-20" @click.stop="tab.navigateTo('/pages/application/components/energyEquipmentFormReset', { name: item.name, id: item.id, time: item.lastCheckTime, value: item.lastCheckValue, code: item.code, isEnable: item.isEnable })"> <u-button type="error" plain>重置</u-button></view>
-              <view class="u-m-r-20" @click.stop> <u-button type="primary" plain >编辑</u-button></view>
+              <view class="u-m-r-20" @click.stop="tab.navigateTo('/pages/application/components/energyEquipmentCreateOrEdit', { id: item.id })"> <u-button type="primary" plain >编辑</u-button></view>
               <view class="u-m-r-20" @click.stop="deleteEnergyDeviceById(item.id)"> <u-button type="error" plain>删除</u-button></view>
             </view>
           </view>
@@ -86,6 +86,7 @@
       </u-list>
     </view>
     <u-empty v-else icon="http://cdn.uviewui.com/uview/empty/data.png" />
+    <uni-fab ref="fab" @fabClick="tab.navigateTo('/pages/application/components/energyEquipmentCreateOrEdit')" />
   </view>
 </template>
 
@@ -97,6 +98,7 @@ import { timestampToTime } from "@/utils/dateUtil";
 import tab from "@/plugins/tab";
 import { showConfirm } from "@/utils/common";
 import { modal } from "@/plugins";
+import { deviceTypes } from "@/api/system/dict/data";
 
 const queryParams = ref({
   name: '',
diff --git a/src/pages/application/components/energyEquipmentCreateOrEdit.vue b/src/pages/application/components/energyEquipmentCreateOrEdit.vue
new file mode 100644
index 0000000..365a466
--- /dev/null
+++ b/src/pages/application/components/energyEquipmentCreateOrEdit.vue
@@ -0,0 +1,126 @@
+<template>
+  <view>
+    <u-sticky
+        class="sticky"
+        :custom-nav-height="0"
+    >
+      <u-navbar
+          :title="id ? '编辑能源设备':'新增能源设备'"
+          bg-color="transparent"
+          :auto-back="true"
+          :title-style="{ fontWeight: 'bold' }"
+          safe-area-inset-top
+          placeholder
+      />
+    </u-sticky>
+    <view class="container">
+      <!-- 自定义表单校验 -->
+      <uni-forms ref="customForm" :rules="customRules" labelWidth="105px" :modelValue="formData">
+        <uni-forms-item label="名称" required name="name">
+          <u-input v-model="formData.name" placholder="请输入名称"/>
+        </uni-forms-item>
+        <uni-forms-item label="编码">
+          <u-input v-model="formData.code" placholder="请输入编码"/>
+        </uni-forms-item>
+        <uni-forms-item  label="设备类型" required name="deviceType">
+          <uni-data-checkbox v-model="formData.deviceType" :localdata="deviceTypes"/>
+        </uni-forms-item>
+        <uni-forms-item label="抄表周期cron">
+          <u-input v-model="formData.checkCron" placholder="请输入抄表周期cron"/>
+        </uni-forms-item>
+        <uni-forms-item label="单位">
+          <u-input v-model="formData.unitName" placholder="单位"/>
+        </uni-forms-item>
+        <uni-forms-item label="是否启用" required name="isEnable">
+          <uni-data-checkbox v-model="formData.isEnable" :localdata="isEnable"/>
+        </uni-forms-item>
+        <uni-forms-item label="信息资料">
+          <u-input v-model="formData.info" />
+        </uni-forms-item>
+      </uni-forms>
+      <view class="u-flex justify-end">
+        <view @click="submit()">
+          <u-button type="primary">
+            <uni-icons type="checkbox" class="u-m-r-10"/>
+            确定
+          </u-button></view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { onLoad, onReady } from "@dcloudio/uni-app";
+import tab from "@/plugins/tab";
+import {createEnergyDevice, getEnergyDeviceById, updateEnergyDevice} from "@/api/mes/application";
+import modal from "@/plugins/modal";
+import { deviceTypes, isEnable } from "@/api/system/dict/data";
+
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  code: undefined,
+  deviceType: undefined,
+  info: undefined,
+  checkCron: undefined,
+  lastCheckTime: undefined,
+  lastCheckValue: undefined,
+  unitName: undefined,
+  isEnable: undefined
+})
+const id =  ref()
+
+const customForm = ref()
+// 自定义表单校验规则
+const customRules = ref({
+  name:  { rules: { required: true, errorMessage: '设备名称不能为空' }},
+  deviceType: { rules: { required: true, errorMessage: '设备类型不能为空'}},
+  isEnable: { rules: { required: true, errorMessage: '是否启用不能为空' }}
+})
+
+const submit = ()=>{
+  customForm.value.validate(async(valid)=>{
+    if(!valid && !id.value) {
+      await createEnergyDevice(formData.value)
+      modal.msgSuccess("保存成功")
+    } else {
+      await updateEnergyDevice(formData.value)
+      modal.msgSuccess("修改成功")
+    }
+    await tab.navigateBack()
+    uni.$emit('success', true)
+  })
+}
+
+onReady(()=>{
+  // 设置自定义表单校验规则，必须在节点渲染完毕后执行
+  customForm.value.setRules(customRules.value)
+})
+onLoad(() => {
+  id.value = tab.getParams().id
+  if(id.value) {
+    getEnergyDeviceById(id.value).then(response => {
+      formData.value = response.data
+    })
+  }
+});
+</script>
+
+<style lang="sass" scoped>
+.sticky
+  background: linear-gradient(180deg, #d4e9ff 0%, #f3f9ff 100%)
+  backdrop-filter: blur(27.18px)
+  box-shadow: 0 1px 1px 0 rgba(0, 72, 145, 0.1), 0 0.5px 0 0 rgba(0, 0, 0, 0.1)
+.container
+  padding: 20rpx
+  margin: 20rpx
+  background-color: #ffffff
+.uniui-checkbox:before
+  color: #ffffff
+.u-button
+  height: 35px
+:deep(.uni-forms-item__content)
+  display: flex
+  align-items: center
+</style>
\ No newline at end of file