diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts
new file mode 100644
index 0000000..6fc8e28
--- /dev/null
+++ b/src/api/home/operation/manufacturer.ts
@@ -0,0 +1,25 @@
+/**
+ * 厂商运维记录
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getOperationListPage(data: any) {
+  return request({
+    url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+export function exportOperationList(data: any) {
+  return request({
+    url: '/device/busRepairLog/batchExport',
+    method: 'post',
+    params: {
+      ...data,
+    },
+    responseType: 'blob',
+  })
+}
+

diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts
new file mode 100644
index 0000000..6fc8e28
--- /dev/null
+++ b/src/api/home/operation/manufacturer.ts
@@ -0,0 +1,25 @@
+/**
+ * 厂商运维记录
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getOperationListPage(data: any) {
+  return request({
+    url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+export function exportOperationList(data: any) {
+  return request({
+    url: '/device/busRepairLog/batchExport',
+    method: 'post',
+    params: {
+      ...data,
+    },
+    responseType: 'blob',
+  })
+}
+
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index c422262..35dc4a9 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -18,7 +18,7 @@
 const dataFormRef = ref()
 const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
-const dataForm = ref({
+const dataForm = ref<{ [key: string]: any }>({
   productId: '', // 产品
   deviceType: '', // 设备类型
   devcode: '', // 设备编号
@@ -114,20 +114,24 @@
 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) => {
+      const data = {
+        devcode: '',
+        deviceModel: '',
+        deviceName: '',
+        deviceType: '',
+        installDate: '',
+        ledgerIds: [],
+        productId: '',
+        rightLength: '',
+        secretKey: '',
+        tagNumber: '',
+        watchObject: '',
+        id: '',
+      } as { [key: string]: any }
+      for (const i in data) {
+        data[i] = dataForm.value[i]
+      }
+      editDevice(data).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',

diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts
new file mode 100644
index 0000000..6fc8e28
--- /dev/null
+++ b/src/api/home/operation/manufacturer.ts
@@ -0,0 +1,25 @@
+/**
+ * 厂商运维记录
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getOperationListPage(data: any) {
+  return request({
+    url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+export function exportOperationList(data: any) {
+  return request({
+    url: '/device/busRepairLog/batchExport',
+    method: 'post',
+    params: {
+      ...data,
+    },
+    responseType: 'blob',
+  })
+}
+
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index c422262..35dc4a9 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -18,7 +18,7 @@
 const dataFormRef = ref()
 const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
-const dataForm = ref({
+const dataForm = ref<{ [key: string]: any }>({
   productId: '', // 产品
   deviceType: '', // 设备类型
   devcode: '', // 设备编号
@@ -114,20 +114,24 @@
 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) => {
+      const data = {
+        devcode: '',
+        deviceModel: '',
+        deviceName: '',
+        deviceType: '',
+        installDate: '',
+        ledgerIds: [],
+        productId: '',
+        rightLength: '',
+        secretKey: '',
+        tagNumber: '',
+        watchObject: '',
+        id: '',
+      } as { [key: string]: any }
+      for (const i in data) {
+        data[i] = dataForm.value[i]
+      }
+      editDevice(data).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 638fa06..4734ba7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -163,7 +163,7 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportDevice({}).then((res) => {
-    exportFile(res.data, '设备列表')
+    exportFile(res.data, '设备列表.xlsx')
     loading.close()
   }).catch(() => {
     loading.close()

diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts
new file mode 100644
index 0000000..6fc8e28
--- /dev/null
+++ b/src/api/home/operation/manufacturer.ts
@@ -0,0 +1,25 @@
+/**
+ * 厂商运维记录
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getOperationListPage(data: any) {
+  return request({
+    url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+export function exportOperationList(data: any) {
+  return request({
+    url: '/device/busRepairLog/batchExport',
+    method: 'post',
+    params: {
+      ...data,
+    },
+    responseType: 'blob',
+  })
+}
+
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index c422262..35dc4a9 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -18,7 +18,7 @@
 const dataFormRef = ref()
 const dialogFormVisible1 = ref(false) // 对话框是否显示
 const dialogStatus = ref('') // 对话框类型：create,update
-const dataForm = ref({
+const dataForm = ref<{ [key: string]: any }>({
   productId: '', // 产品
   deviceType: '', // 设备类型
   devcode: '', // 设备编号
@@ -114,20 +114,24 @@
 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) => {
+      const data = {
+        devcode: '',
+        deviceModel: '',
+        deviceName: '',
+        deviceType: '',
+        installDate: '',
+        ledgerIds: [],
+        productId: '',
+        rightLength: '',
+        secretKey: '',
+        tagNumber: '',
+        watchObject: '',
+        id: '',
+      } as { [key: string]: any }
+      for (const i in data) {
+        data[i] = dataForm.value[i]
+      }
+      editDevice(data).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 638fa06..4734ba7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -163,7 +163,7 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   exportDevice({}).then((res) => {
-    exportFile(res.data, '设备列表')
+    exportFile(res.data, '设备列表.xlsx')
     loading.close()
   }).catch(() => {
     loading.close()
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 3473768..f439521 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -4,8 +4,13 @@
   Date: 2024-09-04
  -->
 <script lang="ts" setup name="manufacturerOperationRecord">
-import { ElMessage, ElMessageBox } from 'element-plus'
-
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { exportOperationList, getOperationListPage } from '@/api/home/operation/manufacturer'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+const deviceTypeList = ref<any[]>([]) // 设备类型列表
+const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -13,7 +18,7 @@
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  { text: '运维类型', value: 'repairType', align: 'center' },
+  { text: '运维类型', value: 'repairTypeName', align: 'center' },
   { text: '安装位置', value: 'ledgerNumber', align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
   { text: '管理单位', value: '', align: 'center' },
@@ -55,13 +60,17 @@
 // 查询数据
 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
-  // })
+  getOperationListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      deviceTypeName: deviceTypeList.value.filter((citem: any) => citem.id === item.deviceType)[0].typeName,
+      repairTypeName: repairTypeList.value.filter((citem: any) => citem.value === item.repairType)[0].name,
+    }))
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 重置查询条件f
 const reset = () => {
@@ -88,7 +97,31 @@
   }
   fetchData()
 }
+// 导出列表
+const exportList = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportOperationList(listQuery.value).then((res) => {
+    exportFile(res.data, '厂商运维记录.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
+}
+// 获取字典
+const fetchDict = async () => {
+  // 获取设备类型
+  const res = await getDeviceTypeListPage({ limit: 9999, offset: 1 })
+  deviceTypeList.value = res.data.rows
+  // 运维类型
+  getDictByCode('repairType').then((res) => {
+    repairTypeList.value = res.data
+  })
+}
 onMounted(async () => {
+  await fetchDict()
   fetchData()
 })
 </script>
@@ -108,7 +141,7 @@
           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-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
         </el-select>
       </search-item>
       <search-item>
@@ -116,7 +149,7 @@
           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-option v-for="item in repairTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <!-- <search-item>
@@ -144,7 +177,7 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <el-button type="primary">
+          <el-button type="primary" @click="exportList">
             导出
           </el-button>
         </div>