diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
new file mode 100644
index 0000000..bee99eb
--- /dev/null
+++ b/src/api/home/device/instruction.ts
@@ -0,0 +1,32 @@
+/**
+ * 设备管理--指令下发
+ */
+import request from '@/api/index'
+
+// 设备管理基础列表
+export function getInstructionListPage(data: any) {
+  return request({
+    url: `/system/busConfig/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeInstruction(ids: any) {
+  return request({
+    url: '/system/busConfig/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新增
+export function addInstruction(data: any) {
+  return request({
+    url: '/system/busConfig/add',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
new file mode 100644
index 0000000..bee99eb
--- /dev/null
+++ b/src/api/home/device/instruction.ts
@@ -0,0 +1,32 @@
+/**
+ * 设备管理--指令下发
+ */
+import request from '@/api/index'
+
+// 设备管理基础列表
+export function getInstructionListPage(data: any) {
+  return request({
+    url: `/system/busConfig/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeInstruction(ids: any) {
+  return request({
+    url: '/system/busConfig/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新增
+export function addInstruction(data: any) {
+  return request({
+    url: '/system/busConfig/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts
new file mode 100644
index 0000000..1823500
--- /dev/null
+++ b/src/api/home/ledger/pipeline.ts
@@ -0,0 +1,42 @@
+/**
+ * 台账管理--管线管理接口
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getPiePleListPage(data: any) {
+  return request({
+    url: `/system/busPipeline/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function removePieple(ids: any) {
+  return request({
+    url: '/system/busPipeline/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新建
+export function addPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function editPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/edit',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
new file mode 100644
index 0000000..bee99eb
--- /dev/null
+++ b/src/api/home/device/instruction.ts
@@ -0,0 +1,32 @@
+/**
+ * 设备管理--指令下发
+ */
+import request from '@/api/index'
+
+// 设备管理基础列表
+export function getInstructionListPage(data: any) {
+  return request({
+    url: `/system/busConfig/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeInstruction(ids: any) {
+  return request({
+    url: '/system/busConfig/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新增
+export function addInstruction(data: any) {
+  return request({
+    url: '/system/busConfig/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts
new file mode 100644
index 0000000..1823500
--- /dev/null
+++ b/src/api/home/ledger/pipeline.ts
@@ -0,0 +1,42 @@
+/**
+ * 台账管理--管线管理接口
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getPiePleListPage(data: any) {
+  return request({
+    url: `/system/busPipeline/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function removePieple(ids: any) {
+  return request({
+    url: '/system/busPipeline/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新建
+export function addPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function editPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/edit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index b7da9cc..4265aaf 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -4,6 +4,7 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmCount">
+import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
 const listQuery = ref({
@@ -12,8 +13,12 @@
   ledgerType: '',
   timeType: '1',
 })
+// listQuery.value.begTime =
+// listQuery.value.endTime =
 // 开始结束时间
 const datetimerange = ref()
+// 默认当天
+datetimerange.value = [`${dayjs().format('YYYY-MM-DD')} 00:00:00`, dayjs().format('YYYY-MM-DD HH:mm:ss')]
 watch(() => datetimerange.value, (newVal) => {
   listQuery.value.begTime = ''
   listQuery.value.endTime = ''
@@ -63,7 +68,7 @@
         </el-select>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
-          style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
+          style="width: 360px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">

diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
new file mode 100644
index 0000000..bee99eb
--- /dev/null
+++ b/src/api/home/device/instruction.ts
@@ -0,0 +1,32 @@
+/**
+ * 设备管理--指令下发
+ */
+import request from '@/api/index'
+
+// 设备管理基础列表
+export function getInstructionListPage(data: any) {
+  return request({
+    url: `/system/busConfig/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeInstruction(ids: any) {
+  return request({
+    url: '/system/busConfig/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新增
+export function addInstruction(data: any) {
+  return request({
+    url: '/system/busConfig/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts
new file mode 100644
index 0000000..1823500
--- /dev/null
+++ b/src/api/home/ledger/pipeline.ts
@@ -0,0 +1,42 @@
+/**
+ * 台账管理--管线管理接口
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getPiePleListPage(data: any) {
+  return request({
+    url: `/system/busPipeline/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function removePieple(ids: any) {
+  return request({
+    url: '/system/busPipeline/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新建
+export function addPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function editPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/edit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index b7da9cc..4265aaf 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -4,6 +4,7 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmCount">
+import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
 const listQuery = ref({
@@ -12,8 +13,12 @@
   ledgerType: '',
   timeType: '1',
 })
+// listQuery.value.begTime =
+// listQuery.value.endTime =
 // 开始结束时间
 const datetimerange = ref()
+// 默认当天
+datetimerange.value = [`${dayjs().format('YYYY-MM-DD')} 00:00:00`, dayjs().format('YYYY-MM-DD HH:mm:ss')]
 watch(() => datetimerange.value, (newVal) => {
   listQuery.value.begTime = ''
   listQuery.value.endTime = ''
@@ -63,7 +68,7 @@
         </el-select>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
-          style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
+          style="width: 360px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
new file mode 100644
index 0000000..fb7109b
--- /dev/null
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -0,0 +1,289 @@
+<!--
+  Description: 产品管理-新建或编辑指令
+  Author: 李亚光
+  Date: 2024-07-15
+ -->
+<script lang="ts" setup name="EditInstruction">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getProductListPage } from '@/api/home/device/product'
+import { getDeviceListPage } from '@/api/home/device/device'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['refresh'])
+const user = useUserStore()
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  id: '',
+  productId: '', // 产品
+  devcode: '', // 设备编号
+  collectInterval: '', // 采集间隔
+  uploadPeriod: '', // 上传周期
+  reloadInterval: '', // 重传次数
+  operator: '', // 操作员id
+  operatorName: '', // 操作员名称
+  maker: '', // 备注
+  deviceType: '',
+  deviceTypeName: '',
+  framecontent: '',
+  framecontentDesc: '',
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+  detail: '详情',
+} // 表头显示标题
+const rules: FormRules = {
+  productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
+  devcode: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+  collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
+  reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
+  uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    id: '',
+    productId: '', // 产品
+    devcode: '', // 设备编号
+    collectInterval: '', // 采集间隔
+    uploadPeriod: '', // 上传周期
+    reloadInterval: '', // 重传次数
+    operator: '', // 操作员id
+    operatorName: '', // 操作员名称
+    maker: '', // 备注
+    deviceType: '',
+    deviceTypeName: '',
+    framecontent: '',
+    framecontentDesc: '',
+  }
+}
+
+// 初始化对话框
+const isFirst = ref(true)
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    dataFormRef.value?.resetFields()
+    dataForm.value.operator = user.id
+    dataForm.value.operatorName = user.name
+  }
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      ...JSON.parse(JSON.stringify(row)),
+    }
+  }
+  setTimeout(() => {
+    isFirst.value = false
+  })
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+      dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+      addInstruction(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
+          // 通知父组件刷新状态
+          dialogFormVisible.value = false
+          setTimeout(() => {
+            emits('refresh')
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      removeInstruction([dataForm.value.id]).then((res) => {
+        dataForm.value.id = ''
+        createData()
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const deviceList = ref<{ id: string; name: string; value: string }[]>([]) // 设备
+const deviceAllList = ref<{ id: string; name: string; value: string }[]>([]) // 设备
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
+// 获取字典
+const fetchDict = async () => {
+  // 设备类型
+  const res = await getDeviceTypeListPage({ offset: 1, limit: 99999 })
+  deviceTypeList.value = res.data.rows.map((item: any) => ({
+    name: item.typeName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 产品
+  getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
+    productList.value = res.data.rows.map((item: any) => ({
+      name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+      id: item.id,
+      value: item.id,
+    }))
+  })
+  // 设备
+  getDeviceListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceList.value = res.data.rows.filter((item: any) => item.productId).map((item: any) => ({
+      name: item.deviceName,
+      id: item.devcode,
+      value: item.devcode,
+      deviceType: item.deviceType,
+      productId: item.productId,
+    }))
+    console.log(deviceList.value, 'deviceList.value')
+    deviceAllList.value = JSON.parse(JSON.stringify(deviceList.value))
+  })
+}
+fetchDict()
+
+watch(() => dataForm.value.productId, (newVal) => {
+  if (dialogStatus.value === 'detail' || isFirst.value) { return }
+  if (newVal) {
+    dataForm.value.devcode = ''
+    dataForm.value.deviceType = ''
+    dataForm.value.deviceTypeName = ''
+    deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
+  }
+}, {
+  deep: true,
+})
+watch(() => dataForm.value.devcode, (newVal) => {
+  if (dialogStatus.value === 'detail' || isFirst.value) { return }
+  if (newVal) {
+    dataForm.value.deviceType = deviceList.value.filter((item: any) => item.value === newVal)[0].deviceType
+    dataForm.value.deviceTypeName = deviceTypeList.value[deviceTypeList.value.findIndex(citem => dataForm.value.deviceType === citem.value)].name
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`指令${textMap[dialogStatus]}`" append-to-body>
+    <el-form
+      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px"
+      :disabled="dialogStatus === 'detail'"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="产品名称" prop="productId">
+            <el-select v-model="dataForm.productId" placeholder="产品名称" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="设备编号" prop="devcode">
+            <!-- multiple -->
+            <el-select v-model="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in deviceList" :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="采集间隔(min)" prop="collectInterval">
+            <el-input
+              v-model.trim="dataForm.collectInterval" type="number" placeholder="采集间隔" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上传周期(min)" prop="uploadPeriod">
+            <el-input
+              v-model.trim="dataForm.uploadPeriod" type="number" placeholder="上传周期" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="重传次数(次)" prop="reloadInterval">
+            <el-input
+              v-model.trim="dataForm.reloadInterval" type="number" placeholder="重传次数" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="操作人" prop="operatorName">
+            <el-input v-model.trim="dataForm.operatorName" type="text" style="width: 100%;" disabled clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input
+              v-model.trim="dataForm.maker" type="textarea" :rows="2" paceholder="备注" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+      <div v-else class="dialog-footer">
+        <el-button type="primary" @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/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
new file mode 100644
index 0000000..bee99eb
--- /dev/null
+++ b/src/api/home/device/instruction.ts
@@ -0,0 +1,32 @@
+/**
+ * 设备管理--指令下发
+ */
+import request from '@/api/index'
+
+// 设备管理基础列表
+export function getInstructionListPage(data: any) {
+  return request({
+    url: `/system/busConfig/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeInstruction(ids: any) {
+  return request({
+    url: '/system/busConfig/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新增
+export function addInstruction(data: any) {
+  return request({
+    url: '/system/busConfig/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts
new file mode 100644
index 0000000..1823500
--- /dev/null
+++ b/src/api/home/ledger/pipeline.ts
@@ -0,0 +1,42 @@
+/**
+ * 台账管理--管线管理接口
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getPiePleListPage(data: any) {
+  return request({
+    url: `/system/busPipeline/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function removePieple(ids: any) {
+  return request({
+    url: '/system/busPipeline/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新建
+export function addPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function editPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/edit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index b7da9cc..4265aaf 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -4,6 +4,7 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmCount">
+import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
 const listQuery = ref({
@@ -12,8 +13,12 @@
   ledgerType: '',
   timeType: '1',
 })
+// listQuery.value.begTime =
+// listQuery.value.endTime =
 // 开始结束时间
 const datetimerange = ref()
+// 默认当天
+datetimerange.value = [`${dayjs().format('YYYY-MM-DD')} 00:00:00`, dayjs().format('YYYY-MM-DD HH:mm:ss')]
 watch(() => datetimerange.value, (newVal) => {
   listQuery.value.begTime = ''
   listQuery.value.endTime = ''
@@ -63,7 +68,7 @@
         </el-select>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
-          style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
+          style="width: 360px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
new file mode 100644
index 0000000..fb7109b
--- /dev/null
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -0,0 +1,289 @@
+<!--
+  Description: 产品管理-新建或编辑指令
+  Author: 李亚光
+  Date: 2024-07-15
+ -->
+<script lang="ts" setup name="EditInstruction">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getProductListPage } from '@/api/home/device/product'
+import { getDeviceListPage } from '@/api/home/device/device'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['refresh'])
+const user = useUserStore()
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  id: '',
+  productId: '', // 产品
+  devcode: '', // 设备编号
+  collectInterval: '', // 采集间隔
+  uploadPeriod: '', // 上传周期
+  reloadInterval: '', // 重传次数
+  operator: '', // 操作员id
+  operatorName: '', // 操作员名称
+  maker: '', // 备注
+  deviceType: '',
+  deviceTypeName: '',
+  framecontent: '',
+  framecontentDesc: '',
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+  detail: '详情',
+} // 表头显示标题
+const rules: FormRules = {
+  productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
+  devcode: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+  collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
+  reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
+  uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    id: '',
+    productId: '', // 产品
+    devcode: '', // 设备编号
+    collectInterval: '', // 采集间隔
+    uploadPeriod: '', // 上传周期
+    reloadInterval: '', // 重传次数
+    operator: '', // 操作员id
+    operatorName: '', // 操作员名称
+    maker: '', // 备注
+    deviceType: '',
+    deviceTypeName: '',
+    framecontent: '',
+    framecontentDesc: '',
+  }
+}
+
+// 初始化对话框
+const isFirst = ref(true)
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    dataFormRef.value?.resetFields()
+    dataForm.value.operator = user.id
+    dataForm.value.operatorName = user.name
+  }
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      ...JSON.parse(JSON.stringify(row)),
+    }
+  }
+  setTimeout(() => {
+    isFirst.value = false
+  })
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+      dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+      addInstruction(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
+          // 通知父组件刷新状态
+          dialogFormVisible.value = false
+          setTimeout(() => {
+            emits('refresh')
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      removeInstruction([dataForm.value.id]).then((res) => {
+        dataForm.value.id = ''
+        createData()
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const deviceList = ref<{ id: string; name: string; value: string }[]>([]) // 设备
+const deviceAllList = ref<{ id: string; name: string; value: string }[]>([]) // 设备
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
+// 获取字典
+const fetchDict = async () => {
+  // 设备类型
+  const res = await getDeviceTypeListPage({ offset: 1, limit: 99999 })
+  deviceTypeList.value = res.data.rows.map((item: any) => ({
+    name: item.typeName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 产品
+  getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
+    productList.value = res.data.rows.map((item: any) => ({
+      name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+      id: item.id,
+      value: item.id,
+    }))
+  })
+  // 设备
+  getDeviceListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceList.value = res.data.rows.filter((item: any) => item.productId).map((item: any) => ({
+      name: item.deviceName,
+      id: item.devcode,
+      value: item.devcode,
+      deviceType: item.deviceType,
+      productId: item.productId,
+    }))
+    console.log(deviceList.value, 'deviceList.value')
+    deviceAllList.value = JSON.parse(JSON.stringify(deviceList.value))
+  })
+}
+fetchDict()
+
+watch(() => dataForm.value.productId, (newVal) => {
+  if (dialogStatus.value === 'detail' || isFirst.value) { return }
+  if (newVal) {
+    dataForm.value.devcode = ''
+    dataForm.value.deviceType = ''
+    dataForm.value.deviceTypeName = ''
+    deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
+  }
+}, {
+  deep: true,
+})
+watch(() => dataForm.value.devcode, (newVal) => {
+  if (dialogStatus.value === 'detail' || isFirst.value) { return }
+  if (newVal) {
+    dataForm.value.deviceType = deviceList.value.filter((item: any) => item.value === newVal)[0].deviceType
+    dataForm.value.deviceTypeName = deviceTypeList.value[deviceTypeList.value.findIndex(citem => dataForm.value.deviceType === citem.value)].name
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`指令${textMap[dialogStatus]}`" append-to-body>
+    <el-form
+      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px"
+      :disabled="dialogStatus === 'detail'"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="产品名称" prop="productId">
+            <el-select v-model="dataForm.productId" placeholder="产品名称" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="设备编号" prop="devcode">
+            <!-- multiple -->
+            <el-select v-model="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in deviceList" :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="采集间隔(min)" prop="collectInterval">
+            <el-input
+              v-model.trim="dataForm.collectInterval" type="number" placeholder="采集间隔" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上传周期(min)" prop="uploadPeriod">
+            <el-input
+              v-model.trim="dataForm.uploadPeriod" type="number" placeholder="上传周期" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="重传次数(次)" prop="reloadInterval">
+            <el-input
+              v-model.trim="dataForm.reloadInterval" type="number" placeholder="重传次数" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="操作人" prop="operatorName">
+            <el-input v-model.trim="dataForm.operatorName" type="text" style="width: 100%;" disabled clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input
+              v-model.trim="dataForm.maker" type="textarea" :rows="2" paceholder="备注" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+      <div v-else class="dialog-footer">
+        <el-button type="primary" @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/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index d3ff9a2..266fb93 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -1,3 +1,243 @@
+<!--
+  Description: 设备管理-指令下发
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="instructionIssued">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import editDialog from './components/editDialog.vue'
+import { getInstructionListPage, removeInstruction } from '@/api/home/device/instruction'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getProductListPage } from '@/api/home/device/product'
+import { getDictByCode } from '@/api/system/dict'
+// 字典
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const statusList = ref<{ id: string; name: string; value: string }[]>([]) // 下发状态
+// 表格数据
+const list = ref([
+])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center', width: '180' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '220' },
+  { text: '指令内容', value: 'framecontentDesc', align: 'center' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作人员', value: 'operatorName', align: 'center', width: '120' },
+  { text: '备注', value: 'maker', align: 'center' },
+  { text: '操作时间', value: 'writetime', align: 'center', width: '180' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  devcode: '', // 设备编号
+  deviceType: '', // 设备类型
+  productId: '', // 产品
+  status: '', // 下发状态
+  operatorName: '', // 操作人员
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  getInstructionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      statusName: statusList.value[statusList.value.findIndex(citem => item.status === citem.value)].name,
+      deviceTypeName: deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name,
+    }))
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    devcode: '', // 设备编号
+    deviceType: '', // 设备类型
+    productId: '', // 产品
+    status: '', // 下发状态
+    operatorName: '', // 操作人员
+  }
+  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()
+}
+// 新建编辑操作
+const editRef = ref()
+const editRow = (type: string, row: any) => {
+  editRef.value.initDialog(type, row)
+}
+// 删除
+const removeRow = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除该指令吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    removeInstruction([row.id]).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData()
+      }
+    })
+  })
+}
+
+// 获取字典
+const fetchDict = async () => {
+  // 设备类型
+  const res = await getDeviceTypeListPage({ offset: 1, limit: 99999 })
+  deviceTypeList.value = res.data.rows.map((item: any) => ({
+    name: item.typeName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 产品
+  const res1 = await getProductListPage({ offset: 1, limit: 99999 })
+  productList.value = res1.data.rows.map((item: any) => ({
+    name: item.productName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 下发状态
+  const res2 = await getDictByCode('issuedStatus')
+  statusList.value = res2.data
+}
+onMounted(async () => {
+  await fetchDict()
+  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: 175px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
+          style="width: 175px;"
+        >
+          <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
+          style="width: 175px;"
+        >
+          <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.operatorName" 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="device-instruction" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            批量下发
+          </el-button>
+          <el-button type="primary" @click="editRow('add', {})">
+            新建
+          </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>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+                查看
+              </el-button>
+              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+                重新下发
+              </el-button>
+              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
new file mode 100644
index 0000000..bee99eb
--- /dev/null
+++ b/src/api/home/device/instruction.ts
@@ -0,0 +1,32 @@
+/**
+ * 设备管理--指令下发
+ */
+import request from '@/api/index'
+
+// 设备管理基础列表
+export function getInstructionListPage(data: any) {
+  return request({
+    url: `/system/busConfig/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeInstruction(ids: any) {
+  return request({
+    url: '/system/busConfig/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新增
+export function addInstruction(data: any) {
+  return request({
+    url: '/system/busConfig/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts
new file mode 100644
index 0000000..1823500
--- /dev/null
+++ b/src/api/home/ledger/pipeline.ts
@@ -0,0 +1,42 @@
+/**
+ * 台账管理--管线管理接口
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getPiePleListPage(data: any) {
+  return request({
+    url: `/system/busPipeline/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function removePieple(ids: any) {
+  return request({
+    url: '/system/busPipeline/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新建
+export function addPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function editPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/edit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index b7da9cc..4265aaf 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -4,6 +4,7 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmCount">
+import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
 const listQuery = ref({
@@ -12,8 +13,12 @@
   ledgerType: '',
   timeType: '1',
 })
+// listQuery.value.begTime =
+// listQuery.value.endTime =
 // 开始结束时间
 const datetimerange = ref()
+// 默认当天
+datetimerange.value = [`${dayjs().format('YYYY-MM-DD')} 00:00:00`, dayjs().format('YYYY-MM-DD HH:mm:ss')]
 watch(() => datetimerange.value, (newVal) => {
   listQuery.value.begTime = ''
   listQuery.value.endTime = ''
@@ -63,7 +68,7 @@
         </el-select>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
-          style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
+          style="width: 360px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
new file mode 100644
index 0000000..fb7109b
--- /dev/null
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -0,0 +1,289 @@
+<!--
+  Description: 产品管理-新建或编辑指令
+  Author: 李亚光
+  Date: 2024-07-15
+ -->
+<script lang="ts" setup name="EditInstruction">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getProductListPage } from '@/api/home/device/product'
+import { getDeviceListPage } from '@/api/home/device/device'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['refresh'])
+const user = useUserStore()
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  id: '',
+  productId: '', // 产品
+  devcode: '', // 设备编号
+  collectInterval: '', // 采集间隔
+  uploadPeriod: '', // 上传周期
+  reloadInterval: '', // 重传次数
+  operator: '', // 操作员id
+  operatorName: '', // 操作员名称
+  maker: '', // 备注
+  deviceType: '',
+  deviceTypeName: '',
+  framecontent: '',
+  framecontentDesc: '',
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+  detail: '详情',
+} // 表头显示标题
+const rules: FormRules = {
+  productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
+  devcode: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+  collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
+  reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
+  uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    id: '',
+    productId: '', // 产品
+    devcode: '', // 设备编号
+    collectInterval: '', // 采集间隔
+    uploadPeriod: '', // 上传周期
+    reloadInterval: '', // 重传次数
+    operator: '', // 操作员id
+    operatorName: '', // 操作员名称
+    maker: '', // 备注
+    deviceType: '',
+    deviceTypeName: '',
+    framecontent: '',
+    framecontentDesc: '',
+  }
+}
+
+// 初始化对话框
+const isFirst = ref(true)
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    dataFormRef.value?.resetFields()
+    dataForm.value.operator = user.id
+    dataForm.value.operatorName = user.name
+  }
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      ...JSON.parse(JSON.stringify(row)),
+    }
+  }
+  setTimeout(() => {
+    isFirst.value = false
+  })
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+      dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+      addInstruction(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
+          // 通知父组件刷新状态
+          dialogFormVisible.value = false
+          setTimeout(() => {
+            emits('refresh')
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      removeInstruction([dataForm.value.id]).then((res) => {
+        dataForm.value.id = ''
+        createData()
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const deviceList = ref<{ id: string; name: string; value: string }[]>([]) // 设备
+const deviceAllList = ref<{ id: string; name: string; value: string }[]>([]) // 设备
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
+// 获取字典
+const fetchDict = async () => {
+  // 设备类型
+  const res = await getDeviceTypeListPage({ offset: 1, limit: 99999 })
+  deviceTypeList.value = res.data.rows.map((item: any) => ({
+    name: item.typeName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 产品
+  getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
+    productList.value = res.data.rows.map((item: any) => ({
+      name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+      id: item.id,
+      value: item.id,
+    }))
+  })
+  // 设备
+  getDeviceListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceList.value = res.data.rows.filter((item: any) => item.productId).map((item: any) => ({
+      name: item.deviceName,
+      id: item.devcode,
+      value: item.devcode,
+      deviceType: item.deviceType,
+      productId: item.productId,
+    }))
+    console.log(deviceList.value, 'deviceList.value')
+    deviceAllList.value = JSON.parse(JSON.stringify(deviceList.value))
+  })
+}
+fetchDict()
+
+watch(() => dataForm.value.productId, (newVal) => {
+  if (dialogStatus.value === 'detail' || isFirst.value) { return }
+  if (newVal) {
+    dataForm.value.devcode = ''
+    dataForm.value.deviceType = ''
+    dataForm.value.deviceTypeName = ''
+    deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
+  }
+}, {
+  deep: true,
+})
+watch(() => dataForm.value.devcode, (newVal) => {
+  if (dialogStatus.value === 'detail' || isFirst.value) { return }
+  if (newVal) {
+    dataForm.value.deviceType = deviceList.value.filter((item: any) => item.value === newVal)[0].deviceType
+    dataForm.value.deviceTypeName = deviceTypeList.value[deviceTypeList.value.findIndex(citem => dataForm.value.deviceType === citem.value)].name
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`指令${textMap[dialogStatus]}`" append-to-body>
+    <el-form
+      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px"
+      :disabled="dialogStatus === 'detail'"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="产品名称" prop="productId">
+            <el-select v-model="dataForm.productId" placeholder="产品名称" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="设备编号" prop="devcode">
+            <!-- multiple -->
+            <el-select v-model="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in deviceList" :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="采集间隔(min)" prop="collectInterval">
+            <el-input
+              v-model.trim="dataForm.collectInterval" type="number" placeholder="采集间隔" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上传周期(min)" prop="uploadPeriod">
+            <el-input
+              v-model.trim="dataForm.uploadPeriod" type="number" placeholder="上传周期" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="重传次数(次)" prop="reloadInterval">
+            <el-input
+              v-model.trim="dataForm.reloadInterval" type="number" placeholder="重传次数" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="操作人" prop="operatorName">
+            <el-input v-model.trim="dataForm.operatorName" type="text" style="width: 100%;" disabled clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input
+              v-model.trim="dataForm.maker" type="textarea" :rows="2" paceholder="备注" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+      <div v-else class="dialog-footer">
+        <el-button type="primary" @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/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index d3ff9a2..266fb93 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -1,3 +1,243 @@
+<!--
+  Description: 设备管理-指令下发
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="instructionIssued">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import editDialog from './components/editDialog.vue'
+import { getInstructionListPage, removeInstruction } from '@/api/home/device/instruction'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getProductListPage } from '@/api/home/device/product'
+import { getDictByCode } from '@/api/system/dict'
+// 字典
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const statusList = ref<{ id: string; name: string; value: string }[]>([]) // 下发状态
+// 表格数据
+const list = ref([
+])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center', width: '180' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '220' },
+  { text: '指令内容', value: 'framecontentDesc', align: 'center' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作人员', value: 'operatorName', align: 'center', width: '120' },
+  { text: '备注', value: 'maker', align: 'center' },
+  { text: '操作时间', value: 'writetime', align: 'center', width: '180' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  devcode: '', // 设备编号
+  deviceType: '', // 设备类型
+  productId: '', // 产品
+  status: '', // 下发状态
+  operatorName: '', // 操作人员
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  getInstructionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      statusName: statusList.value[statusList.value.findIndex(citem => item.status === citem.value)].name,
+      deviceTypeName: deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name,
+    }))
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    devcode: '', // 设备编号
+    deviceType: '', // 设备类型
+    productId: '', // 产品
+    status: '', // 下发状态
+    operatorName: '', // 操作人员
+  }
+  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()
+}
+// 新建编辑操作
+const editRef = ref()
+const editRow = (type: string, row: any) => {
+  editRef.value.initDialog(type, row)
+}
+// 删除
+const removeRow = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除该指令吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    removeInstruction([row.id]).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData()
+      }
+    })
+  })
+}
+
+// 获取字典
+const fetchDict = async () => {
+  // 设备类型
+  const res = await getDeviceTypeListPage({ offset: 1, limit: 99999 })
+  deviceTypeList.value = res.data.rows.map((item: any) => ({
+    name: item.typeName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 产品
+  const res1 = await getProductListPage({ offset: 1, limit: 99999 })
+  productList.value = res1.data.rows.map((item: any) => ({
+    name: item.productName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 下发状态
+  const res2 = await getDictByCode('issuedStatus')
+  statusList.value = res2.data
+}
+onMounted(async () => {
+  await fetchDict()
+  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: 175px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
+          style="width: 175px;"
+        >
+          <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
+          style="width: 175px;"
+        >
+          <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.operatorName" 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="device-instruction" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            批量下发
+          </el-button>
+          <el-button type="primary" @click="editRow('add', {})">
+            新建
+          </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>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+                查看
+              </el-button>
+              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+                重新下发
+              </el-button>
+              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
new file mode 100644
index 0000000..49a6cf5
--- /dev/null
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -0,0 +1,228 @@
+<!--
+  Description: 管线管理新建编辑
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="EditPiePle">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+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 dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  pipeCode: '', // 管线编号
+  position: '', // 管线位置
+  pressType: '', // 压力级制
+  material: '', // 材质
+  pipeDiameter: '', // 管径（mm）
+  constructEra: '', // 建设年代
+  deptid: '', // 单位
+  manageType: '', // 管理方式
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+} // 表头显示标题
+const rules: FormRules = {
+  pipeCode: [{ required: true, message: '管线编号不能为空', trigger: ['blur', 'change'] }],
+  position: [{ required: true, message: '管线位置不能为空', trigger: ['blur', 'change'] }],
+  pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
+  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    pipeCode: '', // 管线编号
+    position: '', // 管线位置
+    pressType: '', // 压力级制
+    material: '', // 材质
+    pipeDiameter: '', // 管径（mm）
+    constructEra: '', // 建设年代
+    deptid: '', // 单位
+    manageType: '', // 管理方式
+  }
+}
+
+// 初始化对话框
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    // nextTick(() => {
+    //   dataFormRef.value.clearValidate()
+    // })
+    dataFormRef.value?.resetFields()
+  }
+  else if (dialogStatus.value === 'edit') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      ...JSON.parse(JSON.stringify(row)),
+    }
+  }
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      addPieple(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
+          // 通知父组件刷新状态
+          dialogFormVisible.value = false
+          setTimeout(() => {
+            emits('refresh')
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      editPieple(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          setTimeout(() => {
+            emits('refresh')
+          })
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+
+// 获取字典
+const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
+const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const fetchDict = () => {
+  // 压力级制
+  getDictByCode('pressType').then((res) => {
+    pressTypeList.value = res.data
+  })
+  // 管理方式
+  getDictByCode('manageType').then((res) => {
+    manageTypeList.value = res.data
+  })
+}
+fetchDict()
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="管线编号" prop="pipeCode">
+            <el-input v-model.trim="dataForm.pipeCode" type="text" placeholder="管线编号" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="管线位置" prop="position">
+            <el-input v-model.trim="dataForm.position" type="text" placeholder="管线位置" style="width: 100%;" clearable />
+          </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" />
+            </el-select>
+          </el-form-item>
+        </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-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-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-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="管理单位" prop="deptid">
+            <dept-select v-model="dataForm.deptid" placeholder="管理单位" :clearable="true" style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产权单位" prop="deptid">
+            <el-input v-model.trim="dataForm.deptid" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="管理方式" prop="manageType">
+            <el-select v-model="dataForm.manageType" placeholder="管理方式" clearable style="width: 100%;">
+              <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </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/api/home/device/instruction.ts b/src/api/home/device/instruction.ts
new file mode 100644
index 0000000..bee99eb
--- /dev/null
+++ b/src/api/home/device/instruction.ts
@@ -0,0 +1,32 @@
+/**
+ * 设备管理--指令下发
+ */
+import request from '@/api/index'
+
+// 设备管理基础列表
+export function getInstructionListPage(data: any) {
+  return request({
+    url: `/system/busConfig/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeInstruction(ids: any) {
+  return request({
+    url: '/system/busConfig/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新增
+export function addInstruction(data: any) {
+  return request({
+    url: '/system/busConfig/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts
new file mode 100644
index 0000000..1823500
--- /dev/null
+++ b/src/api/home/ledger/pipeline.ts
@@ -0,0 +1,42 @@
+/**
+ * 台账管理--管线管理接口
+ */
+import request from '@/api/index'
+
+// 基础列表
+export function getPiePleListPage(data: any) {
+  return request({
+    url: `/system/busPipeline/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function removePieple(ids: any) {
+  return request({
+    url: '/system/busPipeline/batchDelete',
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
+// 新建
+export function addPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function editPieple(data: any) {
+  return request({
+    url: '/system/busPipeline/edit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index b7da9cc..4265aaf 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -4,6 +4,7 @@
   Date: 2023-07-08
  -->
 <script lang="ts" setup name="AlarmCount">
+import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
 const listQuery = ref({
@@ -12,8 +13,12 @@
   ledgerType: '',
   timeType: '1',
 })
+// listQuery.value.begTime =
+// listQuery.value.endTime =
 // 开始结束时间
 const datetimerange = ref()
+// 默认当天
+datetimerange.value = [`${dayjs().format('YYYY-MM-DD')} 00:00:00`, dayjs().format('YYYY-MM-DD HH:mm:ss')]
 watch(() => datetimerange.value, (newVal) => {
   listQuery.value.begTime = ''
   listQuery.value.endTime = ''
@@ -63,7 +68,7 @@
         </el-select>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
-          style="width: 340px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
+          style="width: 360px;margin: 0 5px;" value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
           start-placeholder="报警开始时间" end-placeholder="报警结束时间" clearable
         />
         <el-button type="primary" style="margin: 0 5px;" @click="fetchData">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
new file mode 100644
index 0000000..fb7109b
--- /dev/null
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -0,0 +1,289 @@
+<!--
+  Description: 产品管理-新建或编辑指令
+  Author: 李亚光
+  Date: 2024-07-15
+ -->
+<script lang="ts" setup name="EditInstruction">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getDictByCode } from '@/api/system/dict'
+import { addInstruction, removeInstruction } from '@/api/home/device/instruction'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getProductListPage } from '@/api/home/device/product'
+import { getDeviceListPage } from '@/api/home/device/device'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['refresh'])
+const user = useUserStore()
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  id: '',
+  productId: '', // 产品
+  devcode: '', // 设备编号
+  collectInterval: '', // 采集间隔
+  uploadPeriod: '', // 上传周期
+  reloadInterval: '', // 重传次数
+  operator: '', // 操作员id
+  operatorName: '', // 操作员名称
+  maker: '', // 备注
+  deviceType: '',
+  deviceTypeName: '',
+  framecontent: '',
+  framecontentDesc: '',
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+  detail: '详情',
+} // 表头显示标题
+const rules: FormRules = {
+  productId: [{ required: true, message: '产品必选', trigger: ['blur', 'change'] }],
+  devcode: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+  collectInterval: [{ required: true, message: '采集间隔不能为空', trigger: ['blur', 'change'] }],
+  reloadInterval: [{ required: true, message: '重传次数不能为空', trigger: ['blur', 'change'] }],
+  uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    id: '',
+    productId: '', // 产品
+    devcode: '', // 设备编号
+    collectInterval: '', // 采集间隔
+    uploadPeriod: '', // 上传周期
+    reloadInterval: '', // 重传次数
+    operator: '', // 操作员id
+    operatorName: '', // 操作员名称
+    maker: '', // 备注
+    deviceType: '',
+    deviceTypeName: '',
+    framecontent: '',
+    framecontentDesc: '',
+  }
+}
+
+// 初始化对话框
+const isFirst = ref(true)
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    dataFormRef.value?.resetFields()
+    dataForm.value.operator = user.id
+    dataForm.value.operatorName = user.name
+  }
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      ...JSON.parse(JSON.stringify(row)),
+    }
+  }
+  setTimeout(() => {
+    isFirst.value = false
+  })
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      dataForm.value.framecontent = `reloadInterval:${dataForm.value.reloadInterval};collectInterval:${dataForm.value.collectInterval};uploadPeriod:${dataForm.value.uploadPeriod}`
+      dataForm.value.framecontentDesc = `重传次数:${dataForm.value.reloadInterval}次;采集间隔:${dataForm.value.collectInterval}分;上传周期:${dataForm.value.uploadPeriod}分`
+      addInstruction(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
+          // 通知父组件刷新状态
+          dialogFormVisible.value = false
+          setTimeout(() => {
+            emits('refresh')
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      removeInstruction([dataForm.value.id]).then((res) => {
+        dataForm.value.id = ''
+        createData()
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const deviceList = ref<{ id: string; name: string; value: string }[]>([]) // 设备
+const deviceAllList = ref<{ id: string; name: string; value: string }[]>([]) // 设备
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+
+// 获取字典
+const fetchDict = async () => {
+  // 设备类型
+  const res = await getDeviceTypeListPage({ offset: 1, limit: 99999 })
+  deviceTypeList.value = res.data.rows.map((item: any) => ({
+    name: item.typeName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 产品
+  getProductListPage({ offset: 1, limit: 99999 }).then((res) => {
+    productList.value = res.data.rows.map((item: any) => ({
+      name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+      id: item.id,
+      value: item.id,
+    }))
+  })
+  // 设备
+  getDeviceListPage({ offset: 1, limit: 99999 }).then((res) => {
+    deviceList.value = res.data.rows.filter((item: any) => item.productId).map((item: any) => ({
+      name: item.deviceName,
+      id: item.devcode,
+      value: item.devcode,
+      deviceType: item.deviceType,
+      productId: item.productId,
+    }))
+    console.log(deviceList.value, 'deviceList.value')
+    deviceAllList.value = JSON.parse(JSON.stringify(deviceList.value))
+  })
+}
+fetchDict()
+
+watch(() => dataForm.value.productId, (newVal) => {
+  if (dialogStatus.value === 'detail' || isFirst.value) { return }
+  if (newVal) {
+    dataForm.value.devcode = ''
+    dataForm.value.deviceType = ''
+    dataForm.value.deviceTypeName = ''
+    deviceList.value = deviceAllList.value.filter((item: any) => item.productId === newVal)
+  }
+}, {
+  deep: true,
+})
+watch(() => dataForm.value.devcode, (newVal) => {
+  if (dialogStatus.value === 'detail' || isFirst.value) { return }
+  if (newVal) {
+    dataForm.value.deviceType = deviceList.value.filter((item: any) => item.value === newVal)[0].deviceType
+    dataForm.value.deviceTypeName = deviceTypeList.value[deviceTypeList.value.findIndex(citem => dataForm.value.deviceType === citem.value)].name
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`指令${textMap[dialogStatus]}`" append-to-body>
+    <el-form
+      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px"
+      :disabled="dialogStatus === 'detail'"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="产品名称" prop="productId">
+            <el-select v-model="dataForm.productId" placeholder="产品名称" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="设备编号" prop="devcode">
+            <!-- multiple -->
+            <el-select v-model="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in deviceList" :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="采集间隔(min)" prop="collectInterval">
+            <el-input
+              v-model.trim="dataForm.collectInterval" type="number" placeholder="采集间隔" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上传周期(min)" prop="uploadPeriod">
+            <el-input
+              v-model.trim="dataForm.uploadPeriod" type="number" placeholder="上传周期" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="重传次数(次)" prop="reloadInterval">
+            <el-input
+              v-model.trim="dataForm.reloadInterval" type="number" placeholder="重传次数" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="操作人" prop="operatorName">
+            <el-input v-model.trim="dataForm.operatorName" type="text" style="width: 100%;" disabled clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input
+              v-model.trim="dataForm.maker" type="textarea" :rows="2" paceholder="备注" style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+      <div v-else class="dialog-footer">
+        <el-button type="primary" @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/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index d3ff9a2..266fb93 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -1,3 +1,243 @@
+<!--
+  Description: 设备管理-指令下发
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="instructionIssued">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import editDialog from './components/editDialog.vue'
+import { getInstructionListPage, removeInstruction } from '@/api/home/device/instruction'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getProductListPage } from '@/api/home/device/product'
+import { getDictByCode } from '@/api/system/dict'
+// 字典
+const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
+const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const statusList = ref<{ id: string; name: string; value: string }[]>([]) // 下发状态
+// 表格数据
+const list = ref([
+])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center', width: '180' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '220' },
+  { text: '指令内容', value: 'framecontentDesc', align: 'center' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作人员', value: 'operatorName', align: 'center', width: '120' },
+  { text: '备注', value: 'maker', align: 'center' },
+  { text: '操作时间', value: 'writetime', align: 'center', width: '180' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  devcode: '', // 设备编号
+  deviceType: '', // 设备类型
+  productId: '', // 产品
+  status: '', // 下发状态
+  operatorName: '', // 操作人员
+})
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  // listQuery.createTimeStart = ''
+  // listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      // listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      // listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  getInstructionListPage(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: any) => ({
+      ...item,
+      statusName: statusList.value[statusList.value.findIndex(citem => item.status === citem.value)].name,
+      deviceTypeName: deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name,
+    }))
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+  listQuery.value = {
+    limit: 20,
+    offset: 1,
+    devcode: '', // 设备编号
+    deviceType: '', // 设备类型
+    productId: '', // 产品
+    status: '', // 下发状态
+    operatorName: '', // 操作人员
+  }
+  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()
+}
+// 新建编辑操作
+const editRef = ref()
+const editRow = (type: string, row: any) => {
+  editRef.value.initDialog(type, row)
+}
+// 删除
+const removeRow = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除该指令吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    removeInstruction([row.id]).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData()
+      }
+    })
+  })
+}
+
+// 获取字典
+const fetchDict = async () => {
+  // 设备类型
+  const res = await getDeviceTypeListPage({ offset: 1, limit: 99999 })
+  deviceTypeList.value = res.data.rows.map((item: any) => ({
+    name: item.typeName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 产品
+  const res1 = await getProductListPage({ offset: 1, limit: 99999 })
+  productList.value = res1.data.rows.map((item: any) => ({
+    name: item.productName || '',
+    id: item.id,
+    value: item.id,
+  }))
+  // 下发状态
+  const res2 = await getDictByCode('issuedStatus')
+  statusList.value = res2.data
+}
+onMounted(async () => {
+  await fetchDict()
+  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: 175px;"
+        >
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.productId" placeholder="产品" clearable filterable class="select"
+          style="width: 175px;"
+        >
+          <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.status" placeholder="下发状态" clearable filterable class="select"
+          style="width: 175px;"
+        >
+          <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.operatorName" 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="device-instruction" :columns="columns"
+      :config-columns="columnsConfig" :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary">
+            批量下发
+          </el-button>
+          <el-button type="primary" @click="editRow('add', {})">
+            新建
+          </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>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('detail', scope.row)">
+                查看
+              </el-button>
+              <el-button v-if="scope.row.status === '2'" type="primary" link size="small" @click="editRow('edit', scope.row)">
+                重新下发
+              </el-button>
+              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
new file mode 100644
index 0000000..49a6cf5
--- /dev/null
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -0,0 +1,228 @@
+<!--
+  Description: 管线管理新建编辑
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="EditPiePle">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+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 dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  pipeCode: '', // 管线编号
+  position: '', // 管线位置
+  pressType: '', // 压力级制
+  material: '', // 材质
+  pipeDiameter: '', // 管径（mm）
+  constructEra: '', // 建设年代
+  deptid: '', // 单位
+  manageType: '', // 管理方式
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+} // 表头显示标题
+const rules: FormRules = {
+  pipeCode: [{ required: true, message: '管线编号不能为空', trigger: ['blur', 'change'] }],
+  position: [{ required: true, message: '管线位置不能为空', trigger: ['blur', 'change'] }],
+  pressType: [{ required: true, message: '压力级制不能为空', trigger: ['blur', 'change'] }],
+  deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
+  manageType: [{ required: true, message: '管理方式不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    pipeCode: '', // 管线编号
+    position: '', // 管线位置
+    pressType: '', // 压力级制
+    material: '', // 材质
+    pipeDiameter: '', // 管径（mm）
+    constructEra: '', // 建设年代
+    deptid: '', // 单位
+    manageType: '', // 管理方式
+  }
+}
+
+// 初始化对话框
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    // nextTick(() => {
+    //   dataFormRef.value.clearValidate()
+    // })
+    dataFormRef.value?.resetFields()
+  }
+  else if (dialogStatus.value === 'edit') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      ...JSON.parse(JSON.stringify(row)),
+    }
+  }
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      addPieple(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '添加成功',
+            type: 'success',
+          })
+          // 通知父组件刷新状态
+          dialogFormVisible.value = false
+          setTimeout(() => {
+            emits('refresh')
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      editPieple(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          setTimeout(() => {
+            emits('refresh')
+          })
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+
+// 获取字典
+const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
+const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const fetchDict = () => {
+  // 压力级制
+  getDictByCode('pressType').then((res) => {
+    pressTypeList.value = res.data
+  })
+  // 管理方式
+  getDictByCode('manageType').then((res) => {
+    manageTypeList.value = res.data
+  })
+}
+fetchDict()
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="管线编号" prop="pipeCode">
+            <el-input v-model.trim="dataForm.pipeCode" type="text" placeholder="管线编号" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="管线位置" prop="position">
+            <el-input v-model.trim="dataForm.position" type="text" placeholder="管线位置" style="width: 100%;" clearable />
+          </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" />
+            </el-select>
+          </el-form-item>
+        </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-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-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-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="管理单位" prop="deptid">
+            <dept-select v-model="dataForm.deptid" placeholder="管理单位" :clearable="true" style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产权单位" prop="deptid">
+            <el-input v-model.trim="dataForm.deptid" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="管理方式" prop="manageType">
+            <el-select v-model="dataForm.manageType" placeholder="管理方式" clearable style="width: 100%;">
+              <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </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 d7dbc40..94706ba 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -1,3 +1,245 @@
+<!--
+  Description: 台账管理-管线管理
+  Author: 李亚光
+  Date: 2024-09-02
+ -->
+<script lang="ts" setup name="SyncRecordList">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import editDialog from './components/editDialog.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { getPiePleListPage, removePieple } from '@/api/home/ledger/pipeline'
+
+// 表格数据
+const list = ref([])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '管线编号', value: 'pipeCode', align: 'center', isRequired: true },
+  { text: '管线位置', value: 'position', align: 'center', isRequired: true },
+  { text: '压力级制', value: 'pressTypeName', align: 'center', isRequired: true },
+  { text: '材质', value: 'material', align: 'center' },
+  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  { text: '建设年代', value: 'constructEra', align: 'center' },
+  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '产权单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理方式', value: 'manageTypeName', align: 'center', isRequired: true },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+  pipeCode: '', // 管线编号
+  position: '', // 管线位置
+  pressType: '', // 压力级制
+  material: '', // 材质
+  deptid: '', // 单位
+  manageType: '', // 管理方式
+  constructEra1: '', // 最小建设年代
+  constructEra2: '', // 最大建设年代
+  pipeDiameter1: '', // 最小管径
+  pipeDiameter2: '', // 最大管径
+})
+// 查询数据
+const fetchData = () => {
+  loadingTable.value = true
+  getPiePleListPage(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,
+    pipeCode: '', // 管线编号
+    position: '', // 管线位置
+    pressType: '', // 压力级制
+    material: '', // 材质
+    deptid: '', // 单位
+    manageType: '', // 管理方式
+    constructEra1: '', // 最小建设年代
+    constructEra2: '', // 最大建设年代
+    pipeDiameter1: '', // 最小管径
+    pipeDiameter2: '', // 最大管径
+  }
+  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()
+}
+// 删除
+const removeRow = (row: any) => {
+  ElMessageBox.confirm(
+    `确定要删除${row.name}吗？`,
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    removePieple([row.id]).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData()
+      }
+    })
+  })
+}
+// 编辑或者新建
+const editRef = ref()
+const editRow = (type: string, row: any) => {
+  editRef.value.initDialog(type, row)
+}
+// 获取字典
+const pressTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 压力级制
+const manageTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 管理方式
+const fetchDict = () => {
+  // 压力级制
+  getDictByCode('pressType').then((res) => {
+    pressTypeList.value = res.data
+  })
+  // 管理方式
+  getDictByCode('manageType').then((res) => {
+    manageTypeList.value = res.data
+  })
+}
+fetchDict()
+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.pipeCode" placeholder="管线编号" clearable />
+      </search-item>
+      <search-item>
+        <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-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 />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 175px;" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" placeholder="产权单位" :clearable="true" style="width: 175px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.manageType" placeholder="管理方式" clearable class="select" style="width: 175px;">
+          <el-option v-for="item in manageTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model="listQuery.pipeDiameter1" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+        ~
+        <el-input
+          v-model="listQuery.pipeDiameter2" placeholder="管径范围(mm)" clearable type="number"
+          style="width: 135px;"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.constructEra1" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+        ~
+        <el-input v-model="listQuery.constructEra2" placeholder="建设年代" clearable type="number" style="width: 135px;" />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="pieple-manage" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary" @click="editRow('add', {})">
+            新增
+          </el-button>
+          <el-button type="primary">
+            批量导入
+          </el-button>
+          <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>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small" @click="removeRow(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.circle {
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  margin: 0 auto;
+}
+
+.online {
+  background-color: #95f204;
+}
+
+.offline {
+  background-color: #7f7f7f;
+}
+</style>