diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 3b348a8..61eca63 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -137,7 +137,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
@@ -145,7 +145,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 3b348a8..61eca63 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -137,7 +137,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
@@ -145,7 +145,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 49a6cf5..b047f65 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -6,11 +6,12 @@
 <script lang="ts" setup name="EditPiePle">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import positionDialog from './positionDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addPieple, editPieple } from '@/api/home/ledger/pipeline'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible2 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   pipeCode: '', // 管线编号
@@ -21,6 +22,12 @@
   constructEra: '', // 建设年代
   deptid: '', // 单位
   manageType: '', // 管理方式
+  startLat: '',
+  startLng: '',
+  endLat: '',
+  endLng: '',
+  startLatLng: '',
+  endLatLng: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -32,6 +39,8 @@
   pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+  startLatLng: [{ required: true, message: '起始位置不能为空', trigger: ['blur', 'change'] }],
+  endLatLng: [{ required: true, message: '终止位置不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -45,13 +54,19 @@
     constructEra: '', // 建设年代
     deptid: '', // 单位
     manageType: '', // 管理方式
+    startLat: '',
+    startLng: '',
+    endLat: '',
+    endLng: '',
+    startLatLng: '',
+    endLatLng: '',
   }
 }
 
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible2.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
@@ -63,6 +78,8 @@
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    dataForm.value.startLatLng = dataForm.value.startLat ? `${dataForm.value.startLng},${dataForm.value.startLat}` : ''
+    dataForm.value.endLatLng = dataForm.value.endLat ? `${dataForm.value.endLng},${dataForm.value.endLat}` : ''
   }
 }
 defineExpose({
@@ -80,7 +97,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -104,7 +121,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -122,12 +139,41 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible2.value = false
 }
-
+// 选择经纬度
+const positionRef = ref()
+const selectPosition = (type: string) => {
+  positionRef.value.initDialog(type, type === 'startLatLng' ? dataForm.value.startLatLng : dataForm.value.endLatLng)
+}
+// 确认位置
+const confirmPosition = (data: any) => {
+  if (data.type === 'startLatLng') {
+    dataForm.value.startLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.startLat = data.latitude
+    dataForm.value.startLng = data.longitude
+  }
+  else {
+    dataForm.value.endLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.endLat = data.latitude
+    dataForm.value.endLng = data.longitude
+  }
+}
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -142,7 +188,8 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
         <el-col :span="12">
@@ -158,6 +205,36 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="起始位置" prop="startLatLng">
+            <el-input
+              v-model.trim="dataForm.startLatLng" type="text" placeholder="起始位置" style="width: 100%;"
+              @focus="selectPosition('startLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('startLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="终止位置" prop="endLatLng">
+            <el-input
+              v-model.trim="dataForm.endLatLng" type="text" placeholder="终止位置" style="width: 100%;"
+              @focus="selectPosition('endLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('endLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="压力级制" prop="pressType">
             <el-select v-model="dataForm.pressType" placeholder="压力级制" clearable style="width: 100%;">
               <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -166,19 +243,28 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable />
+            <!-- <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable /> -->
+            <el-select v-model="dataForm.material" placeholder="材质" clearable style="width: 100%;">
+              <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="管径(mm)" prop="pipeDiameter">
-            <el-input v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="建设年代" prop="constructEra">
-            <el-input v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 3b348a8..61eca63 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -137,7 +137,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
@@ -145,7 +145,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 49a6cf5..b047f65 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -6,11 +6,12 @@
 <script lang="ts" setup name="EditPiePle">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import positionDialog from './positionDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addPieple, editPieple } from '@/api/home/ledger/pipeline'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible2 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   pipeCode: '', // 管线编号
@@ -21,6 +22,12 @@
   constructEra: '', // 建设年代
   deptid: '', // 单位
   manageType: '', // 管理方式
+  startLat: '',
+  startLng: '',
+  endLat: '',
+  endLng: '',
+  startLatLng: '',
+  endLatLng: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -32,6 +39,8 @@
   pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+  startLatLng: [{ required: true, message: '起始位置不能为空', trigger: ['blur', 'change'] }],
+  endLatLng: [{ required: true, message: '终止位置不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -45,13 +54,19 @@
     constructEra: '', // 建设年代
     deptid: '', // 单位
     manageType: '', // 管理方式
+    startLat: '',
+    startLng: '',
+    endLat: '',
+    endLng: '',
+    startLatLng: '',
+    endLatLng: '',
   }
 }
 
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible2.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
@@ -63,6 +78,8 @@
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    dataForm.value.startLatLng = dataForm.value.startLat ? `${dataForm.value.startLng},${dataForm.value.startLat}` : ''
+    dataForm.value.endLatLng = dataForm.value.endLat ? `${dataForm.value.endLng},${dataForm.value.endLat}` : ''
   }
 }
 defineExpose({
@@ -80,7 +97,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -104,7 +121,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -122,12 +139,41 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible2.value = false
 }
-
+// 选择经纬度
+const positionRef = ref()
+const selectPosition = (type: string) => {
+  positionRef.value.initDialog(type, type === 'startLatLng' ? dataForm.value.startLatLng : dataForm.value.endLatLng)
+}
+// 确认位置
+const confirmPosition = (data: any) => {
+  if (data.type === 'startLatLng') {
+    dataForm.value.startLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.startLat = data.latitude
+    dataForm.value.startLng = data.longitude
+  }
+  else {
+    dataForm.value.endLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.endLat = data.latitude
+    dataForm.value.endLng = data.longitude
+  }
+}
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -142,7 +188,8 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
         <el-col :span="12">
@@ -158,6 +205,36 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="起始位置" prop="startLatLng">
+            <el-input
+              v-model.trim="dataForm.startLatLng" type="text" placeholder="起始位置" style="width: 100%;"
+              @focus="selectPosition('startLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('startLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="终止位置" prop="endLatLng">
+            <el-input
+              v-model.trim="dataForm.endLatLng" type="text" placeholder="终止位置" style="width: 100%;"
+              @focus="selectPosition('endLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('endLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="压力级制" prop="pressType">
             <el-select v-model="dataForm.pressType" placeholder="压力级制" clearable style="width: 100%;">
               <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -166,19 +243,28 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable />
+            <!-- <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable /> -->
+            <el-select v-model="dataForm.material" placeholder="材质" clearable style="width: 100%;">
+              <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="管径(mm)" prop="pipeDiameter">
-            <el-input v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="建设年代" prop="constructEra">
-            <el-input v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/ledger/pipeline/components/positionDialog.vue b/src/views/home/ledger/pipeline/components/positionDialog.vue
new file mode 100644
index 0000000..5a8bcff
--- /dev/null
+++ b/src/views/home/ledger/pipeline/components/positionDialog.vue
@@ -0,0 +1,168 @@
+<!--
+  Description: 管线管理-新建-选择起始终止位置弹窗
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="SelectStartOrEndPosition">
+import type { FormRules, TabsPaneContext } from 'element-plus'
+import AMap from '@/components/map/index.vue'
+import { getLocation } from '@/utils/getLocation'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible1 = ref(false) // 对话框是否显示
+// 新建点位
+const dataFormRef = ref()
+const dataForm = ref({
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 详细位置位
+}) // 表单
+
+const mapRef = ref()
+// 地图中心点
+const mapCenter = ref<string[]>([])
+if (sessionStorage.getItem('longitude')) {
+  mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+}
+else {
+  mapCenter.value = ['116.397428', '39.90923']
+}
+
+// 地图加载完成
+const completeMap = () => {
+  // 加载中心点marker
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+  mapRef.value.getPosition(mapCenter.value, (data: string) => {
+    dataForm.value.position = data
+  })
+  dataForm.value.longitude = mapCenter.value[0]
+  dataForm.value.latitude = mapCenter.value[1]
+}
+// 点击地图
+const mapClick = (e: any) => {
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  console.log(location, e, 'location')
+  mapRef.value.removeMarker()
+  mapRef.value.addMarker({
+    position: location,
+    content: '',
+    label: '',
+  })
+  // 填充坐标信息
+  dataForm.value.longitude = e.lnglat.getLng()
+  dataForm.value.latitude = e.lnglat.getLat()
+  mapRef.value.getPosition(location, (data: string) => {
+    dataForm.value.position = data
+  })
+}
+// 初始化对话框
+const dialogStatus = ref('')
+const initDialog = (type: string, position: string) => {
+  dialogFormVisible1.value = true
+  dialogStatus.value = type
+  if (position) {
+    setTimeout(() => {
+      mapCenter.value = position.split(',')
+      mapRef.value.map.setCenter(position.split(','))
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: position.split(','),
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+    return
+  }
+  if (!sessionStorage.getItem('longitude')) {
+    getLocation()
+    setTimeout(() => {
+      if (sessionStorage.getItem('longitude')) {
+        mapRef.value.map.setCenter([sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string])
+        mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+      }
+      else {
+        mapRef.value.map.setCenter(['116.397428', '39.90923'])
+        mapCenter.value = ['116.397428', '39.90923']
+      }
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: mapCenter.value,
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+  }
+}
+// 保存
+const saveData = () => {
+  emits('confirm', { ...dataForm.value, type: dialogStatus.value })
+  dialogFormVisible1.value = false
+}
+defineExpose({
+  initDialog,
+})
+
+const cancel = () => {
+  dialogFormVisible1.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible1" title="选择位置" append-to-body width="70%">
+    <el-form ref="dataFormRef" :model="dataForm" label-position="right" label-width="80px" disabled>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="详细位置" prop="position">
+            <el-input
+              v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <!-- 地图 -->
+          <a-map ref="mapRef" :center="mapCenter" :zoom="14" @complete="completeMap" @map-click="mapClick" />
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <!-- <el-button @click="cancel">
+          取消
+        </el-button> -->
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 3b348a8..61eca63 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -137,7 +137,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
@@ -145,7 +145,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 49a6cf5..b047f65 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -6,11 +6,12 @@
 <script lang="ts" setup name="EditPiePle">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import positionDialog from './positionDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addPieple, editPieple } from '@/api/home/ledger/pipeline'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible2 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   pipeCode: '', // 管线编号
@@ -21,6 +22,12 @@
   constructEra: '', // 建设年代
   deptid: '', // 单位
   manageType: '', // 管理方式
+  startLat: '',
+  startLng: '',
+  endLat: '',
+  endLng: '',
+  startLatLng: '',
+  endLatLng: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -32,6 +39,8 @@
   pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+  startLatLng: [{ required: true, message: '起始位置不能为空', trigger: ['blur', 'change'] }],
+  endLatLng: [{ required: true, message: '终止位置不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -45,13 +54,19 @@
     constructEra: '', // 建设年代
     deptid: '', // 单位
     manageType: '', // 管理方式
+    startLat: '',
+    startLng: '',
+    endLat: '',
+    endLng: '',
+    startLatLng: '',
+    endLatLng: '',
   }
 }
 
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible2.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
@@ -63,6 +78,8 @@
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    dataForm.value.startLatLng = dataForm.value.startLat ? `${dataForm.value.startLng},${dataForm.value.startLat}` : ''
+    dataForm.value.endLatLng = dataForm.value.endLat ? `${dataForm.value.endLng},${dataForm.value.endLat}` : ''
   }
 }
 defineExpose({
@@ -80,7 +97,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -104,7 +121,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -122,12 +139,41 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible2.value = false
 }
-
+// 选择经纬度
+const positionRef = ref()
+const selectPosition = (type: string) => {
+  positionRef.value.initDialog(type, type === 'startLatLng' ? dataForm.value.startLatLng : dataForm.value.endLatLng)
+}
+// 确认位置
+const confirmPosition = (data: any) => {
+  if (data.type === 'startLatLng') {
+    dataForm.value.startLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.startLat = data.latitude
+    dataForm.value.startLng = data.longitude
+  }
+  else {
+    dataForm.value.endLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.endLat = data.latitude
+    dataForm.value.endLng = data.longitude
+  }
+}
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -142,7 +188,8 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
         <el-col :span="12">
@@ -158,6 +205,36 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="起始位置" prop="startLatLng">
+            <el-input
+              v-model.trim="dataForm.startLatLng" type="text" placeholder="起始位置" style="width: 100%;"
+              @focus="selectPosition('startLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('startLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="终止位置" prop="endLatLng">
+            <el-input
+              v-model.trim="dataForm.endLatLng" type="text" placeholder="终止位置" style="width: 100%;"
+              @focus="selectPosition('endLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('endLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="压力级制" prop="pressType">
             <el-select v-model="dataForm.pressType" placeholder="压力级制" clearable style="width: 100%;">
               <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -166,19 +243,28 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable />
+            <!-- <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable /> -->
+            <el-select v-model="dataForm.material" placeholder="材质" clearable style="width: 100%;">
+              <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="管径(mm)" prop="pipeDiameter">
-            <el-input v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="建设年代" prop="constructEra">
-            <el-input v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/ledger/pipeline/components/positionDialog.vue b/src/views/home/ledger/pipeline/components/positionDialog.vue
new file mode 100644
index 0000000..5a8bcff
--- /dev/null
+++ b/src/views/home/ledger/pipeline/components/positionDialog.vue
@@ -0,0 +1,168 @@
+<!--
+  Description: 管线管理-新建-选择起始终止位置弹窗
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="SelectStartOrEndPosition">
+import type { FormRules, TabsPaneContext } from 'element-plus'
+import AMap from '@/components/map/index.vue'
+import { getLocation } from '@/utils/getLocation'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible1 = ref(false) // 对话框是否显示
+// 新建点位
+const dataFormRef = ref()
+const dataForm = ref({
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 详细位置位
+}) // 表单
+
+const mapRef = ref()
+// 地图中心点
+const mapCenter = ref<string[]>([])
+if (sessionStorage.getItem('longitude')) {
+  mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+}
+else {
+  mapCenter.value = ['116.397428', '39.90923']
+}
+
+// 地图加载完成
+const completeMap = () => {
+  // 加载中心点marker
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+  mapRef.value.getPosition(mapCenter.value, (data: string) => {
+    dataForm.value.position = data
+  })
+  dataForm.value.longitude = mapCenter.value[0]
+  dataForm.value.latitude = mapCenter.value[1]
+}
+// 点击地图
+const mapClick = (e: any) => {
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  console.log(location, e, 'location')
+  mapRef.value.removeMarker()
+  mapRef.value.addMarker({
+    position: location,
+    content: '',
+    label: '',
+  })
+  // 填充坐标信息
+  dataForm.value.longitude = e.lnglat.getLng()
+  dataForm.value.latitude = e.lnglat.getLat()
+  mapRef.value.getPosition(location, (data: string) => {
+    dataForm.value.position = data
+  })
+}
+// 初始化对话框
+const dialogStatus = ref('')
+const initDialog = (type: string, position: string) => {
+  dialogFormVisible1.value = true
+  dialogStatus.value = type
+  if (position) {
+    setTimeout(() => {
+      mapCenter.value = position.split(',')
+      mapRef.value.map.setCenter(position.split(','))
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: position.split(','),
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+    return
+  }
+  if (!sessionStorage.getItem('longitude')) {
+    getLocation()
+    setTimeout(() => {
+      if (sessionStorage.getItem('longitude')) {
+        mapRef.value.map.setCenter([sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string])
+        mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+      }
+      else {
+        mapRef.value.map.setCenter(['116.397428', '39.90923'])
+        mapCenter.value = ['116.397428', '39.90923']
+      }
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: mapCenter.value,
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+  }
+}
+// 保存
+const saveData = () => {
+  emits('confirm', { ...dataForm.value, type: dialogStatus.value })
+  dialogFormVisible1.value = false
+}
+defineExpose({
+  initDialog,
+})
+
+const cancel = () => {
+  dialogFormVisible1.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible1" title="选择位置" append-to-body width="70%">
+    <el-form ref="dataFormRef" :model="dataForm" label-position="right" label-width="80px" disabled>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="详细位置" prop="position">
+            <el-input
+              v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <!-- 地图 -->
+          <a-map ref="mapRef" :center="mapCenter" :zoom="14" @complete="completeMap" @map-click="mapClick" />
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <!-- <el-button @click="cancel">
+          取消
+        </el-button> -->
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 94706ba..c098697 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -115,6 +115,18 @@
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -144,21 +156,24 @@
         <el-input v-model="listQuery.position" placeholder="管线位置" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
           <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.material" placeholder="材质" clearable />
+        <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
+        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -211,7 +226,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 3b348a8..61eca63 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -137,7 +137,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
@@ -145,7 +145,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 49a6cf5..b047f65 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -6,11 +6,12 @@
 <script lang="ts" setup name="EditPiePle">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import positionDialog from './positionDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addPieple, editPieple } from '@/api/home/ledger/pipeline'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible2 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   pipeCode: '', // 管线编号
@@ -21,6 +22,12 @@
   constructEra: '', // 建设年代
   deptid: '', // 单位
   manageType: '', // 管理方式
+  startLat: '',
+  startLng: '',
+  endLat: '',
+  endLng: '',
+  startLatLng: '',
+  endLatLng: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -32,6 +39,8 @@
   pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+  startLatLng: [{ required: true, message: '起始位置不能为空', trigger: ['blur', 'change'] }],
+  endLatLng: [{ required: true, message: '终止位置不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -45,13 +54,19 @@
     constructEra: '', // 建设年代
     deptid: '', // 单位
     manageType: '', // 管理方式
+    startLat: '',
+    startLng: '',
+    endLat: '',
+    endLng: '',
+    startLatLng: '',
+    endLatLng: '',
   }
 }
 
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible2.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
@@ -63,6 +78,8 @@
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    dataForm.value.startLatLng = dataForm.value.startLat ? `${dataForm.value.startLng},${dataForm.value.startLat}` : ''
+    dataForm.value.endLatLng = dataForm.value.endLat ? `${dataForm.value.endLng},${dataForm.value.endLat}` : ''
   }
 }
 defineExpose({
@@ -80,7 +97,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -104,7 +121,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -122,12 +139,41 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible2.value = false
 }
-
+// 选择经纬度
+const positionRef = ref()
+const selectPosition = (type: string) => {
+  positionRef.value.initDialog(type, type === 'startLatLng' ? dataForm.value.startLatLng : dataForm.value.endLatLng)
+}
+// 确认位置
+const confirmPosition = (data: any) => {
+  if (data.type === 'startLatLng') {
+    dataForm.value.startLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.startLat = data.latitude
+    dataForm.value.startLng = data.longitude
+  }
+  else {
+    dataForm.value.endLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.endLat = data.latitude
+    dataForm.value.endLng = data.longitude
+  }
+}
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -142,7 +188,8 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
         <el-col :span="12">
@@ -158,6 +205,36 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="起始位置" prop="startLatLng">
+            <el-input
+              v-model.trim="dataForm.startLatLng" type="text" placeholder="起始位置" style="width: 100%;"
+              @focus="selectPosition('startLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('startLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="终止位置" prop="endLatLng">
+            <el-input
+              v-model.trim="dataForm.endLatLng" type="text" placeholder="终止位置" style="width: 100%;"
+              @focus="selectPosition('endLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('endLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="压力级制" prop="pressType">
             <el-select v-model="dataForm.pressType" placeholder="压力级制" clearable style="width: 100%;">
               <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -166,19 +243,28 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable />
+            <!-- <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable /> -->
+            <el-select v-model="dataForm.material" placeholder="材质" clearable style="width: 100%;">
+              <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="管径(mm)" prop="pipeDiameter">
-            <el-input v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="建设年代" prop="constructEra">
-            <el-input v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/ledger/pipeline/components/positionDialog.vue b/src/views/home/ledger/pipeline/components/positionDialog.vue
new file mode 100644
index 0000000..5a8bcff
--- /dev/null
+++ b/src/views/home/ledger/pipeline/components/positionDialog.vue
@@ -0,0 +1,168 @@
+<!--
+  Description: 管线管理-新建-选择起始终止位置弹窗
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="SelectStartOrEndPosition">
+import type { FormRules, TabsPaneContext } from 'element-plus'
+import AMap from '@/components/map/index.vue'
+import { getLocation } from '@/utils/getLocation'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible1 = ref(false) // 对话框是否显示
+// 新建点位
+const dataFormRef = ref()
+const dataForm = ref({
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 详细位置位
+}) // 表单
+
+const mapRef = ref()
+// 地图中心点
+const mapCenter = ref<string[]>([])
+if (sessionStorage.getItem('longitude')) {
+  mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+}
+else {
+  mapCenter.value = ['116.397428', '39.90923']
+}
+
+// 地图加载完成
+const completeMap = () => {
+  // 加载中心点marker
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+  mapRef.value.getPosition(mapCenter.value, (data: string) => {
+    dataForm.value.position = data
+  })
+  dataForm.value.longitude = mapCenter.value[0]
+  dataForm.value.latitude = mapCenter.value[1]
+}
+// 点击地图
+const mapClick = (e: any) => {
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  console.log(location, e, 'location')
+  mapRef.value.removeMarker()
+  mapRef.value.addMarker({
+    position: location,
+    content: '',
+    label: '',
+  })
+  // 填充坐标信息
+  dataForm.value.longitude = e.lnglat.getLng()
+  dataForm.value.latitude = e.lnglat.getLat()
+  mapRef.value.getPosition(location, (data: string) => {
+    dataForm.value.position = data
+  })
+}
+// 初始化对话框
+const dialogStatus = ref('')
+const initDialog = (type: string, position: string) => {
+  dialogFormVisible1.value = true
+  dialogStatus.value = type
+  if (position) {
+    setTimeout(() => {
+      mapCenter.value = position.split(',')
+      mapRef.value.map.setCenter(position.split(','))
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: position.split(','),
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+    return
+  }
+  if (!sessionStorage.getItem('longitude')) {
+    getLocation()
+    setTimeout(() => {
+      if (sessionStorage.getItem('longitude')) {
+        mapRef.value.map.setCenter([sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string])
+        mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+      }
+      else {
+        mapRef.value.map.setCenter(['116.397428', '39.90923'])
+        mapCenter.value = ['116.397428', '39.90923']
+      }
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: mapCenter.value,
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+  }
+}
+// 保存
+const saveData = () => {
+  emits('confirm', { ...dataForm.value, type: dialogStatus.value })
+  dialogFormVisible1.value = false
+}
+defineExpose({
+  initDialog,
+})
+
+const cancel = () => {
+  dialogFormVisible1.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible1" title="选择位置" append-to-body width="70%">
+    <el-form ref="dataFormRef" :model="dataForm" label-position="right" label-width="80px" disabled>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="详细位置" prop="position">
+            <el-input
+              v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <!-- 地图 -->
+          <a-map ref="mapRef" :center="mapCenter" :zoom="14" @complete="completeMap" @map-click="mapClick" />
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <!-- <el-button @click="cancel">
+          取消
+        </el-button> -->
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 94706ba..c098697 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -115,6 +115,18 @@
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -144,21 +156,24 @@
         <el-input v-model="listQuery.position" placeholder="管线位置" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
           <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.material" placeholder="材质" clearable />
+        <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
+        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -211,7 +226,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 8131ae5..3473768 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -1,3 +1,167 @@
+<!--
+  Description: 设备运维-厂商运维记录
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="manufacturerOperationRecord">
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '运维类型', value: 'repairType', align: 'center' },
+  { text: '安装位置', value: 'ledgerNumber', align: 'center' },
+  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '运维内容', value: 'repairContent', align: 'center' },
+  { text: '运维人员', value: 'repairPerson', align: 'center' },
+  { text: '维护时间', value: 'finishTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  devcode: '', // 设备编号
+  deviceType: '', // 设备类型
+  repairType: '', // 运维类型
+  repairPerson: '', // 运维人员
+  repairContent: '', // 运维内容
+  endTime: '', // 结束时间
+  begTime: '', // 开始时间
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getAgreementListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    devcode: '', // 设备编号
+    deviceType: '', // 设备类型
+    repairType: '', // 运维类型
+    repairPerson: '', // 运维人员
+    repairContent: '', // 运维内容
+    endTime: '', // 结束时间
+    begTime: '', // 开始时间
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  厂商运维记录
+  <!-- 布局 -->
+  <app-container>
+    <!-- 新建编辑弹窗 -->
+    <edit-dialog ref="editRef" @refresh="fetchData" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.repairType" placeholder="运维类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model="listQuery.protocolCode" placeholder="安装位置(闸井/场站/管线编号或名称)" clearable />
+      </search-item> -->
+      <search-item>
+        <el-input v-model="listQuery.repairContent" placeholder="运维内容" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="manufacturer-operation" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 3b348a8..61eca63 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -137,7 +137,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
@@ -145,7 +145,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 49a6cf5..b047f65 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -6,11 +6,12 @@
 <script lang="ts" setup name="EditPiePle">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import positionDialog from './positionDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addPieple, editPieple } from '@/api/home/ledger/pipeline'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible2 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   pipeCode: '', // 管线编号
@@ -21,6 +22,12 @@
   constructEra: '', // 建设年代
   deptid: '', // 单位
   manageType: '', // 管理方式
+  startLat: '',
+  startLng: '',
+  endLat: '',
+  endLng: '',
+  startLatLng: '',
+  endLatLng: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -32,6 +39,8 @@
   pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+  startLatLng: [{ required: true, message: '起始位置不能为空', trigger: ['blur', 'change'] }],
+  endLatLng: [{ required: true, message: '终止位置不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -45,13 +54,19 @@
     constructEra: '', // 建设年代
     deptid: '', // 单位
     manageType: '', // 管理方式
+    startLat: '',
+    startLng: '',
+    endLat: '',
+    endLng: '',
+    startLatLng: '',
+    endLatLng: '',
   }
 }
 
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible2.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
@@ -63,6 +78,8 @@
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    dataForm.value.startLatLng = dataForm.value.startLat ? `${dataForm.value.startLng},${dataForm.value.startLat}` : ''
+    dataForm.value.endLatLng = dataForm.value.endLat ? `${dataForm.value.endLng},${dataForm.value.endLat}` : ''
   }
 }
 defineExpose({
@@ -80,7 +97,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -104,7 +121,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -122,12 +139,41 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible2.value = false
 }
-
+// 选择经纬度
+const positionRef = ref()
+const selectPosition = (type: string) => {
+  positionRef.value.initDialog(type, type === 'startLatLng' ? dataForm.value.startLatLng : dataForm.value.endLatLng)
+}
+// 确认位置
+const confirmPosition = (data: any) => {
+  if (data.type === 'startLatLng') {
+    dataForm.value.startLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.startLat = data.latitude
+    dataForm.value.startLng = data.longitude
+  }
+  else {
+    dataForm.value.endLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.endLat = data.latitude
+    dataForm.value.endLng = data.longitude
+  }
+}
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -142,7 +188,8 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
         <el-col :span="12">
@@ -158,6 +205,36 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="起始位置" prop="startLatLng">
+            <el-input
+              v-model.trim="dataForm.startLatLng" type="text" placeholder="起始位置" style="width: 100%;"
+              @focus="selectPosition('startLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('startLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="终止位置" prop="endLatLng">
+            <el-input
+              v-model.trim="dataForm.endLatLng" type="text" placeholder="终止位置" style="width: 100%;"
+              @focus="selectPosition('endLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('endLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="压力级制" prop="pressType">
             <el-select v-model="dataForm.pressType" placeholder="压力级制" clearable style="width: 100%;">
               <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -166,19 +243,28 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable />
+            <!-- <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable /> -->
+            <el-select v-model="dataForm.material" placeholder="材质" clearable style="width: 100%;">
+              <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="管径(mm)" prop="pipeDiameter">
-            <el-input v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="建设年代" prop="constructEra">
-            <el-input v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/ledger/pipeline/components/positionDialog.vue b/src/views/home/ledger/pipeline/components/positionDialog.vue
new file mode 100644
index 0000000..5a8bcff
--- /dev/null
+++ b/src/views/home/ledger/pipeline/components/positionDialog.vue
@@ -0,0 +1,168 @@
+<!--
+  Description: 管线管理-新建-选择起始终止位置弹窗
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="SelectStartOrEndPosition">
+import type { FormRules, TabsPaneContext } from 'element-plus'
+import AMap from '@/components/map/index.vue'
+import { getLocation } from '@/utils/getLocation'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible1 = ref(false) // 对话框是否显示
+// 新建点位
+const dataFormRef = ref()
+const dataForm = ref({
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 详细位置位
+}) // 表单
+
+const mapRef = ref()
+// 地图中心点
+const mapCenter = ref<string[]>([])
+if (sessionStorage.getItem('longitude')) {
+  mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+}
+else {
+  mapCenter.value = ['116.397428', '39.90923']
+}
+
+// 地图加载完成
+const completeMap = () => {
+  // 加载中心点marker
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+  mapRef.value.getPosition(mapCenter.value, (data: string) => {
+    dataForm.value.position = data
+  })
+  dataForm.value.longitude = mapCenter.value[0]
+  dataForm.value.latitude = mapCenter.value[1]
+}
+// 点击地图
+const mapClick = (e: any) => {
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  console.log(location, e, 'location')
+  mapRef.value.removeMarker()
+  mapRef.value.addMarker({
+    position: location,
+    content: '',
+    label: '',
+  })
+  // 填充坐标信息
+  dataForm.value.longitude = e.lnglat.getLng()
+  dataForm.value.latitude = e.lnglat.getLat()
+  mapRef.value.getPosition(location, (data: string) => {
+    dataForm.value.position = data
+  })
+}
+// 初始化对话框
+const dialogStatus = ref('')
+const initDialog = (type: string, position: string) => {
+  dialogFormVisible1.value = true
+  dialogStatus.value = type
+  if (position) {
+    setTimeout(() => {
+      mapCenter.value = position.split(',')
+      mapRef.value.map.setCenter(position.split(','))
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: position.split(','),
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+    return
+  }
+  if (!sessionStorage.getItem('longitude')) {
+    getLocation()
+    setTimeout(() => {
+      if (sessionStorage.getItem('longitude')) {
+        mapRef.value.map.setCenter([sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string])
+        mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+      }
+      else {
+        mapRef.value.map.setCenter(['116.397428', '39.90923'])
+        mapCenter.value = ['116.397428', '39.90923']
+      }
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: mapCenter.value,
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+  }
+}
+// 保存
+const saveData = () => {
+  emits('confirm', { ...dataForm.value, type: dialogStatus.value })
+  dialogFormVisible1.value = false
+}
+defineExpose({
+  initDialog,
+})
+
+const cancel = () => {
+  dialogFormVisible1.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible1" title="选择位置" append-to-body width="70%">
+    <el-form ref="dataFormRef" :model="dataForm" label-position="right" label-width="80px" disabled>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="详细位置" prop="position">
+            <el-input
+              v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <!-- 地图 -->
+          <a-map ref="mapRef" :center="mapCenter" :zoom="14" @complete="completeMap" @map-click="mapClick" />
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <!-- <el-button @click="cancel">
+          取消
+        </el-button> -->
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 94706ba..c098697 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -115,6 +115,18 @@
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -144,21 +156,24 @@
         <el-input v-model="listQuery.position" placeholder="管线位置" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
           <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.material" placeholder="材质" clearable />
+        <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
+        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -211,7 +226,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 8131ae5..3473768 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -1,3 +1,167 @@
+<!--
+  Description: 设备运维-厂商运维记录
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="manufacturerOperationRecord">
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '运维类型', value: 'repairType', align: 'center' },
+  { text: '安装位置', value: 'ledgerNumber', align: 'center' },
+  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '运维内容', value: 'repairContent', align: 'center' },
+  { text: '运维人员', value: 'repairPerson', align: 'center' },
+  { text: '维护时间', value: 'finishTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  devcode: '', // 设备编号
+  deviceType: '', // 设备类型
+  repairType: '', // 运维类型
+  repairPerson: '', // 运维人员
+  repairContent: '', // 运维内容
+  endTime: '', // 结束时间
+  begTime: '', // 开始时间
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getAgreementListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    devcode: '', // 设备编号
+    deviceType: '', // 设备类型
+    repairType: '', // 运维类型
+    repairPerson: '', // 运维人员
+    repairContent: '', // 运维内容
+    endTime: '', // 结束时间
+    begTime: '', // 开始时间
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  厂商运维记录
+  <!-- 布局 -->
+  <app-container>
+    <!-- 新建编辑弹窗 -->
+    <edit-dialog ref="editRef" @refresh="fetchData" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.repairType" placeholder="运维类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model="listQuery.protocolCode" placeholder="安装位置(闸井/场站/管线编号或名称)" clearable />
+      </search-item> -->
+      <search-item>
+        <el-input v-model="listQuery.repairContent" placeholder="运维内容" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="manufacturer-operation" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 7d9a95b..31afa75 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -204,7 +204,7 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
 
       <search-item>
@@ -305,6 +305,6 @@
 
 <style>
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 3b348a8..61eca63 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -137,7 +137,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
@@ -145,7 +145,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 49a6cf5..b047f65 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -6,11 +6,12 @@
 <script lang="ts" setup name="EditPiePle">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import positionDialog from './positionDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addPieple, editPieple } from '@/api/home/ledger/pipeline'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible2 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   pipeCode: '', // 管线编号
@@ -21,6 +22,12 @@
   constructEra: '', // 建设年代
   deptid: '', // 单位
   manageType: '', // 管理方式
+  startLat: '',
+  startLng: '',
+  endLat: '',
+  endLng: '',
+  startLatLng: '',
+  endLatLng: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -32,6 +39,8 @@
   pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+  startLatLng: [{ required: true, message: '起始位置不能为空', trigger: ['blur', 'change'] }],
+  endLatLng: [{ required: true, message: '终止位置不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -45,13 +54,19 @@
     constructEra: '', // 建设年代
     deptid: '', // 单位
     manageType: '', // 管理方式
+    startLat: '',
+    startLng: '',
+    endLat: '',
+    endLng: '',
+    startLatLng: '',
+    endLatLng: '',
   }
 }
 
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible2.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
@@ -63,6 +78,8 @@
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    dataForm.value.startLatLng = dataForm.value.startLat ? `${dataForm.value.startLng},${dataForm.value.startLat}` : ''
+    dataForm.value.endLatLng = dataForm.value.endLat ? `${dataForm.value.endLng},${dataForm.value.endLat}` : ''
   }
 }
 defineExpose({
@@ -80,7 +97,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -104,7 +121,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -122,12 +139,41 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible2.value = false
 }
-
+// 选择经纬度
+const positionRef = ref()
+const selectPosition = (type: string) => {
+  positionRef.value.initDialog(type, type === 'startLatLng' ? dataForm.value.startLatLng : dataForm.value.endLatLng)
+}
+// 确认位置
+const confirmPosition = (data: any) => {
+  if (data.type === 'startLatLng') {
+    dataForm.value.startLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.startLat = data.latitude
+    dataForm.value.startLng = data.longitude
+  }
+  else {
+    dataForm.value.endLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.endLat = data.latitude
+    dataForm.value.endLng = data.longitude
+  }
+}
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -142,7 +188,8 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
         <el-col :span="12">
@@ -158,6 +205,36 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="起始位置" prop="startLatLng">
+            <el-input
+              v-model.trim="dataForm.startLatLng" type="text" placeholder="起始位置" style="width: 100%;"
+              @focus="selectPosition('startLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('startLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="终止位置" prop="endLatLng">
+            <el-input
+              v-model.trim="dataForm.endLatLng" type="text" placeholder="终止位置" style="width: 100%;"
+              @focus="selectPosition('endLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('endLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="压力级制" prop="pressType">
             <el-select v-model="dataForm.pressType" placeholder="压力级制" clearable style="width: 100%;">
               <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -166,19 +243,28 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable />
+            <!-- <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable /> -->
+            <el-select v-model="dataForm.material" placeholder="材质" clearable style="width: 100%;">
+              <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="管径(mm)" prop="pipeDiameter">
-            <el-input v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="建设年代" prop="constructEra">
-            <el-input v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/ledger/pipeline/components/positionDialog.vue b/src/views/home/ledger/pipeline/components/positionDialog.vue
new file mode 100644
index 0000000..5a8bcff
--- /dev/null
+++ b/src/views/home/ledger/pipeline/components/positionDialog.vue
@@ -0,0 +1,168 @@
+<!--
+  Description: 管线管理-新建-选择起始终止位置弹窗
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="SelectStartOrEndPosition">
+import type { FormRules, TabsPaneContext } from 'element-plus'
+import AMap from '@/components/map/index.vue'
+import { getLocation } from '@/utils/getLocation'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible1 = ref(false) // 对话框是否显示
+// 新建点位
+const dataFormRef = ref()
+const dataForm = ref({
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 详细位置位
+}) // 表单
+
+const mapRef = ref()
+// 地图中心点
+const mapCenter = ref<string[]>([])
+if (sessionStorage.getItem('longitude')) {
+  mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+}
+else {
+  mapCenter.value = ['116.397428', '39.90923']
+}
+
+// 地图加载完成
+const completeMap = () => {
+  // 加载中心点marker
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+  mapRef.value.getPosition(mapCenter.value, (data: string) => {
+    dataForm.value.position = data
+  })
+  dataForm.value.longitude = mapCenter.value[0]
+  dataForm.value.latitude = mapCenter.value[1]
+}
+// 点击地图
+const mapClick = (e: any) => {
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  console.log(location, e, 'location')
+  mapRef.value.removeMarker()
+  mapRef.value.addMarker({
+    position: location,
+    content: '',
+    label: '',
+  })
+  // 填充坐标信息
+  dataForm.value.longitude = e.lnglat.getLng()
+  dataForm.value.latitude = e.lnglat.getLat()
+  mapRef.value.getPosition(location, (data: string) => {
+    dataForm.value.position = data
+  })
+}
+// 初始化对话框
+const dialogStatus = ref('')
+const initDialog = (type: string, position: string) => {
+  dialogFormVisible1.value = true
+  dialogStatus.value = type
+  if (position) {
+    setTimeout(() => {
+      mapCenter.value = position.split(',')
+      mapRef.value.map.setCenter(position.split(','))
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: position.split(','),
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+    return
+  }
+  if (!sessionStorage.getItem('longitude')) {
+    getLocation()
+    setTimeout(() => {
+      if (sessionStorage.getItem('longitude')) {
+        mapRef.value.map.setCenter([sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string])
+        mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+      }
+      else {
+        mapRef.value.map.setCenter(['116.397428', '39.90923'])
+        mapCenter.value = ['116.397428', '39.90923']
+      }
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: mapCenter.value,
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+  }
+}
+// 保存
+const saveData = () => {
+  emits('confirm', { ...dataForm.value, type: dialogStatus.value })
+  dialogFormVisible1.value = false
+}
+defineExpose({
+  initDialog,
+})
+
+const cancel = () => {
+  dialogFormVisible1.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible1" title="选择位置" append-to-body width="70%">
+    <el-form ref="dataFormRef" :model="dataForm" label-position="right" label-width="80px" disabled>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="详细位置" prop="position">
+            <el-input
+              v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <!-- 地图 -->
+          <a-map ref="mapRef" :center="mapCenter" :zoom="14" @complete="completeMap" @map-click="mapClick" />
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <!-- <el-button @click="cancel">
+          取消
+        </el-button> -->
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 94706ba..c098697 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -115,6 +115,18 @@
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -144,21 +156,24 @@
         <el-input v-model="listQuery.position" placeholder="管线位置" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
           <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.material" placeholder="材质" clearable />
+        <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
+        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -211,7 +226,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 8131ae5..3473768 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -1,3 +1,167 @@
+<!--
+  Description: 设备运维-厂商运维记录
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="manufacturerOperationRecord">
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '运维类型', value: 'repairType', align: 'center' },
+  { text: '安装位置', value: 'ledgerNumber', align: 'center' },
+  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '运维内容', value: 'repairContent', align: 'center' },
+  { text: '运维人员', value: 'repairPerson', align: 'center' },
+  { text: '维护时间', value: 'finishTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  devcode: '', // 设备编号
+  deviceType: '', // 设备类型
+  repairType: '', // 运维类型
+  repairPerson: '', // 运维人员
+  repairContent: '', // 运维内容
+  endTime: '', // 结束时间
+  begTime: '', // 开始时间
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getAgreementListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    devcode: '', // 设备编号
+    deviceType: '', // 设备类型
+    repairType: '', // 运维类型
+    repairPerson: '', // 运维人员
+    repairContent: '', // 运维内容
+    endTime: '', // 结束时间
+    begTime: '', // 开始时间
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  厂商运维记录
+  <!-- 布局 -->
+  <app-container>
+    <!-- 新建编辑弹窗 -->
+    <edit-dialog ref="editRef" @refresh="fetchData" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.repairType" placeholder="运维类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model="listQuery.protocolCode" placeholder="安装位置(闸井/场站/管线编号或名称)" clearable />
+      </search-item> -->
+      <search-item>
+        <el-input v-model="listQuery.repairContent" placeholder="运维内容" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="manufacturer-operation" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 7d9a95b..31afa75 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -204,7 +204,7 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
 
       <search-item>
@@ -305,6 +305,6 @@
 
 <style>
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 09d32ca..85094e1 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -229,7 +229,7 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
@@ -352,6 +352,6 @@
 
 <style>
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>

diff --git a/package.json b/package.json
index a321aa9..61baacc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "circular-json": "^0.5.9",
     "dayjs": "^1.11.6",
     "echarts": "^5.4.1",
-    "element-plus": "^2.7.6",
+    "element-plus": "^2.7.8",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c39d5f8..2e6406c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,7 +39,7 @@
     specifier: ^5.4.1
     version: 5.4.1
   element-plus:
-    specifier: ^2.7.6
+    specifier: ^2.7.8
     version: 2.7.8(vue@3.2.44)
   file-saver:
     specifier: ^2.0.5
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index e1220f7..64d3b96 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -29,6 +29,24 @@
     data,
   })
 }
+
+// 新建点位
+export function addPosition(data: any) {
+  return request({
+    url: '/system/busLedgerPipe/addPosition',
+    method: 'post',
+    data,
+  })
+}
+// 点位列表
+
+export function getPositionListPage(data: any) {
+  return request({
+    url: `/system/busLedgerPipe/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
 // 编辑设备
 export function editDevice(data: any) {
   return request({
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4c9f349..c422262 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -16,7 +16,7 @@
 import { addDevice, editDevice } from '@/api/home/device/device'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   productId: '', // 产品
@@ -32,6 +32,7 @@
   deptName: '',
   lng: '',
   lat: '',
+  ledgerIds: [] as string[],
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,6 +43,8 @@
   typeName: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
   valid: [{ required: true, message: '在用情况不能为空', trigger: ['blur', 'change'] }],
+  leftLength: [{ required: true, message: '左侧指示带长度不能为空', trigger: ['blur', 'change'] }],
+  rightLength: [{ required: true, message: '右侧指示带长度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -60,13 +63,16 @@
     deptName: '',
     lng: '',
     lat: '',
+    ledgerIds: [],
   }
 }
-
+// 是否燃气监测桩
+const isGaspile = ref(false)
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
+  isGaspile.value = false
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible1.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     dataFormRef.value?.resetFields()
@@ -93,7 +99,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -108,6 +114,19 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
+      // const data = {
+      //   "devcode": "121212",
+      //   "deviceModel": "",
+      //   "deviceName": "测试设备",
+      //   "deviceType": 4,
+      //   "installDate": "2024-08-19",
+      //   "ledgerIds": [121212],
+      //   "productId": 1468539134214225926,
+      //   "rightLength": "",
+      //   "secretKey": "",
+      //   "tagNumber": "121212",
+      //   "watchObject": "2"
+      // }
       editDevice(dataForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
@@ -118,7 +137,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible1.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -136,7 +155,7 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible1.value = false
 }
 const productList = ref<any[]>([]) // 产品列表
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
@@ -170,6 +189,12 @@
   if (newVal) {
     dataForm.value.deviceType = productList.value.filter((item: any) => item.id === newVal)[0].deviceType
     dataForm.value.watchObject = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].watchObject
+
+    // 燃气监测桩 指示带长度字段为必填
+    const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    if (deviceTypeName === '燃气监测桩') {
+      isGaspile.value = true
+    }
   }
 }, {
   deep: true,
@@ -195,13 +220,24 @@
   }
 }
 // 确认安装位置
-const comfirmLocation = (data: any) => {
+const comfirmLocation = (data: any, type: 'single' | 'multi') => {
   console.log(data, '确认安装位置')
-  dataForm.value.tagNumber = data.tagNumber
-  dataForm.value.position = data.position
-  dataForm.value.deptName = data.deptName
-  dataForm.value.lat = data.latGaode
-  dataForm.value.lng = data.lngGaode
+  if (type === 'single') {
+    dataForm.value.tagNumber = data.tagNumber
+    dataForm.value.position = data.position
+    dataForm.value.deptName = data.deptName
+    dataForm.value.lat = data.latGaode
+    dataForm.value.lng = data.lngGaode
+    dataForm.value.ledgerIds = [data.id]
+  }
+  else {
+    dataForm.value.tagNumber = data[0].tagNumber
+    dataForm.value.position = data[0].position
+    dataForm.value.deptName = data[0].deptName
+    dataForm.value.lat = data[0].latGaode
+    dataForm.value.lng = data[0].lngGaode
+    dataForm.value.ledgerIds = data.map((item: { id: string }) => item.id)
+  }
 }
 </script>
 
@@ -210,7 +246,7 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -281,15 +317,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="dataForm.watchObject === '3'" :gutter="24">
+      <el-row v-if="!isGaspile" :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="左侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="右侧指示带长度" prop="">
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
-            <el-input v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.leftLength" placeholder="左侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="右侧指示带长度" prop="rightLength">
-            <el-input v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" style="width: 100%;" clearable />
+            <el-input
+              v-model="dataForm.rightLength" placeholder="右侧指示带长度(m)" type="number" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index 687266f..64294e1 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -76,7 +76,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 175px;">
+      <el-select v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select" style="width: 192px;">
         <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
       </el-select>
       <el-date-picker
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 6684c32..f86c2b5 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -7,6 +7,8 @@
 import { ElMessage } from 'element-plus'
 import type { FormRules, TabsPaneContext } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { addPosition, getPositionListPage } from '@/api/home/device/device'
+import { getPiePleListPage } from '@/api/home/ledger/pipeline'
 import AMap from '@/components/map/index.vue'
 import { getLocation } from '@/utils/getLocation'
 const emits = defineEmits(['confirm'])
@@ -23,6 +25,7 @@
   latitude: '', // 纬度
   position: '', // 详细位置
   deptid: '', // 管理单位
+  pipeCode: '', // 关联管线
 }) // 表单
 const rules: FormRules = {
   tagNumber: [{ required: true, message: '安装位号不能为空', trigger: ['blur', 'change'] }],
@@ -30,6 +33,7 @@
   latitude: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
@@ -82,7 +86,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '管线编号', value: 'ledgerCode', isRequired: true, align: 'center' },
+  { text: '管线编号', value: 'pipeCode', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
 ])
@@ -99,18 +103,13 @@
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
-  setTimeout(() => {
-    list.value = []
-    total.value = 0
+  getPositionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
-  }, 1000)
-  // getStationListPage(listQuery.value).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 fetchData()
 // 重置查询条件f
@@ -152,6 +151,7 @@
     })
   }
 }
+const dialogRef = ref()
 defineExpose({
   initDialog,
 })
@@ -161,13 +161,25 @@
   if (activeName.value === '新建点位') {
     dataFormRef.value.validate((valid: any) => {
       if (valid) {
-        emits('confirm', {
-          ...dataForm.value,
-          deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+        addPosition({
+          deptid: dataForm.value.deptid,
           latGaode: dataForm.value.latitude,
           lngGaode: dataForm.value.longitude,
+          pipeCode: dataForm.value.pipeCode,
+          position: dataForm.value.position,
+          tagNumber: dataForm.value.tagNumber,
+        }).then((res) => {
+          if (res.code === 200) {
+            emits('confirm', {
+              ...dataForm.value,
+              deptName: deptRef.value.fetchDeptTree().length ? deptRef.value.fetchDeptTree().filter((item: any) => item.id === dataForm.value.deptid).name : '',
+              latGaode: dataForm.value.latitude,
+              lngGaode: dataForm.value.longitude,
+              id: res.data,
+            }, 'single')
+            dialogFormVisible.value = false
+          }
         })
-        dialogFormVisible.value = false
       }
     })
   }
@@ -176,17 +188,32 @@
       ElMessage.warning('请选择数据')
       return
     }
-    emits('confirm', list.value[select.value])
+    emits('confirm', list.value[select.value], 'single')
     dialogFormVisible.value = false
   }
 }
 const cancel = () => {
   dialogFormVisible.value = false
+  // dialogRef.value.close()
 }
+
+const pipeList = ref<{ id: string; name: string; value: string }[]>([]) // 管线列表
+// 获取字典
+const fetchDict = () => {
+  getPiePleListPage({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '123')
+    pipeList.value = res.data.rows.map((item: any) => ({
+      name: item.pipeCode,
+      id: item.pipeCode,
+      value: item.pipeCode,
+    }))
+  })
+}
+fetchDict()
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
+  <el-dialog ref="dialogRef" v-model="dialogFormVisible" title="选择安装位置" append-to-body width="70%">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="新建点位" name="新建点位">
         <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
@@ -200,9 +227,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="deviceType">
-                <el-select v-model="dataForm.deviceType" placeholder="关联管线" style="width: 100%;" clearable filterable>
-                  <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="关联管线" prop="pipeCode">
+                <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
+                  <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +279,7 @@
             <el-input v-model.trim="listQuery.ledgerCode" placeholder="管线编号" clearable />
           </search-item>
           <search-item>
-            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+            <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
           </search-item>
           <search-item>
             <el-input v-model.trim="listQuery.ledgerName" placeholder="详细位置" clearable />
diff --git a/src/views/home/device/device/components/localtionForStation.vue b/src/views/home/device/device/components/localtionForStation.vue
index adb73f2..53fca20 100644
--- a/src/views/home/device/device/components/localtionForStation.vue
+++ b/src/views/home/device/device/components/localtionForStation.vue
@@ -96,7 +96,7 @@
     ElMessage.warning('请选择数据')
     return
   }
-  emits('confirm', list.value[select.value])
+  emits('confirm', list.value[select.value], 'single')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -117,10 +117,10 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.wellType" placeholder="场站类型" clearable class="select" style="width: 192px;">
           <el-option v-for="item in wellTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index 8058eab..a9180bc 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -136,7 +136,7 @@
     ElMessage.warning('请先选择数据')
     return
   }
-  emits('confirm', multiSelectData.value[multiSelectData.value.length - 1])
+  emits('confirm', multiSelectData.value, 'multi')
   dialogFormVisible.value = false
 }
 const cancel = () => {
@@ -157,18 +157,18 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 192px;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 9e7b316..638fa06 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -17,7 +17,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
   { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
   { text: '设备类型', value: 'deviceType', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObject', align: 'center' },
@@ -235,7 +235,7 @@
       <search-item>
         <el-select
           v-model="listQuery.devTypeId" placeholder="设备类型" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -246,13 +246,13 @@
       <search-item>
         <dept-select
           v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         />
       </search-item>
       <search-item>
         <el-select
           v-model="listQuery.manufacturerId" placeholder="厂商" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -260,7 +260,7 @@
       <search-item>
         <el-select
           v-model="listQuery.onlineState" placeholder="在线状态" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in onlineStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -268,7 +268,7 @@
       <search-item>
         <el-select
           v-model="listQuery.cell" placeholder="电量情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in cellList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -276,7 +276,7 @@
       <search-item>
         <el-select
           v-model="listQuery.valid" placeholder="设备在用情况" filterable clearable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -352,14 +352,14 @@
 
 <style lang="scss">
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
 
 <style lang="scss" scoped>
 .circle {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   border-radius: 50%;
   margin: 0 auto;
 }
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index ea1eea6..9a64512 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -172,7 +172,7 @@
       <search-item>
         <el-select
           v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -180,7 +180,7 @@
       <search-item>
         <el-select
           v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
@@ -188,7 +188,7 @@
       <search-item>
         <el-select
           v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
-          style="width: 175px;"
+          style="width: 192px;"
         >
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 7525fee..56d7f65 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
         <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 192px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 5697f48..d03cd9f 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -95,9 +95,9 @@
 const allSync = () => {
   $router.push({
     name: 'SyncRecord',
-    query: {
-      type: props.type,
-    },
+    // query: {
+    //   type: $props.type,
+    // },
   })
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
@@ -122,10 +122,10 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
@@ -143,7 +143,7 @@
             同步日志
           </el-button>
           <el-button type="primary" @click="sync('all', {})">
-            全部同步
+            全量同步
           </el-button>
         </div>
       </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 3b348a8..61eca63 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -137,7 +137,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
@@ -145,7 +145,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 175px;">
+        <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 49a6cf5..b047f65 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -6,11 +6,12 @@
 <script lang="ts" setup name="EditPiePle">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import positionDialog from './positionDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addPieple, editPieple } from '@/api/home/ledger/pipeline'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
-const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogFormVisible2 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
 const dataForm = ref({
   pipeCode: '', // 管线编号
@@ -21,6 +22,12 @@
   constructEra: '', // 建设年代
   deptid: '', // 单位
   manageType: '', // 管理方式
+  startLat: '',
+  startLng: '',
+  endLat: '',
+  endLng: '',
+  startLatLng: '',
+  endLatLng: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -32,6 +39,8 @@
   pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+  startLatLng: [{ required: true, message: '起始位置不能为空', trigger: ['blur', 'change'] }],
+  endLatLng: [{ required: true, message: '终止位置不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -45,13 +54,19 @@
     constructEra: '', // 建设年代
     deptid: '', // 单位
     manageType: '', // 管理方式
+    startLat: '',
+    startLng: '',
+    endLat: '',
+    endLng: '',
+    startLatLng: '',
+    endLatLng: '',
   }
 }
 
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
-  dialogFormVisible.value = true
+  dialogFormVisible2.value = true
   if (dialogStatus.value === 'add') { // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
@@ -63,6 +78,8 @@
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    dataForm.value.startLatLng = dataForm.value.startLat ? `${dataForm.value.startLng},${dataForm.value.startLat}` : ''
+    dataForm.value.endLatLng = dataForm.value.endLat ? `${dataForm.value.endLng},${dataForm.value.endLat}` : ''
   }
 }
 defineExpose({
@@ -80,7 +97,7 @@
             type: 'success',
           })
           // 通知父组件刷新状态
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
           setTimeout(() => {
             emits('refresh')
           })
@@ -104,7 +121,7 @@
           setTimeout(() => {
             emits('refresh')
           })
-          dialogFormVisible.value = false
+          dialogFormVisible2.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
       })
@@ -122,12 +139,41 @@
   }
 }
 const cancel = () => {
-  dialogFormVisible.value = false
+  dialogFormVisible2.value = false
 }
-
+// 选择经纬度
+const positionRef = ref()
+const selectPosition = (type: string) => {
+  positionRef.value.initDialog(type, type === 'startLatLng' ? dataForm.value.startLatLng : dataForm.value.endLatLng)
+}
+// 确认位置
+const confirmPosition = (data: any) => {
+  if (data.type === 'startLatLng') {
+    dataForm.value.startLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.startLat = data.latitude
+    dataForm.value.startLng = data.longitude
+  }
+  else {
+    dataForm.value.endLatLng = `${data.longitude},${data.latitude}`
+    dataForm.value.endLat = data.latitude
+    dataForm.value.endLng = data.longitude
+  }
+}
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -142,7 +188,8 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
         <el-col :span="12">
@@ -158,6 +205,36 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="起始位置" prop="startLatLng">
+            <el-input
+              v-model.trim="dataForm.startLatLng" type="text" placeholder="起始位置" style="width: 100%;"
+              @focus="selectPosition('startLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('startLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="终止位置" prop="endLatLng">
+            <el-input
+              v-model.trim="dataForm.endLatLng" type="text" placeholder="终止位置" style="width: 100%;"
+              @focus="selectPosition('endLatLng')"
+            >
+              <template #append>
+                <el-button @click="selectPosition('endLatLng')">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="压力级制" prop="pressType">
             <el-select v-model="dataForm.pressType" placeholder="压力级制" clearable style="width: 100%;">
               <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -166,19 +243,28 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable />
+            <!-- <el-input v-model.trim="dataForm.material" type="text" placeholder="材质" style="width: 100%;" clearable /> -->
+            <el-select v-model="dataForm.material" placeholder="材质" clearable style="width: 100%;">
+              <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="管径(mm)" prop="pipeDiameter">
-            <el-input v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.pipeDiameter" type="number" placeholder="管径(mm)" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="建设年代" prop="constructEra">
-            <el-input v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.constructEra" type="number" placeholder="建设年代" style="width: 100%;"
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/home/ledger/pipeline/components/positionDialog.vue b/src/views/home/ledger/pipeline/components/positionDialog.vue
new file mode 100644
index 0000000..5a8bcff
--- /dev/null
+++ b/src/views/home/ledger/pipeline/components/positionDialog.vue
@@ -0,0 +1,168 @@
+<!--
+  Description: 管线管理-新建-选择起始终止位置弹窗
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="SelectStartOrEndPosition">
+import type { FormRules, TabsPaneContext } from 'element-plus'
+import AMap from '@/components/map/index.vue'
+import { getLocation } from '@/utils/getLocation'
+const emits = defineEmits(['confirm'])
+const dialogFormVisible1 = ref(false) // 对话框是否显示
+// 新建点位
+const dataFormRef = ref()
+const dataForm = ref({
+  longitude: '', // 经度
+  latitude: '', // 纬度
+  position: '', // 详细位置位
+}) // 表单
+
+const mapRef = ref()
+// 地图中心点
+const mapCenter = ref<string[]>([])
+if (sessionStorage.getItem('longitude')) {
+  mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+}
+else {
+  mapCenter.value = ['116.397428', '39.90923']
+}
+
+// 地图加载完成
+const completeMap = () => {
+  // 加载中心点marker
+  mapRef.value.addMarker({
+    position: mapCenter.value,
+    content: '',
+    label: '',
+  })
+  mapRef.value.getPosition(mapCenter.value, (data: string) => {
+    dataForm.value.position = data
+  })
+  dataForm.value.longitude = mapCenter.value[0]
+  dataForm.value.latitude = mapCenter.value[1]
+}
+// 点击地图
+const mapClick = (e: any) => {
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  console.log(location, e, 'location')
+  mapRef.value.removeMarker()
+  mapRef.value.addMarker({
+    position: location,
+    content: '',
+    label: '',
+  })
+  // 填充坐标信息
+  dataForm.value.longitude = e.lnglat.getLng()
+  dataForm.value.latitude = e.lnglat.getLat()
+  mapRef.value.getPosition(location, (data: string) => {
+    dataForm.value.position = data
+  })
+}
+// 初始化对话框
+const dialogStatus = ref('')
+const initDialog = (type: string, position: string) => {
+  dialogFormVisible1.value = true
+  dialogStatus.value = type
+  if (position) {
+    setTimeout(() => {
+      mapCenter.value = position.split(',')
+      mapRef.value.map.setCenter(position.split(','))
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: position.split(','),
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+    return
+  }
+  if (!sessionStorage.getItem('longitude')) {
+    getLocation()
+    setTimeout(() => {
+      if (sessionStorage.getItem('longitude')) {
+        mapRef.value.map.setCenter([sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string])
+        mapCenter.value = [sessionStorage.getItem('longitude') as string, sessionStorage.getItem('latitude') as string]
+      }
+      else {
+        mapRef.value.map.setCenter(['116.397428', '39.90923'])
+        mapCenter.value = ['116.397428', '39.90923']
+      }
+      mapRef.value.removeMarker()
+      mapRef.value.addMarker({
+        position: mapCenter.value,
+        content: '',
+        label: '',
+      })
+      mapRef.value.getPosition(mapCenter.value, (data: string) => {
+        dataForm.value.position = data
+      })
+      dataForm.value.longitude = mapCenter.value[0]
+      dataForm.value.latitude = mapCenter.value[1]
+    })
+  }
+}
+// 保存
+const saveData = () => {
+  emits('confirm', { ...dataForm.value, type: dialogStatus.value })
+  dialogFormVisible1.value = false
+}
+defineExpose({
+  initDialog,
+})
+
+const cancel = () => {
+  dialogFormVisible1.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible1" title="选择位置" append-to-body width="70%">
+    <el-form ref="dataFormRef" :model="dataForm" label-position="right" label-width="80px" disabled>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="详细位置" prop="position">
+            <el-input
+              v-model.trim="dataForm.position" type="textarea" :rows="6" placeholder="详细位置" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model.trim="dataForm.longitude" type="text" placeholder="经度" style="width: 100%;" clearable />
+          </el-form-item>
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model.trim="dataForm.latitude" type="text" placeholder="纬度" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <!-- 地图 -->
+          <a-map ref="mapRef" :center="mapCenter" :zoom="14" @complete="completeMap" @map-click="mapClick" />
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <!-- <el-button @click="cancel">
+          取消
+        </el-button> -->
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 94706ba..c098697 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -115,6 +115,18 @@
 // 获取字典
 const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
 const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const materialList = ref<{ id: string; name: string; value: string }[]>([
+  {
+    name: 'PE',
+    id: '1',
+    value: 'PE',
+  },
+  {
+    name: '钢质',
+    id: '2',
+    value: '钢质',
+  },
+]) // 材质
 const fetchDict = () => {
   // 压力级制
   getDictByCode('pressType').then((res) => {
@@ -144,21 +156,24 @@
         <el-input v-model="listQuery.position" placeholder="管线位置" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.pressType" placeholder="压力级制" clearable class="select" style="width: 192px;">
           <el-option v-for="item in pressTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.material" placeholder="材质" clearable />
+        <!-- <el-input v-model="listQuery.material" placeholder="材质" clearable /> -->
+        <el-select v-model="listQuery.material" placeholder="压力级制" clearable class="select" style="width: 192px;">
+          <el-option v-for="item in materialList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 192px;">
           <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -211,7 +226,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 8131ae5..3473768 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -1,3 +1,167 @@
+<!--
+  Description: 设备运维-厂商运维记录
+  Author: 李亚光
+  Date: 2024-09-04
+ -->
+<script lang="ts" setup name="manufacturerOperationRecord">
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '运维类型', value: 'repairType', align: 'center' },
+  { text: '安装位置', value: 'ledgerNumber', align: 'center' },
+  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '管理单位', value: '', align: 'center' },
+  { text: '运维内容', value: 'repairContent', align: 'center' },
+  { text: '运维人员', value: 'repairPerson', align: 'center' },
+  { text: '维护时间', value: 'finishTime', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  devcode: '', // 设备编号
+  deviceType: '', // 设备类型
+  repairType: '', // 运维类型
+  repairPerson: '', // 运维人员
+  repairContent: '', // 运维内容
+  endTime: '', // 结束时间
+  begTime: '', // 开始时间
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.value.begTime = ''
+  listQuery.value.endTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.begTime = `${newVal[0]} 00:00:00`
+      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  // getAgreementListPage(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  loadingTable.value = false
+  // }).catch(() => {
+  //   loadingTable.value = false
+  // })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    devcode: '', // 设备编号
+    deviceType: '', // 设备类型
+    repairType: '', // 运维类型
+    repairPerson: '', // 运维人员
+    repairContent: '', // 运维内容
+    endTime: '', // 结束时间
+    begTime: '', // 开始时间
+  }
+  fetchData()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+onMounted(async () => {
+  fetchData()
+})
+</script>
+
 <template>
-  厂商运维记录
+  <!-- 布局 -->
+  <app-container>
+    <!-- 新建编辑弹窗 -->
+    <edit-dialog ref="editRef" @refresh="fetchData" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deviceType" placeholder="设备类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.repairType" placeholder="运维类型" clearable filterable class="select"
+          style="width: 192px;"
+        >
+          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model="listQuery.protocolCode" placeholder="安装位置(闸井/场站/管线编号或名称)" clearable />
+      </search-item> -->
+      <search-item>
+        <el-input v-model="listQuery.repairContent" placeholder="运维内容" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="manufacturer-operation" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            导出
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 7d9a95b..31afa75 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -204,7 +204,7 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
 
       <search-item>
@@ -305,6 +305,6 @@
 
 <style>
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 09d32ca..85094e1 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -229,7 +229,7 @@
         <el-input v-model.trim="listQuery.ledgerName" placeholder="闸井名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.propertyOwner" placeholder="产权单位" clearable />
@@ -352,6 +352,6 @@
 
 <style>
 .select {
-  width: 175px;
+  width: 192px;
 }
 </style>
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index deb9147..e72df22 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -120,7 +120,7 @@
         <el-input v-model="listQuery.resourceUrl" placeholder="资源路径" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.resourceType" placeholder="资源类型" clearable class="select" style="width: 175px;">
+        <el-select v-model="listQuery.resourceType" placeholder="资源类型" clearable class="select" style="width: 192px;">
           <el-option
             v-for="item in resourceTypeList"
             :key="item.value"