diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
index 714fb31..0e16ce7 100644
--- a/src/views/basic/common-interface.ts
+++ b/src/views/basic/common-interface.ts
@@ -4,3 +4,14 @@
   id: string
   value: string
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('手机号验证失败'))
+  }
+}

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
index 714fb31..0e16ce7 100644
--- a/src/views/basic/common-interface.ts
+++ b/src/views/basic/common-interface.ts
@@ -4,3 +4,14 @@
   id: string
   value: string
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('手机号验证失败'))
+  }
+}
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
new file mode 100644
index 0000000..49801f7
--- /dev/null
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -0,0 +1,265 @@
+<!-- 添加 / 编辑 -->
+<script name="AddDeviceDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDeviceInfo, IDeviceType } from './device-info'
+import { addDevice, getDeviceModelList, updateDevice } from '@/api/basic/device'
+import { getLocateListSelect } from '@/api/basic/locate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  watchType: '',
+  version: '',
+  wellId: '',
+  wellCode: '',
+})
+
+const deviceInfoRules = ref({
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '设备型号不能为空，请选择', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+const deviceModelDict = ref<Array<IDeviceType>>([])
+const locateList = ref<Array<IDeviceType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('deviceInfo') // 返回列表时 将缓存中的数据删除
+
+  deviceInfo.value = {
+    id: '',
+    devcode: '',
+    deviceName: '',
+    deviceType: '',
+    watchType: '',
+    version: '',
+    wellId: '',
+    wellCode: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initLocateSelect = () => {
+  getLocateListSelect({}).then((res) => {
+    if (res.code === 200) {
+      locateList.value = res.data
+    }
+  })
+}
+
+const deviceTypeChangeHandler = () => {
+  if (deviceInfo.value.deviceType === '') {
+    deviceModelDict.value = []
+  }
+  else {
+    getDeviceModelList(deviceInfo.value.deviceType).then((res) => {
+      if (res.code === 200) {
+        deviceModelDict.value = res.data
+      }
+      else {
+        deviceModelDict.value = []
+      }
+    })
+  }
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('deviceType') !== undefined) {
+    deviceTypeDict.value = JSON.parse(sessionStorage.getItem('deviceType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增设备'
+
+      initLocateSelect()
+      deviceInfo.value.installDate = dayjs().format('YYYY-MM-DD')
+
+      break
+    case 'update':
+      title.value = '编辑设备'
+
+      deviceInfo.value = JSON.parse(sessionStorage.getItem('deviceInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="deviceInfo" :rules="deviceInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备编号" prop="devcode">
+              <el-input v-model="deviceInfo.devcode" placeholder="请输入设备编号" :disabled="type === 'update'" clearable />
+              <el-input v-model="deviceInfo.deviceName" type="hidden" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装点位" prop="wellCode">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.wellCode" placeholder="请选择安装点位" filterable clearable style="width: 100%;">
+                <el-option v-for="dict in locateList" :key="dict.value" :value="dict.name" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.wellCode" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3" prop="deviceType">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.deviceType" placeholder="请选择设备类型" filterable clearable style="width: 100%;" @change="deviceTypeChangeHandler">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.deviceTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备型号" prop="version">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.version" placeholder="请选择设备型号" clearable filterable style="width: 100%;">
+                <el-option v-for="dict in deviceModelDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.modelName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装日期">
+              <el-date-picker v-model="deviceInfo.installDate" placeholder="请选择安装日期" type="date" clearable style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备IMEI">
+              <el-input v-model="deviceInfo.imei" placeholder="请输入设备IMEI号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="ICCID">
+              <el-input v-model="deviceInfo.iccid" placeholder="请输入ICCID号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
index 714fb31..0e16ce7 100644
--- a/src/views/basic/common-interface.ts
+++ b/src/views/basic/common-interface.ts
@@ -4,3 +4,14 @@
   id: string
   value: string
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('手机号验证失败'))
+  }
+}
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
new file mode 100644
index 0000000..49801f7
--- /dev/null
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -0,0 +1,265 @@
+<!-- 添加 / 编辑 -->
+<script name="AddDeviceDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDeviceInfo, IDeviceType } from './device-info'
+import { addDevice, getDeviceModelList, updateDevice } from '@/api/basic/device'
+import { getLocateListSelect } from '@/api/basic/locate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  watchType: '',
+  version: '',
+  wellId: '',
+  wellCode: '',
+})
+
+const deviceInfoRules = ref({
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '设备型号不能为空，请选择', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+const deviceModelDict = ref<Array<IDeviceType>>([])
+const locateList = ref<Array<IDeviceType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('deviceInfo') // 返回列表时 将缓存中的数据删除
+
+  deviceInfo.value = {
+    id: '',
+    devcode: '',
+    deviceName: '',
+    deviceType: '',
+    watchType: '',
+    version: '',
+    wellId: '',
+    wellCode: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initLocateSelect = () => {
+  getLocateListSelect({}).then((res) => {
+    if (res.code === 200) {
+      locateList.value = res.data
+    }
+  })
+}
+
+const deviceTypeChangeHandler = () => {
+  if (deviceInfo.value.deviceType === '') {
+    deviceModelDict.value = []
+  }
+  else {
+    getDeviceModelList(deviceInfo.value.deviceType).then((res) => {
+      if (res.code === 200) {
+        deviceModelDict.value = res.data
+      }
+      else {
+        deviceModelDict.value = []
+      }
+    })
+  }
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('deviceType') !== undefined) {
+    deviceTypeDict.value = JSON.parse(sessionStorage.getItem('deviceType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增设备'
+
+      initLocateSelect()
+      deviceInfo.value.installDate = dayjs().format('YYYY-MM-DD')
+
+      break
+    case 'update':
+      title.value = '编辑设备'
+
+      deviceInfo.value = JSON.parse(sessionStorage.getItem('deviceInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="deviceInfo" :rules="deviceInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备编号" prop="devcode">
+              <el-input v-model="deviceInfo.devcode" placeholder="请输入设备编号" :disabled="type === 'update'" clearable />
+              <el-input v-model="deviceInfo.deviceName" type="hidden" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装点位" prop="wellCode">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.wellCode" placeholder="请选择安装点位" filterable clearable style="width: 100%;">
+                <el-option v-for="dict in locateList" :key="dict.value" :value="dict.name" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.wellCode" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3" prop="deviceType">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.deviceType" placeholder="请选择设备类型" filterable clearable style="width: 100%;" @change="deviceTypeChangeHandler">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.deviceTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备型号" prop="version">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.version" placeholder="请选择设备型号" clearable filterable style="width: 100%;">
+                <el-option v-for="dict in deviceModelDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.modelName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装日期">
+              <el-date-picker v-model="deviceInfo.installDate" placeholder="请选择安装日期" type="date" clearable style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备IMEI">
+              <el-input v-model="deviceInfo.imei" placeholder="请输入设备IMEI号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="ICCID">
+              <el-input v-model="deviceInfo.iccid" placeholder="请输入ICCID号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 3a9582a..348afd6 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -26,19 +26,12 @@
   deviceName: '',
   deviceType: '',
   deviceTypeName: '',
-  status: '',
-  statusName: '',
-  cell: '',
-  imei: '',
-  iccid: '',
-  model: '',
+  onlineState: '',
+  onlineStateName: '',
+  watchType: '',
+  wellCode: '',
+  version: '',
   modelName: '',
-  encipherType: '',
-  encipherTypeName: '',
-  createTime: '',
-  createUserId: '',
-  createUserName: '',
-  dataValue: '',
 })
 
 const dataQuery = ref<IListQuery>({
@@ -174,6 +167,10 @@
             <el-form-item label="设备编号：">
               {{ deviceInfo.devcode }}
             </el-form-item>
+
+            <el-form-item label="点位编号：">
+              {{ deviceInfo.wellCode }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
@@ -181,6 +178,10 @@
             <el-form-item label="设备型号：">
               {{ deviceInfo.modelName }}
             </el-form-item>
+
+            <el-form-item label="监测类型：">
+              {{ deviceInfo.watchType }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第三列 -->
@@ -230,7 +231,7 @@
           <normal-table
             :data="dataList" :columns="dataColumns"
             :pagination="false"
-            :height="560"
+            :height="520"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
index 714fb31..0e16ce7 100644
--- a/src/views/basic/common-interface.ts
+++ b/src/views/basic/common-interface.ts
@@ -4,3 +4,14 @@
   id: string
   value: string
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('手机号验证失败'))
+  }
+}
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
new file mode 100644
index 0000000..49801f7
--- /dev/null
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -0,0 +1,265 @@
+<!-- 添加 / 编辑 -->
+<script name="AddDeviceDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDeviceInfo, IDeviceType } from './device-info'
+import { addDevice, getDeviceModelList, updateDevice } from '@/api/basic/device'
+import { getLocateListSelect } from '@/api/basic/locate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  watchType: '',
+  version: '',
+  wellId: '',
+  wellCode: '',
+})
+
+const deviceInfoRules = ref({
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '设备型号不能为空，请选择', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+const deviceModelDict = ref<Array<IDeviceType>>([])
+const locateList = ref<Array<IDeviceType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('deviceInfo') // 返回列表时 将缓存中的数据删除
+
+  deviceInfo.value = {
+    id: '',
+    devcode: '',
+    deviceName: '',
+    deviceType: '',
+    watchType: '',
+    version: '',
+    wellId: '',
+    wellCode: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initLocateSelect = () => {
+  getLocateListSelect({}).then((res) => {
+    if (res.code === 200) {
+      locateList.value = res.data
+    }
+  })
+}
+
+const deviceTypeChangeHandler = () => {
+  if (deviceInfo.value.deviceType === '') {
+    deviceModelDict.value = []
+  }
+  else {
+    getDeviceModelList(deviceInfo.value.deviceType).then((res) => {
+      if (res.code === 200) {
+        deviceModelDict.value = res.data
+      }
+      else {
+        deviceModelDict.value = []
+      }
+    })
+  }
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('deviceType') !== undefined) {
+    deviceTypeDict.value = JSON.parse(sessionStorage.getItem('deviceType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增设备'
+
+      initLocateSelect()
+      deviceInfo.value.installDate = dayjs().format('YYYY-MM-DD')
+
+      break
+    case 'update':
+      title.value = '编辑设备'
+
+      deviceInfo.value = JSON.parse(sessionStorage.getItem('deviceInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="deviceInfo" :rules="deviceInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备编号" prop="devcode">
+              <el-input v-model="deviceInfo.devcode" placeholder="请输入设备编号" :disabled="type === 'update'" clearable />
+              <el-input v-model="deviceInfo.deviceName" type="hidden" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装点位" prop="wellCode">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.wellCode" placeholder="请选择安装点位" filterable clearable style="width: 100%;">
+                <el-option v-for="dict in locateList" :key="dict.value" :value="dict.name" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.wellCode" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3" prop="deviceType">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.deviceType" placeholder="请选择设备类型" filterable clearable style="width: 100%;" @change="deviceTypeChangeHandler">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.deviceTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备型号" prop="version">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.version" placeholder="请选择设备型号" clearable filterable style="width: 100%;">
+                <el-option v-for="dict in deviceModelDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.modelName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装日期">
+              <el-date-picker v-model="deviceInfo.installDate" placeholder="请选择安装日期" type="date" clearable style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备IMEI">
+              <el-input v-model="deviceInfo.imei" placeholder="请输入设备IMEI号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="ICCID">
+              <el-input v-model="deviceInfo.iccid" placeholder="请输入ICCID号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 3a9582a..348afd6 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -26,19 +26,12 @@
   deviceName: '',
   deviceType: '',
   deviceTypeName: '',
-  status: '',
-  statusName: '',
-  cell: '',
-  imei: '',
-  iccid: '',
-  model: '',
+  onlineState: '',
+  onlineStateName: '',
+  watchType: '',
+  wellCode: '',
+  version: '',
   modelName: '',
-  encipherType: '',
-  encipherTypeName: '',
-  createTime: '',
-  createUserId: '',
-  createUserName: '',
-  dataValue: '',
 })
 
 const dataQuery = ref<IListQuery>({
@@ -174,6 +167,10 @@
             <el-form-item label="设备编号：">
               {{ deviceInfo.devcode }}
             </el-form-item>
+
+            <el-form-item label="点位编号：">
+              {{ deviceInfo.wellCode }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
@@ -181,6 +178,10 @@
             <el-form-item label="设备型号：">
               {{ deviceInfo.modelName }}
             </el-form-item>
+
+            <el-form-item label="监测类型：">
+              {{ deviceInfo.watchType }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第三列 -->
@@ -230,7 +231,7 @@
           <normal-table
             :data="dataList" :columns="dataColumns"
             :pagination="false"
-            :height="560"
+            :height="520"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 0ba2135..044b3b4 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -15,20 +15,23 @@
   deviceName?: string
   deviceType: string
   deviceTypeName?: string
-  status?: string
-  statusName?: string
+  onlineState?: string
+  onlineStateName?: string
+  watchType: string
+  communication?: string
+  wellId?: string
+  wellCode?: string
+  deptid?: string
+  deptName?: string
+  position?: string
   cell?: string
-  imei: string
-  iccid: string
-  model: string
+  imei?: string
+  iccid?: string
+  version: string
   modelName?: string
-  encipherType: string
-  encipherTypeName?: string
   installDate?: string
-  createTime: string
-  createUserId: string
-  createUserName?: string
-  dataValue?: string
+  latestData?: string
+  latestTime?: string
 }
 
 export interface IConfigListQuery {
@@ -42,3 +45,9 @@
   sort?: string
   order?: string
 }
+
+export interface IDeviceType {
+  name: string
+  value: string
+  deviceType?: string
+}

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
index 714fb31..0e16ce7 100644
--- a/src/views/basic/common-interface.ts
+++ b/src/views/basic/common-interface.ts
@@ -4,3 +4,14 @@
   id: string
   value: string
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('手机号验证失败'))
+  }
+}
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
new file mode 100644
index 0000000..49801f7
--- /dev/null
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -0,0 +1,265 @@
+<!-- 添加 / 编辑 -->
+<script name="AddDeviceDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDeviceInfo, IDeviceType } from './device-info'
+import { addDevice, getDeviceModelList, updateDevice } from '@/api/basic/device'
+import { getLocateListSelect } from '@/api/basic/locate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  watchType: '',
+  version: '',
+  wellId: '',
+  wellCode: '',
+})
+
+const deviceInfoRules = ref({
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '设备型号不能为空，请选择', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+const deviceModelDict = ref<Array<IDeviceType>>([])
+const locateList = ref<Array<IDeviceType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('deviceInfo') // 返回列表时 将缓存中的数据删除
+
+  deviceInfo.value = {
+    id: '',
+    devcode: '',
+    deviceName: '',
+    deviceType: '',
+    watchType: '',
+    version: '',
+    wellId: '',
+    wellCode: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initLocateSelect = () => {
+  getLocateListSelect({}).then((res) => {
+    if (res.code === 200) {
+      locateList.value = res.data
+    }
+  })
+}
+
+const deviceTypeChangeHandler = () => {
+  if (deviceInfo.value.deviceType === '') {
+    deviceModelDict.value = []
+  }
+  else {
+    getDeviceModelList(deviceInfo.value.deviceType).then((res) => {
+      if (res.code === 200) {
+        deviceModelDict.value = res.data
+      }
+      else {
+        deviceModelDict.value = []
+      }
+    })
+  }
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('deviceType') !== undefined) {
+    deviceTypeDict.value = JSON.parse(sessionStorage.getItem('deviceType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增设备'
+
+      initLocateSelect()
+      deviceInfo.value.installDate = dayjs().format('YYYY-MM-DD')
+
+      break
+    case 'update':
+      title.value = '编辑设备'
+
+      deviceInfo.value = JSON.parse(sessionStorage.getItem('deviceInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="deviceInfo" :rules="deviceInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备编号" prop="devcode">
+              <el-input v-model="deviceInfo.devcode" placeholder="请输入设备编号" :disabled="type === 'update'" clearable />
+              <el-input v-model="deviceInfo.deviceName" type="hidden" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装点位" prop="wellCode">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.wellCode" placeholder="请选择安装点位" filterable clearable style="width: 100%;">
+                <el-option v-for="dict in locateList" :key="dict.value" :value="dict.name" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.wellCode" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3" prop="deviceType">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.deviceType" placeholder="请选择设备类型" filterable clearable style="width: 100%;" @change="deviceTypeChangeHandler">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.deviceTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备型号" prop="version">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.version" placeholder="请选择设备型号" clearable filterable style="width: 100%;">
+                <el-option v-for="dict in deviceModelDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.modelName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装日期">
+              <el-date-picker v-model="deviceInfo.installDate" placeholder="请选择安装日期" type="date" clearable style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备IMEI">
+              <el-input v-model="deviceInfo.imei" placeholder="请输入设备IMEI号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="ICCID">
+              <el-input v-model="deviceInfo.iccid" placeholder="请输入ICCID号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 3a9582a..348afd6 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -26,19 +26,12 @@
   deviceName: '',
   deviceType: '',
   deviceTypeName: '',
-  status: '',
-  statusName: '',
-  cell: '',
-  imei: '',
-  iccid: '',
-  model: '',
+  onlineState: '',
+  onlineStateName: '',
+  watchType: '',
+  wellCode: '',
+  version: '',
   modelName: '',
-  encipherType: '',
-  encipherTypeName: '',
-  createTime: '',
-  createUserId: '',
-  createUserName: '',
-  dataValue: '',
 })
 
 const dataQuery = ref<IListQuery>({
@@ -174,6 +167,10 @@
             <el-form-item label="设备编号：">
               {{ deviceInfo.devcode }}
             </el-form-item>
+
+            <el-form-item label="点位编号：">
+              {{ deviceInfo.wellCode }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
@@ -181,6 +178,10 @@
             <el-form-item label="设备型号：">
               {{ deviceInfo.modelName }}
             </el-form-item>
+
+            <el-form-item label="监测类型：">
+              {{ deviceInfo.watchType }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第三列 -->
@@ -230,7 +231,7 @@
           <normal-table
             :data="dataList" :columns="dataColumns"
             :pagination="false"
-            :height="560"
+            :height="520"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 0ba2135..044b3b4 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -15,20 +15,23 @@
   deviceName?: string
   deviceType: string
   deviceTypeName?: string
-  status?: string
-  statusName?: string
+  onlineState?: string
+  onlineStateName?: string
+  watchType: string
+  communication?: string
+  wellId?: string
+  wellCode?: string
+  deptid?: string
+  deptName?: string
+  position?: string
   cell?: string
-  imei: string
-  iccid: string
-  model: string
+  imei?: string
+  iccid?: string
+  version: string
   modelName?: string
-  encipherType: string
-  encipherTypeName?: string
   installDate?: string
-  createTime: string
-  createUserId: string
-  createUserName?: string
-  dataValue?: string
+  latestData?: string
+  latestTime?: string
 }
 
 export interface IConfigListQuery {
@@ -42,3 +45,9 @@
   sort?: string
   order?: string
 }
+
+export interface IDeviceType {
+  name: string
+  value: string
+  deviceType?: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index 9a98a52..9f2e438 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -2,11 +2,12 @@
 <script name="DeviceList" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDictType } from '../common-interface'
-import type { IDeviceInfo, IListQuery } from './device-info'
+import type { IDeviceInfo, IDeviceType, IListQuery } from './device-info'
+import AddDeviceDialog from './addDeviceDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+import { delDevice, exportDevice, getDeviceListPage, getDeviceTypeList } from '@/api/basic/device'
 
 const router = useRouter()
 
@@ -36,7 +37,9 @@
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
 const statusDict = ref<Array<IDictType>>([])
-const deviceTypeDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+
+const addDeviceRef = ref()
 
 // 逻辑
 // 导出所有
@@ -129,6 +132,17 @@
   fetchData(true)
 }
 
+// 新增
+const addDeviceHandler = () => {
+  addDeviceRef.value.initDialog({ type: 'create' })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('deviceInfo', JSON.stringify(row))
+  addDeviceRef.value.initDialog({ type: 'update' })
+}
+
 // 删除
 const deleteById = (row: IDeviceInfo) => {
   ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
@@ -158,7 +172,7 @@
   })
 }
 const getDeviceTypeDict = async () => {
-  getDictByCode('deviceType').then((res: any) => {
+  getDeviceTypeList().then((res: any) => {
     if (res.code === 200) {
       deviceTypeDict.value = res.data
       sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
@@ -189,12 +203,12 @@
     <table-container title="设备列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
-        </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
         </el-button>
+        <el-button type="primary" @click="addDeviceHandler">
+          新增
+        </el-button>
       </template>
 
       <!-- 表格区域 -->
@@ -217,7 +231,7 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 查看
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button size="small" type="primary" link @click="updateById(row)">
                 编辑
               </el-button>
               <el-button size="small" type="danger" link @click="deleteById(row)">
@@ -228,5 +242,7 @@
         </template>
       </normal-table>
     </table-container>
+
+    <add-device-dialog ref="addDeviceRef" @record-saved="searchList" />
   </app-container>
 </template>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
index 714fb31..0e16ce7 100644
--- a/src/views/basic/common-interface.ts
+++ b/src/views/basic/common-interface.ts
@@ -4,3 +4,14 @@
   id: string
   value: string
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('手机号验证失败'))
+  }
+}
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
new file mode 100644
index 0000000..49801f7
--- /dev/null
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -0,0 +1,265 @@
+<!-- 添加 / 编辑 -->
+<script name="AddDeviceDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDeviceInfo, IDeviceType } from './device-info'
+import { addDevice, getDeviceModelList, updateDevice } from '@/api/basic/device'
+import { getLocateListSelect } from '@/api/basic/locate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  watchType: '',
+  version: '',
+  wellId: '',
+  wellCode: '',
+})
+
+const deviceInfoRules = ref({
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '设备型号不能为空，请选择', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+const deviceModelDict = ref<Array<IDeviceType>>([])
+const locateList = ref<Array<IDeviceType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('deviceInfo') // 返回列表时 将缓存中的数据删除
+
+  deviceInfo.value = {
+    id: '',
+    devcode: '',
+    deviceName: '',
+    deviceType: '',
+    watchType: '',
+    version: '',
+    wellId: '',
+    wellCode: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initLocateSelect = () => {
+  getLocateListSelect({}).then((res) => {
+    if (res.code === 200) {
+      locateList.value = res.data
+    }
+  })
+}
+
+const deviceTypeChangeHandler = () => {
+  if (deviceInfo.value.deviceType === '') {
+    deviceModelDict.value = []
+  }
+  else {
+    getDeviceModelList(deviceInfo.value.deviceType).then((res) => {
+      if (res.code === 200) {
+        deviceModelDict.value = res.data
+      }
+      else {
+        deviceModelDict.value = []
+      }
+    })
+  }
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('deviceType') !== undefined) {
+    deviceTypeDict.value = JSON.parse(sessionStorage.getItem('deviceType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增设备'
+
+      initLocateSelect()
+      deviceInfo.value.installDate = dayjs().format('YYYY-MM-DD')
+
+      break
+    case 'update':
+      title.value = '编辑设备'
+
+      deviceInfo.value = JSON.parse(sessionStorage.getItem('deviceInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="deviceInfo" :rules="deviceInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备编号" prop="devcode">
+              <el-input v-model="deviceInfo.devcode" placeholder="请输入设备编号" :disabled="type === 'update'" clearable />
+              <el-input v-model="deviceInfo.deviceName" type="hidden" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装点位" prop="wellCode">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.wellCode" placeholder="请选择安装点位" filterable clearable style="width: 100%;">
+                <el-option v-for="dict in locateList" :key="dict.value" :value="dict.name" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.wellCode" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3" prop="deviceType">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.deviceType" placeholder="请选择设备类型" filterable clearable style="width: 100%;" @change="deviceTypeChangeHandler">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.deviceTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备型号" prop="version">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.version" placeholder="请选择设备型号" clearable filterable style="width: 100%;">
+                <el-option v-for="dict in deviceModelDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.modelName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装日期">
+              <el-date-picker v-model="deviceInfo.installDate" placeholder="请选择安装日期" type="date" clearable style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备IMEI">
+              <el-input v-model="deviceInfo.imei" placeholder="请输入设备IMEI号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="ICCID">
+              <el-input v-model="deviceInfo.iccid" placeholder="请输入ICCID号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 3a9582a..348afd6 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -26,19 +26,12 @@
   deviceName: '',
   deviceType: '',
   deviceTypeName: '',
-  status: '',
-  statusName: '',
-  cell: '',
-  imei: '',
-  iccid: '',
-  model: '',
+  onlineState: '',
+  onlineStateName: '',
+  watchType: '',
+  wellCode: '',
+  version: '',
   modelName: '',
-  encipherType: '',
-  encipherTypeName: '',
-  createTime: '',
-  createUserId: '',
-  createUserName: '',
-  dataValue: '',
 })
 
 const dataQuery = ref<IListQuery>({
@@ -174,6 +167,10 @@
             <el-form-item label="设备编号：">
               {{ deviceInfo.devcode }}
             </el-form-item>
+
+            <el-form-item label="点位编号：">
+              {{ deviceInfo.wellCode }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
@@ -181,6 +178,10 @@
             <el-form-item label="设备型号：">
               {{ deviceInfo.modelName }}
             </el-form-item>
+
+            <el-form-item label="监测类型：">
+              {{ deviceInfo.watchType }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第三列 -->
@@ -230,7 +231,7 @@
           <normal-table
             :data="dataList" :columns="dataColumns"
             :pagination="false"
-            :height="560"
+            :height="520"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 0ba2135..044b3b4 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -15,20 +15,23 @@
   deviceName?: string
   deviceType: string
   deviceTypeName?: string
-  status?: string
-  statusName?: string
+  onlineState?: string
+  onlineStateName?: string
+  watchType: string
+  communication?: string
+  wellId?: string
+  wellCode?: string
+  deptid?: string
+  deptName?: string
+  position?: string
   cell?: string
-  imei: string
-  iccid: string
-  model: string
+  imei?: string
+  iccid?: string
+  version: string
   modelName?: string
-  encipherType: string
-  encipherTypeName?: string
   installDate?: string
-  createTime: string
-  createUserId: string
-  createUserName?: string
-  dataValue?: string
+  latestData?: string
+  latestTime?: string
 }
 
 export interface IConfigListQuery {
@@ -42,3 +45,9 @@
   sort?: string
   order?: string
 }
+
+export interface IDeviceType {
+  name: string
+  value: string
+  deviceType?: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index 9a98a52..9f2e438 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -2,11 +2,12 @@
 <script name="DeviceList" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDictType } from '../common-interface'
-import type { IDeviceInfo, IListQuery } from './device-info'
+import type { IDeviceInfo, IDeviceType, IListQuery } from './device-info'
+import AddDeviceDialog from './addDeviceDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+import { delDevice, exportDevice, getDeviceListPage, getDeviceTypeList } from '@/api/basic/device'
 
 const router = useRouter()
 
@@ -36,7 +37,9 @@
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
 const statusDict = ref<Array<IDictType>>([])
-const deviceTypeDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+
+const addDeviceRef = ref()
 
 // 逻辑
 // 导出所有
@@ -129,6 +132,17 @@
   fetchData(true)
 }
 
+// 新增
+const addDeviceHandler = () => {
+  addDeviceRef.value.initDialog({ type: 'create' })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('deviceInfo', JSON.stringify(row))
+  addDeviceRef.value.initDialog({ type: 'update' })
+}
+
 // 删除
 const deleteById = (row: IDeviceInfo) => {
   ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
@@ -158,7 +172,7 @@
   })
 }
 const getDeviceTypeDict = async () => {
-  getDictByCode('deviceType').then((res: any) => {
+  getDeviceTypeList().then((res: any) => {
     if (res.code === 200) {
       deviceTypeDict.value = res.data
       sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
@@ -189,12 +203,12 @@
     <table-container title="设备列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
-        </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
         </el-button>
+        <el-button type="primary" @click="addDeviceHandler">
+          新增
+        </el-button>
       </template>
 
       <!-- 表格区域 -->
@@ -217,7 +231,7 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 查看
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button size="small" type="primary" link @click="updateById(row)">
                 编辑
               </el-button>
               <el-button size="small" type="danger" link @click="deleteById(row)">
@@ -228,5 +242,7 @@
         </template>
       </normal-table>
     </table-container>
+
+    <add-device-dialog ref="addDeviceRef" @record-saved="searchList" />
   </app-container>
 </template>
diff --git a/src/views/basic/locate/addLocateDialog.vue b/src/views/basic/locate/addLocateDialog.vue
new file mode 100644
index 0000000..faa1aa8
--- /dev/null
+++ b/src/views/basic/locate/addLocateDialog.vue
@@ -0,0 +1,238 @@
+<!-- 添加 / 编辑 -->
+<script name="AddLocateDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import { phoneValidator } from '../common-interface'
+import type { ILocateInfo } from './locate-info'
+import { addLocate, updateLocate } from '@/api/basic/locate'
+import { validatePhone } from '@/utils/validate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const locateInfo = ref<ILocateInfo>({
+  id: '',
+  wellCode: '',
+  wellName: '',
+  wellType: '',
+  deptid: '',
+  responsibleDept: '',
+  position: '',
+  staff: '',
+  tel: '',
+})
+
+const locateInfoRules = ref({
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: 'blur' }],
+  wellName: [{ required: true, message: '点位名称不能为空', trigger: 'blur' }],
+  wellType: [{ required: true, message: '点位类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  deptid: [{ required: true, message: '权属部门不能为空，请选择', trigger: ['blur', 'change'] }],
+  responsibleDept: [{ required: true, message: '责任部门不能为空，请选择', trigger: ['blur', 'change'] }],
+  tel: [{ validator: phoneValidator, trigger: 'blur' }],
+}) // 表单验证规则
+
+const locateTypeDict = ref<Array<IDictType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('locateInfo') // 返回列表时 将缓存中的数据删除
+
+  locateInfo.value = {
+    id: '',
+    wellCode: '',
+    wellName: '',
+    wellType: '',
+    deptid: '',
+    responsibleDept: '',
+    position: '',
+    staff: '',
+    tel: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  // 将创建时间改为提交的时间
+  addLocate(locateInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateLocate(locateInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('locateType') !== undefined) {
+    locateTypeDict.value = JSON.parse(sessionStorage.getItem('locateType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增点位'
+
+      break
+    case 'update':
+      title.value = '编辑点位'
+
+      locateInfo.value = JSON.parse(sessionStorage.getItem('locateInfo')!)
+      locateInfo.value.wellType = locateInfo.value.wellType.toString()
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="locateInfo" :rules="locateInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="点位编号" prop="wellCode">
+              <el-input v-model="locateInfo.wellCode" placeholder="请输入点位编号" :disabled="type === 'update'" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="点位名称" prop="wellName">
+              <el-input v-model="locateInfo.wellName" placeholder="请输入点位名称" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="点位类型" prop="wellType">
+              <el-select v-model="locateInfo.wellType" placeholder="请选择点位类型" clearable>
+                <el-option v-for="dict in locateTypeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="所属单位" prop="deptid">
+              <dept-select v-model="locateInfo.deptid" placeholder="请选择所属单位" clearable filterable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="责任单位" prop="responsibleDept">
+              <dept-select v-model="locateInfo.responsibleDept" placeholder="请选择责任单位" clearable filterable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="联系人">
+              <el-input v-model="locateInfo.staff" placeholder="请输入联系人" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="联系电话" prop="tel">
+              <el-input v-model="locateInfo.tel" placeholder="请输入联系人电话" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="详细地址">
+              <el-input v-model="locateInfo.position" placeholder="请在地图上选点" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
index 714fb31..0e16ce7 100644
--- a/src/views/basic/common-interface.ts
+++ b/src/views/basic/common-interface.ts
@@ -4,3 +4,14 @@
   id: string
   value: string
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('手机号验证失败'))
+  }
+}
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
new file mode 100644
index 0000000..49801f7
--- /dev/null
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -0,0 +1,265 @@
+<!-- 添加 / 编辑 -->
+<script name="AddDeviceDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDeviceInfo, IDeviceType } from './device-info'
+import { addDevice, getDeviceModelList, updateDevice } from '@/api/basic/device'
+import { getLocateListSelect } from '@/api/basic/locate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  watchType: '',
+  version: '',
+  wellId: '',
+  wellCode: '',
+})
+
+const deviceInfoRules = ref({
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '设备型号不能为空，请选择', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+const deviceModelDict = ref<Array<IDeviceType>>([])
+const locateList = ref<Array<IDeviceType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('deviceInfo') // 返回列表时 将缓存中的数据删除
+
+  deviceInfo.value = {
+    id: '',
+    devcode: '',
+    deviceName: '',
+    deviceType: '',
+    watchType: '',
+    version: '',
+    wellId: '',
+    wellCode: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initLocateSelect = () => {
+  getLocateListSelect({}).then((res) => {
+    if (res.code === 200) {
+      locateList.value = res.data
+    }
+  })
+}
+
+const deviceTypeChangeHandler = () => {
+  if (deviceInfo.value.deviceType === '') {
+    deviceModelDict.value = []
+  }
+  else {
+    getDeviceModelList(deviceInfo.value.deviceType).then((res) => {
+      if (res.code === 200) {
+        deviceModelDict.value = res.data
+      }
+      else {
+        deviceModelDict.value = []
+      }
+    })
+  }
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('deviceType') !== undefined) {
+    deviceTypeDict.value = JSON.parse(sessionStorage.getItem('deviceType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增设备'
+
+      initLocateSelect()
+      deviceInfo.value.installDate = dayjs().format('YYYY-MM-DD')
+
+      break
+    case 'update':
+      title.value = '编辑设备'
+
+      deviceInfo.value = JSON.parse(sessionStorage.getItem('deviceInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="deviceInfo" :rules="deviceInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备编号" prop="devcode">
+              <el-input v-model="deviceInfo.devcode" placeholder="请输入设备编号" :disabled="type === 'update'" clearable />
+              <el-input v-model="deviceInfo.deviceName" type="hidden" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装点位" prop="wellCode">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.wellCode" placeholder="请选择安装点位" filterable clearable style="width: 100%;">
+                <el-option v-for="dict in locateList" :key="dict.value" :value="dict.name" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.wellCode" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3" prop="deviceType">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.deviceType" placeholder="请选择设备类型" filterable clearable style="width: 100%;" @change="deviceTypeChangeHandler">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.deviceTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备型号" prop="version">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.version" placeholder="请选择设备型号" clearable filterable style="width: 100%;">
+                <el-option v-for="dict in deviceModelDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.modelName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装日期">
+              <el-date-picker v-model="deviceInfo.installDate" placeholder="请选择安装日期" type="date" clearable style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备IMEI">
+              <el-input v-model="deviceInfo.imei" placeholder="请输入设备IMEI号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="ICCID">
+              <el-input v-model="deviceInfo.iccid" placeholder="请输入ICCID号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 3a9582a..348afd6 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -26,19 +26,12 @@
   deviceName: '',
   deviceType: '',
   deviceTypeName: '',
-  status: '',
-  statusName: '',
-  cell: '',
-  imei: '',
-  iccid: '',
-  model: '',
+  onlineState: '',
+  onlineStateName: '',
+  watchType: '',
+  wellCode: '',
+  version: '',
   modelName: '',
-  encipherType: '',
-  encipherTypeName: '',
-  createTime: '',
-  createUserId: '',
-  createUserName: '',
-  dataValue: '',
 })
 
 const dataQuery = ref<IListQuery>({
@@ -174,6 +167,10 @@
             <el-form-item label="设备编号：">
               {{ deviceInfo.devcode }}
             </el-form-item>
+
+            <el-form-item label="点位编号：">
+              {{ deviceInfo.wellCode }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
@@ -181,6 +178,10 @@
             <el-form-item label="设备型号：">
               {{ deviceInfo.modelName }}
             </el-form-item>
+
+            <el-form-item label="监测类型：">
+              {{ deviceInfo.watchType }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第三列 -->
@@ -230,7 +231,7 @@
           <normal-table
             :data="dataList" :columns="dataColumns"
             :pagination="false"
-            :height="560"
+            :height="520"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 0ba2135..044b3b4 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -15,20 +15,23 @@
   deviceName?: string
   deviceType: string
   deviceTypeName?: string
-  status?: string
-  statusName?: string
+  onlineState?: string
+  onlineStateName?: string
+  watchType: string
+  communication?: string
+  wellId?: string
+  wellCode?: string
+  deptid?: string
+  deptName?: string
+  position?: string
   cell?: string
-  imei: string
-  iccid: string
-  model: string
+  imei?: string
+  iccid?: string
+  version: string
   modelName?: string
-  encipherType: string
-  encipherTypeName?: string
   installDate?: string
-  createTime: string
-  createUserId: string
-  createUserName?: string
-  dataValue?: string
+  latestData?: string
+  latestTime?: string
 }
 
 export interface IConfigListQuery {
@@ -42,3 +45,9 @@
   sort?: string
   order?: string
 }
+
+export interface IDeviceType {
+  name: string
+  value: string
+  deviceType?: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index 9a98a52..9f2e438 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -2,11 +2,12 @@
 <script name="DeviceList" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDictType } from '../common-interface'
-import type { IDeviceInfo, IListQuery } from './device-info'
+import type { IDeviceInfo, IDeviceType, IListQuery } from './device-info'
+import AddDeviceDialog from './addDeviceDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+import { delDevice, exportDevice, getDeviceListPage, getDeviceTypeList } from '@/api/basic/device'
 
 const router = useRouter()
 
@@ -36,7 +37,9 @@
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
 const statusDict = ref<Array<IDictType>>([])
-const deviceTypeDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+
+const addDeviceRef = ref()
 
 // 逻辑
 // 导出所有
@@ -129,6 +132,17 @@
   fetchData(true)
 }
 
+// 新增
+const addDeviceHandler = () => {
+  addDeviceRef.value.initDialog({ type: 'create' })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('deviceInfo', JSON.stringify(row))
+  addDeviceRef.value.initDialog({ type: 'update' })
+}
+
 // 删除
 const deleteById = (row: IDeviceInfo) => {
   ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
@@ -158,7 +172,7 @@
   })
 }
 const getDeviceTypeDict = async () => {
-  getDictByCode('deviceType').then((res: any) => {
+  getDeviceTypeList().then((res: any) => {
     if (res.code === 200) {
       deviceTypeDict.value = res.data
       sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
@@ -189,12 +203,12 @@
     <table-container title="设备列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
-        </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
         </el-button>
+        <el-button type="primary" @click="addDeviceHandler">
+          新增
+        </el-button>
       </template>
 
       <!-- 表格区域 -->
@@ -217,7 +231,7 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 查看
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button size="small" type="primary" link @click="updateById(row)">
                 编辑
               </el-button>
               <el-button size="small" type="danger" link @click="deleteById(row)">
@@ -228,5 +242,7 @@
         </template>
       </normal-table>
     </table-container>
+
+    <add-device-dialog ref="addDeviceRef" @record-saved="searchList" />
   </app-container>
 </template>
diff --git a/src/views/basic/locate/addLocateDialog.vue b/src/views/basic/locate/addLocateDialog.vue
new file mode 100644
index 0000000..faa1aa8
--- /dev/null
+++ b/src/views/basic/locate/addLocateDialog.vue
@@ -0,0 +1,238 @@
+<!-- 添加 / 编辑 -->
+<script name="AddLocateDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import { phoneValidator } from '../common-interface'
+import type { ILocateInfo } from './locate-info'
+import { addLocate, updateLocate } from '@/api/basic/locate'
+import { validatePhone } from '@/utils/validate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const locateInfo = ref<ILocateInfo>({
+  id: '',
+  wellCode: '',
+  wellName: '',
+  wellType: '',
+  deptid: '',
+  responsibleDept: '',
+  position: '',
+  staff: '',
+  tel: '',
+})
+
+const locateInfoRules = ref({
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: 'blur' }],
+  wellName: [{ required: true, message: '点位名称不能为空', trigger: 'blur' }],
+  wellType: [{ required: true, message: '点位类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  deptid: [{ required: true, message: '权属部门不能为空，请选择', trigger: ['blur', 'change'] }],
+  responsibleDept: [{ required: true, message: '责任部门不能为空，请选择', trigger: ['blur', 'change'] }],
+  tel: [{ validator: phoneValidator, trigger: 'blur' }],
+}) // 表单验证规则
+
+const locateTypeDict = ref<Array<IDictType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('locateInfo') // 返回列表时 将缓存中的数据删除
+
+  locateInfo.value = {
+    id: '',
+    wellCode: '',
+    wellName: '',
+    wellType: '',
+    deptid: '',
+    responsibleDept: '',
+    position: '',
+    staff: '',
+    tel: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  // 将创建时间改为提交的时间
+  addLocate(locateInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateLocate(locateInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('locateType') !== undefined) {
+    locateTypeDict.value = JSON.parse(sessionStorage.getItem('locateType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增点位'
+
+      break
+    case 'update':
+      title.value = '编辑点位'
+
+      locateInfo.value = JSON.parse(sessionStorage.getItem('locateInfo')!)
+      locateInfo.value.wellType = locateInfo.value.wellType.toString()
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="locateInfo" :rules="locateInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="点位编号" prop="wellCode">
+              <el-input v-model="locateInfo.wellCode" placeholder="请输入点位编号" :disabled="type === 'update'" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="点位名称" prop="wellName">
+              <el-input v-model="locateInfo.wellName" placeholder="请输入点位名称" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="点位类型" prop="wellType">
+              <el-select v-model="locateInfo.wellType" placeholder="请选择点位类型" clearable>
+                <el-option v-for="dict in locateTypeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="所属单位" prop="deptid">
+              <dept-select v-model="locateInfo.deptid" placeholder="请选择所属单位" clearable filterable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="责任单位" prop="responsibleDept">
+              <dept-select v-model="locateInfo.responsibleDept" placeholder="请选择责任单位" clearable filterable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="联系人">
+              <el-input v-model="locateInfo.staff" placeholder="请输入联系人" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="联系电话" prop="tel">
+              <el-input v-model="locateInfo.tel" placeholder="请输入联系人电话" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="详细地址">
+              <el-input v-model="locateInfo.position" placeholder="请在地图上选点" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/locate/list.vue b/src/views/basic/locate/list.vue
index 01b0f3f..1eb9c37 100644
--- a/src/views/basic/locate/list.vue
+++ b/src/views/basic/locate/list.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IDictType } from '../common-interface'
 import type { IListQuery, ILocateInfo } from './locate-info'
+import AddLocateDialog from './addLocateDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
@@ -22,20 +23,21 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '点位编号', value: 'wellCode', align: 'center', width: '160' },
-  { text: '点位名称', value: 'wellName', align: 'center', width: '160' },
+  { text: '点位编号', value: 'wellCode', align: 'center', width: '200' },
+  { text: '点位名称', value: 'wellName', align: 'center', width: '200' },
   { text: '点位类型', value: 'wellTypeName', align: 'center', width: '100' },
   { text: '具体位置', value: 'position', align: 'center' },
   { text: '责任部门', value: 'responsibleDeptName', align: 'center', width: '160' },
   { text: '责任人', value: 'staff', align: 'center', width: '160' },
   { text: '联系电话', value: 'tel', align: 'center', width: '160' },
-  { text: '布防状态', value: 'bfztName', align: 'center', width: '160' },
-
+  { text: '布防状态', value: 'bfztName', align: 'center', width: '120' },
 ])
 const dataList = ref<Array<ILocateInfo>>([]) // 表格数据
 
 const bfztDict = ref<Array<IDictType>>([])
-const deviceTypeDict = ref<Array<IDictType>>([])
+const locateTypeDict = ref<Array<IDictType>>([])
+
+const addLocateRef = ref()
 
 // 逻辑
 // 导出所有
@@ -128,6 +130,17 @@
   fetchData(true)
 }
 
+// 新增
+const addLocateHandler = () => {
+  addLocateRef.value.initDialog({ type: 'create' })
+}
+
+// 编辑
+const updateById = (row: ILocateInfo) => {
+  sessionStorage.setItem('locateInfo', JSON.stringify(row))
+  addLocateRef.value.initDialog({ type: 'update' })
+}
+
 // 删除
 const deleteById = (row: ILocateInfo) => {
   ElMessageBox.confirm(`是否删除点位 ${row.wellName}`, '提示', {
@@ -148,10 +161,10 @@
 }
 
 const getLocateTypeDict = async () => {
-  getDictByCode('deviceType').then((res: any) => {
+  getDictByCode('sluicewellType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeDict.value = res.data
-      sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
+      locateTypeDict.value = res.data
+      sessionStorage.setItem('locateType', JSON.stringify(locateTypeDict.value))
     }
   })
 }
@@ -194,6 +207,10 @@
         <el-button type="primary" @click="exportLocateInfo">
           导出列表
         </el-button>
+
+        <el-button type="primary" @click="addLocateHandler">
+          新增
+        </el-button>
       </template>
 
       <!-- 表格区域 -->
@@ -216,7 +233,7 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 查看
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button size="small" type="primary" link @click="updateById(row)">
                 编辑
               </el-button>
               <el-button size="small" type="danger" link @click="deleteById(row)">
@@ -227,5 +244,7 @@
         </template>
       </normal-table>
     </table-container>
+
+    <add-locate-dialog ref="addLocateRef" @record-saved="searchList" />
   </app-container>
 </template>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index debeba6..96c445e 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -64,3 +64,18 @@
   })
 }
 
+// 获取设备类型
+export function getDeviceTypeList() {
+  return request({
+    url: 'baseDeviceType/list-type',
+    method: 'post',
+  })
+}
+
+// 获取设备型号
+export function getDeviceModelList(deviceType: string) {
+  return request({
+    url: `baseDeviceModels/model?deviceType=${deviceType}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/basic/locate.ts b/src/api/basic/locate.ts
index b0fd7c3..6aa3722 100644
--- a/src/api/basic/locate.ts
+++ b/src/api/basic/locate.ts
@@ -10,6 +10,15 @@
   })
 }
 
+// 查询点位列表 分页
+export function getLocateListSelect(data: any) {
+  return request({
+    url: `${prefix}/selectList`,
+    method: 'post',
+    data,
+  })
+}
+
 // 导出
 export function exportLocate(data: object) {
   return request({
@@ -20,17 +29,8 @@
   })
 }
 
-// 查询产品详情
-export function detailProduct(data: object) {
-  return request({
-    url: `${prefix}/detail`,
-    method: 'post',
-    data,
-  })
-}
-
 // 添加产品
-export function addProduct(data: object) {
+export function addLocate(data: object) {
   return request({
     url: `${prefix}/add`,
     method: 'post',
@@ -38,7 +38,7 @@
   })
 }
 // 修改产品
-export function updateProduct(data: object) {
+export function updateLocate(data: object) {
   return request({
     url: `${prefix}/update`,
     method: 'post',
diff --git a/src/router/modules/leak.ts b/src/router/modules/leak.ts
index 8b203ea..54710b4 100644
--- a/src/router/modules/leak.ts
+++ b/src/router/modules/leak.ts
@@ -40,7 +40,7 @@
       {
         path: 'pair',
         name: 'LocatePaier',
-        component: () => import('@/views/basic/group/list.vue'),
+        component: () => import('@/views/basic/locate/list.vue'),
         meta: {
           title: '点位关联管理',
           auth: '/basic/locate/pair',
@@ -65,7 +65,7 @@
       {
         path: 'list',
         name: 'LeakAlarmList',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '当前报警',
           auth: '/leak/alarm/list',
@@ -77,7 +77,7 @@
       {
         path: 'history',
         name: 'LeakAlarmHistory',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警记录',
           auth: '/leak/alarm/history',
@@ -89,7 +89,7 @@
       {
         path: 'config',
         name: 'LeakAlarmConfig',
-        component: () => import('@/views/basic/product/list.vue'),
+        component: () => import('@/views/basic/device/list.vue'),
         meta: {
           title: '报警规则配置',
           auth: '/leak/alarm/config',
@@ -171,17 +171,6 @@
           activeMenu: '/data/query',
         },
       },
-      /* {
-        path: 'detail/:id?',
-        name: 'GroupInfoDetail',
-        component: () => import('@/views/basic/group/detail.vue'),
-        meta: {
-          title: '分组详情',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/basic/group',
-        },
-      }, */
     ],
   },
 ]
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
index 714fb31..0e16ce7 100644
--- a/src/views/basic/common-interface.ts
+++ b/src/views/basic/common-interface.ts
@@ -4,3 +4,14 @@
   id: string
   value: string
 }
+
+// 验证手机
+export const phoneValidator = (rule: any, value: any, callback: any) => {
+  const reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+  if (reg.test(value.trim()) === true || value.trim() === '') {
+    callback()
+  }
+  else {
+    callback(new Error('手机号验证失败'))
+  }
+}
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
new file mode 100644
index 0000000..49801f7
--- /dev/null
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -0,0 +1,265 @@
+<!-- 添加 / 编辑 -->
+<script name="AddDeviceDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDeviceInfo, IDeviceType } from './device-info'
+import { addDevice, getDeviceModelList, updateDevice } from '@/api/basic/device'
+import { getLocateListSelect } from '@/api/basic/locate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  watchType: '',
+  version: '',
+  wellId: '',
+  wellCode: '',
+})
+
+const deviceInfoRules = ref({
+  devcode: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '设备型号不能为空，请选择', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+const deviceModelDict = ref<Array<IDeviceType>>([])
+const locateList = ref<Array<IDeviceType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('deviceInfo') // 返回列表时 将缓存中的数据删除
+
+  deviceInfo.value = {
+    id: '',
+    devcode: '',
+    deviceName: '',
+    deviceType: '',
+    watchType: '',
+    version: '',
+    wellId: '',
+    wellCode: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initLocateSelect = () => {
+  getLocateListSelect({}).then((res) => {
+    if (res.code === 200) {
+      locateList.value = res.data
+    }
+  })
+}
+
+const deviceTypeChangeHandler = () => {
+  if (deviceInfo.value.deviceType === '') {
+    deviceModelDict.value = []
+  }
+  else {
+    getDeviceModelList(deviceInfo.value.deviceType).then((res) => {
+      if (res.code === 200) {
+        deviceModelDict.value = res.data
+      }
+      else {
+        deviceModelDict.value = []
+      }
+    })
+  }
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('deviceType') !== undefined) {
+    deviceTypeDict.value = JSON.parse(sessionStorage.getItem('deviceType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增设备'
+
+      initLocateSelect()
+      deviceInfo.value.installDate = dayjs().format('YYYY-MM-DD')
+
+      break
+    case 'update':
+      title.value = '编辑设备'
+
+      deviceInfo.value = JSON.parse(sessionStorage.getItem('deviceInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="deviceInfo" :rules="deviceInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备编号" prop="devcode">
+              <el-input v-model="deviceInfo.devcode" placeholder="请输入设备编号" :disabled="type === 'update'" clearable />
+              <el-input v-model="deviceInfo.deviceName" type="hidden" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装点位" prop="wellCode">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.wellCode" placeholder="请选择安装点位" filterable clearable style="width: 100%;">
+                <el-option v-for="dict in locateList" :key="dict.value" :value="dict.name" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.wellCode" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3" prop="deviceType">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.deviceType" placeholder="请选择设备类型" filterable clearable style="width: 100%;" @change="deviceTypeChangeHandler">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.deviceTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备型号" prop="version">
+              <el-select v-if="type === 'create'" v-model="deviceInfo.version" placeholder="请选择设备型号" clearable filterable style="width: 100%;">
+                <el-option v-for="dict in deviceModelDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+              </el-select>
+              <el-input v-if="type === 'update'" v-model="deviceInfo.modelName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="安装日期">
+              <el-date-picker v-model="deviceInfo.installDate" placeholder="请选择安装日期" type="date" clearable style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="设备IMEI">
+              <el-input v-model="deviceInfo.imei" placeholder="请输入设备IMEI号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12" :offset="3">
+            <el-form-item label="ICCID">
+              <el-input v-model="deviceInfo.iccid" placeholder="请输入ICCID号" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 3a9582a..348afd6 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -26,19 +26,12 @@
   deviceName: '',
   deviceType: '',
   deviceTypeName: '',
-  status: '',
-  statusName: '',
-  cell: '',
-  imei: '',
-  iccid: '',
-  model: '',
+  onlineState: '',
+  onlineStateName: '',
+  watchType: '',
+  wellCode: '',
+  version: '',
   modelName: '',
-  encipherType: '',
-  encipherTypeName: '',
-  createTime: '',
-  createUserId: '',
-  createUserName: '',
-  dataValue: '',
 })
 
 const dataQuery = ref<IListQuery>({
@@ -174,6 +167,10 @@
             <el-form-item label="设备编号：">
               {{ deviceInfo.devcode }}
             </el-form-item>
+
+            <el-form-item label="点位编号：">
+              {{ deviceInfo.wellCode }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
@@ -181,6 +178,10 @@
             <el-form-item label="设备型号：">
               {{ deviceInfo.modelName }}
             </el-form-item>
+
+            <el-form-item label="监测类型：">
+              {{ deviceInfo.watchType }}
+            </el-form-item>
           </el-col>
 
           <!-- 第一行 第三列 -->
@@ -230,7 +231,7 @@
           <normal-table
             :data="dataList" :columns="dataColumns"
             :pagination="false"
-            :height="560"
+            :height="520"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 0ba2135..044b3b4 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -15,20 +15,23 @@
   deviceName?: string
   deviceType: string
   deviceTypeName?: string
-  status?: string
-  statusName?: string
+  onlineState?: string
+  onlineStateName?: string
+  watchType: string
+  communication?: string
+  wellId?: string
+  wellCode?: string
+  deptid?: string
+  deptName?: string
+  position?: string
   cell?: string
-  imei: string
-  iccid: string
-  model: string
+  imei?: string
+  iccid?: string
+  version: string
   modelName?: string
-  encipherType: string
-  encipherTypeName?: string
   installDate?: string
-  createTime: string
-  createUserId: string
-  createUserName?: string
-  dataValue?: string
+  latestData?: string
+  latestTime?: string
 }
 
 export interface IConfigListQuery {
@@ -42,3 +45,9 @@
   sort?: string
   order?: string
 }
+
+export interface IDeviceType {
+  name: string
+  value: string
+  deviceType?: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index 9a98a52..9f2e438 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -2,11 +2,12 @@
 <script name="DeviceList" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDictType } from '../common-interface'
-import type { IDeviceInfo, IListQuery } from './device-info'
+import type { IDeviceInfo, IDeviceType, IListQuery } from './device-info'
+import AddDeviceDialog from './addDeviceDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+import { delDevice, exportDevice, getDeviceListPage, getDeviceTypeList } from '@/api/basic/device'
 
 const router = useRouter()
 
@@ -36,7 +37,9 @@
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
 const statusDict = ref<Array<IDictType>>([])
-const deviceTypeDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDeviceType>>([])
+
+const addDeviceRef = ref()
 
 // 逻辑
 // 导出所有
@@ -129,6 +132,17 @@
   fetchData(true)
 }
 
+// 新增
+const addDeviceHandler = () => {
+  addDeviceRef.value.initDialog({ type: 'create' })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('deviceInfo', JSON.stringify(row))
+  addDeviceRef.value.initDialog({ type: 'update' })
+}
+
 // 删除
 const deleteById = (row: IDeviceInfo) => {
   ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
@@ -158,7 +172,7 @@
   })
 }
 const getDeviceTypeDict = async () => {
-  getDictByCode('deviceType').then((res: any) => {
+  getDeviceTypeList().then((res: any) => {
     if (res.code === 200) {
       deviceTypeDict.value = res.data
       sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
@@ -189,12 +203,12 @@
     <table-container title="设备列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
-        </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
         </el-button>
+        <el-button type="primary" @click="addDeviceHandler">
+          新增
+        </el-button>
       </template>
 
       <!-- 表格区域 -->
@@ -217,7 +231,7 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 查看
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button size="small" type="primary" link @click="updateById(row)">
                 编辑
               </el-button>
               <el-button size="small" type="danger" link @click="deleteById(row)">
@@ -228,5 +242,7 @@
         </template>
       </normal-table>
     </table-container>
+
+    <add-device-dialog ref="addDeviceRef" @record-saved="searchList" />
   </app-container>
 </template>
diff --git a/src/views/basic/locate/addLocateDialog.vue b/src/views/basic/locate/addLocateDialog.vue
new file mode 100644
index 0000000..faa1aa8
--- /dev/null
+++ b/src/views/basic/locate/addLocateDialog.vue
@@ -0,0 +1,238 @@
+<!-- 添加 / 编辑 -->
+<script name="AddLocateDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import { phoneValidator } from '../common-interface'
+import type { ILocateInfo } from './locate-info'
+import { addLocate, updateLocate } from '@/api/basic/locate'
+import { validatePhone } from '@/utils/validate'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const locateInfo = ref<ILocateInfo>({
+  id: '',
+  wellCode: '',
+  wellName: '',
+  wellType: '',
+  deptid: '',
+  responsibleDept: '',
+  position: '',
+  staff: '',
+  tel: '',
+})
+
+const locateInfoRules = ref({
+  wellCode: [{ required: true, message: '点位编号不能为空', trigger: 'blur' }],
+  wellName: [{ required: true, message: '点位名称不能为空', trigger: 'blur' }],
+  wellType: [{ required: true, message: '点位类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  deptid: [{ required: true, message: '权属部门不能为空，请选择', trigger: ['blur', 'change'] }],
+  responsibleDept: [{ required: true, message: '责任部门不能为空，请选择', trigger: ['blur', 'change'] }],
+  tel: [{ validator: phoneValidator, trigger: 'blur' }],
+}) // 表单验证规则
+
+const locateTypeDict = ref<Array<IDictType>>([])
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('locateInfo') // 返回列表时 将缓存中的数据删除
+
+  locateInfo.value = {
+    id: '',
+    wellCode: '',
+    wellName: '',
+    wellType: '',
+    deptid: '',
+    responsibleDept: '',
+    position: '',
+    staff: '',
+    tel: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  // 将创建时间改为提交的时间
+  addLocate(locateInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateLocate(locateInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      emit('recordSaved')
+      resetForm()
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  if (sessionStorage.getItem('locateType') !== undefined) {
+    locateTypeDict.value = JSON.parse(sessionStorage.getItem('locateType')!)
+  }
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增点位'
+
+      break
+    case 'update':
+      title.value = '编辑点位'
+
+      locateInfo.value = JSON.parse(sessionStorage.getItem('locateInfo')!)
+      locateInfo.value.wellType = locateInfo.value.wellType.toString()
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  nextTick(() => {
+    infoFormRef.value.clearValidate()
+  })
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="locateInfo" :rules="locateInfoRules" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="点位编号" prop="wellCode">
+              <el-input v-model="locateInfo.wellCode" placeholder="请输入点位编号" :disabled="type === 'update'" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="点位名称" prop="wellName">
+              <el-input v-model="locateInfo.wellName" placeholder="请输入点位名称" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="点位类型" prop="wellType">
+              <el-select v-model="locateInfo.wellType" placeholder="请选择点位类型" clearable>
+                <el-option v-for="dict in locateTypeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="所属单位" prop="deptid">
+              <dept-select v-model="locateInfo.deptid" placeholder="请选择所属单位" clearable filterable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="责任单位" prop="responsibleDept">
+              <dept-select v-model="locateInfo.responsibleDept" placeholder="请选择责任单位" clearable filterable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="9" :offset="3">
+            <el-form-item label="联系人">
+              <el-input v-model="locateInfo.staff" placeholder="请输入联系人" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="9">
+            <el-form-item label="联系电话" prop="tel">
+              <el-input v-model="locateInfo.tel" placeholder="请输入联系人电话" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="详细地址">
+              <el-input v-model="locateInfo.position" placeholder="请在地图上选点" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/locate/list.vue b/src/views/basic/locate/list.vue
index 01b0f3f..1eb9c37 100644
--- a/src/views/basic/locate/list.vue
+++ b/src/views/basic/locate/list.vue
@@ -3,6 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IDictType } from '../common-interface'
 import type { IListQuery, ILocateInfo } from './locate-info'
+import AddLocateDialog from './addLocateDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
@@ -22,20 +23,21 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '点位编号', value: 'wellCode', align: 'center', width: '160' },
-  { text: '点位名称', value: 'wellName', align: 'center', width: '160' },
+  { text: '点位编号', value: 'wellCode', align: 'center', width: '200' },
+  { text: '点位名称', value: 'wellName', align: 'center', width: '200' },
   { text: '点位类型', value: 'wellTypeName', align: 'center', width: '100' },
   { text: '具体位置', value: 'position', align: 'center' },
   { text: '责任部门', value: 'responsibleDeptName', align: 'center', width: '160' },
   { text: '责任人', value: 'staff', align: 'center', width: '160' },
   { text: '联系电话', value: 'tel', align: 'center', width: '160' },
-  { text: '布防状态', value: 'bfztName', align: 'center', width: '160' },
-
+  { text: '布防状态', value: 'bfztName', align: 'center', width: '120' },
 ])
 const dataList = ref<Array<ILocateInfo>>([]) // 表格数据
 
 const bfztDict = ref<Array<IDictType>>([])
-const deviceTypeDict = ref<Array<IDictType>>([])
+const locateTypeDict = ref<Array<IDictType>>([])
+
+const addLocateRef = ref()
 
 // 逻辑
 // 导出所有
@@ -128,6 +130,17 @@
   fetchData(true)
 }
 
+// 新增
+const addLocateHandler = () => {
+  addLocateRef.value.initDialog({ type: 'create' })
+}
+
+// 编辑
+const updateById = (row: ILocateInfo) => {
+  sessionStorage.setItem('locateInfo', JSON.stringify(row))
+  addLocateRef.value.initDialog({ type: 'update' })
+}
+
 // 删除
 const deleteById = (row: ILocateInfo) => {
   ElMessageBox.confirm(`是否删除点位 ${row.wellName}`, '提示', {
@@ -148,10 +161,10 @@
 }
 
 const getLocateTypeDict = async () => {
-  getDictByCode('deviceType').then((res: any) => {
+  getDictByCode('sluicewellType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeDict.value = res.data
-      sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
+      locateTypeDict.value = res.data
+      sessionStorage.setItem('locateType', JSON.stringify(locateTypeDict.value))
     }
   })
 }
@@ -194,6 +207,10 @@
         <el-button type="primary" @click="exportLocateInfo">
           导出列表
         </el-button>
+
+        <el-button type="primary" @click="addLocateHandler">
+          新增
+        </el-button>
       </template>
 
       <!-- 表格区域 -->
@@ -216,7 +233,7 @@
               <el-button size="small" type="primary" link @click="detail(row)">
                 查看
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button size="small" type="primary" link @click="updateById(row)">
                 编辑
               </el-button>
               <el-button size="small" type="danger" link @click="deleteById(row)">
@@ -227,5 +244,7 @@
         </template>
       </normal-table>
     </table-container>
+
+    <add-locate-dialog ref="addLocateRef" @record-saved="searchList" />
   </app-container>
 </template>
diff --git a/src/views/basic/locate/locate-info.ts b/src/views/basic/locate/locate-info.ts
index 54c86f1..4eb4217 100644
--- a/src/views/basic/locate/locate-info.ts
+++ b/src/views/basic/locate/locate-info.ts
@@ -32,7 +32,7 @@
   responsibleDeptName?: string
   staff?: string
   tel?: string
-  ts: string
+  ts?: string
 }
 
 export interface IConfigListQuery {