diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index 3609deb..0637168 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -18,6 +18,14 @@
   })
 }
 
+// 查询设备当前配置
+export function detailDeviceConfig(deviceId: string) {
+  return request({
+    url: `${prefix}/deviceConfig/${deviceId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDevice(data: object) {
   return request({

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index 3609deb..0637168 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -18,6 +18,14 @@
   })
 }
 
+// 查询设备当前配置
+export function detailDeviceConfig(deviceId: string) {
+  return request({
+    url: `${prefix}/deviceConfig/${deviceId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDevice(data: object) {
   return request({
diff --git a/src/api/data/query.ts b/src/api/data/query.ts
index 8923b4d..203d05e 100644
--- a/src/api/data/query.ts
+++ b/src/api/data/query.ts
@@ -27,6 +27,13 @@
   })
 }
 
+export function getDataFrameLog(frameLogId: string) {
+  return request({
+    url: `${prefix}/frameLog/${frameLogId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDeviceData(data: object) {
   return request({

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index 3609deb..0637168 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -18,6 +18,14 @@
   })
 }
 
+// 查询设备当前配置
+export function detailDeviceConfig(deviceId: string) {
+  return request({
+    url: `${prefix}/deviceConfig/${deviceId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDevice(data: object) {
   return request({
diff --git a/src/api/data/query.ts b/src/api/data/query.ts
index 8923b4d..203d05e 100644
--- a/src/api/data/query.ts
+++ b/src/api/data/query.ts
@@ -27,6 +27,13 @@
   })
 }
 
+export function getDataFrameLog(frameLogId: string) {
+  return request({
+    url: `${prefix}/frameLog/${frameLogId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDeviceData(data: object) {
   return request({
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 93d9fba..7622182 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,10 +1,22 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDeviceInfo } from './device-info'
+import type { IConfigItem, IDeviceConfig, IDeviceInfo } from './device-info'
 import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
-import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+import { addDevice, detailDevice, detailDeviceConfig, updateDevice } from '@/api/basic/device'
+
+const configItemName = ref([
+  { name: 'interval', text: '采集周期', unit: '分钟' },
+  { name: 'repeat', text: '重传次数', unit: '' },
+  { name: 'period', text: '上传周期', unit: '分钟' },
+  { name: 'times', text: '采集次数', unit: '' },
+  { name: 'acqStart', text: '采集开始时间', unit: '分钟' },
+  { name: 'upperLimit', text: '报警上限', unit: '' },
+  { name: 'lowerLimit', text: '报警上限', unit: '' },
+  { name: 'destIp', text: '地址', unit: '' },
+  { name: 'destPort', text: '端口', unit: '' },
+])
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -48,6 +60,16 @@
   dataValue: '',
 })
 
+const deviceConfig = ref<IDeviceConfig>({
+  deviceId: '',
+  devCode: '',
+  frameLogId: '',
+  configJson: '',
+  logtime: '',
+})
+
+const configItemList = ref<Array<IConfigItem>>([])
+
 // 逻辑
 const resetForm = () => {
   router.go(-1)
@@ -132,6 +154,21 @@
       deviceInfo.value = res.data
     }
   })
+
+  detailDeviceConfig(id).then((res) => {
+    if (res.code === 200) {
+      deviceConfig.value = res.data
+
+      if (res.data !== '' && res.data.configItemList.length > 0) {
+        configItemList.value = res.data.configItemList.map((item: any) => {
+          return {
+            ...item,
+            text: configItemName.value.filter(nameDict => nameDict.name === item.cmd)[0].text,
+          }
+        })
+      }
+    }
+  })
 }
 
 const initDialog = (params: any) => {
@@ -216,6 +253,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row :gutter="24" style="margin-top: 20px;">
+          <el-col :span="18">
+            <el-form-item label="当前配置：">
+              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
+                {{ item.text }} : {{ item.value }}
+              </el-tag>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="收到时间：">
+              {{ deviceConfig.logtime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index 3609deb..0637168 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -18,6 +18,14 @@
   })
 }
 
+// 查询设备当前配置
+export function detailDeviceConfig(deviceId: string) {
+  return request({
+    url: `${prefix}/deviceConfig/${deviceId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDevice(data: object) {
   return request({
diff --git a/src/api/data/query.ts b/src/api/data/query.ts
index 8923b4d..203d05e 100644
--- a/src/api/data/query.ts
+++ b/src/api/data/query.ts
@@ -27,6 +27,13 @@
   })
 }
 
+export function getDataFrameLog(frameLogId: string) {
+  return request({
+    url: `${prefix}/frameLog/${frameLogId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDeviceData(data: object) {
   return request({
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 93d9fba..7622182 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,10 +1,22 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDeviceInfo } from './device-info'
+import type { IConfigItem, IDeviceConfig, IDeviceInfo } from './device-info'
 import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
-import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+import { addDevice, detailDevice, detailDeviceConfig, updateDevice } from '@/api/basic/device'
+
+const configItemName = ref([
+  { name: 'interval', text: '采集周期', unit: '分钟' },
+  { name: 'repeat', text: '重传次数', unit: '' },
+  { name: 'period', text: '上传周期', unit: '分钟' },
+  { name: 'times', text: '采集次数', unit: '' },
+  { name: 'acqStart', text: '采集开始时间', unit: '分钟' },
+  { name: 'upperLimit', text: '报警上限', unit: '' },
+  { name: 'lowerLimit', text: '报警上限', unit: '' },
+  { name: 'destIp', text: '地址', unit: '' },
+  { name: 'destPort', text: '端口', unit: '' },
+])
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -48,6 +60,16 @@
   dataValue: '',
 })
 
+const deviceConfig = ref<IDeviceConfig>({
+  deviceId: '',
+  devCode: '',
+  frameLogId: '',
+  configJson: '',
+  logtime: '',
+})
+
+const configItemList = ref<Array<IConfigItem>>([])
+
 // 逻辑
 const resetForm = () => {
   router.go(-1)
@@ -132,6 +154,21 @@
       deviceInfo.value = res.data
     }
   })
+
+  detailDeviceConfig(id).then((res) => {
+    if (res.code === 200) {
+      deviceConfig.value = res.data
+
+      if (res.data !== '' && res.data.configItemList.length > 0) {
+        configItemList.value = res.data.configItemList.map((item: any) => {
+          return {
+            ...item,
+            text: configItemName.value.filter(nameDict => nameDict.name === item.cmd)[0].text,
+          }
+        })
+      }
+    }
+  })
 }
 
 const initDialog = (params: any) => {
@@ -216,6 +253,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row :gutter="24" style="margin-top: 20px;">
+          <el-col :span="18">
+            <el-form-item label="当前配置：">
+              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
+                {{ item.text }} : {{ item.value }}
+              </el-tag>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="收到时间：">
+              {{ deviceConfig.logtime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 4de8091..9b505c6 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -39,6 +39,14 @@
   logtime?: string
 }
 
+export interface IDeviceConfig {
+  deviceId: string
+  devCode: string
+  frameLogId: string
+  configJson: string
+  logtime: string
+}
+
 export interface IConfigListQuery {
   devcode: string // 设备编号
   configType: string // 配置类型
@@ -50,3 +58,10 @@
   sort?: string
   order?: string
 }
+
+export interface IConfigItem {
+  idx: string
+  cmd: string
+  text: string
+  value: string
+}

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index 3609deb..0637168 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -18,6 +18,14 @@
   })
 }
 
+// 查询设备当前配置
+export function detailDeviceConfig(deviceId: string) {
+  return request({
+    url: `${prefix}/deviceConfig/${deviceId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDevice(data: object) {
   return request({
diff --git a/src/api/data/query.ts b/src/api/data/query.ts
index 8923b4d..203d05e 100644
--- a/src/api/data/query.ts
+++ b/src/api/data/query.ts
@@ -27,6 +27,13 @@
   })
 }
 
+export function getDataFrameLog(frameLogId: string) {
+  return request({
+    url: `${prefix}/frameLog/${frameLogId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDeviceData(data: object) {
   return request({
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 93d9fba..7622182 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,10 +1,22 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDeviceInfo } from './device-info'
+import type { IConfigItem, IDeviceConfig, IDeviceInfo } from './device-info'
 import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
-import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+import { addDevice, detailDevice, detailDeviceConfig, updateDevice } from '@/api/basic/device'
+
+const configItemName = ref([
+  { name: 'interval', text: '采集周期', unit: '分钟' },
+  { name: 'repeat', text: '重传次数', unit: '' },
+  { name: 'period', text: '上传周期', unit: '分钟' },
+  { name: 'times', text: '采集次数', unit: '' },
+  { name: 'acqStart', text: '采集开始时间', unit: '分钟' },
+  { name: 'upperLimit', text: '报警上限', unit: '' },
+  { name: 'lowerLimit', text: '报警上限', unit: '' },
+  { name: 'destIp', text: '地址', unit: '' },
+  { name: 'destPort', text: '端口', unit: '' },
+])
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -48,6 +60,16 @@
   dataValue: '',
 })
 
+const deviceConfig = ref<IDeviceConfig>({
+  deviceId: '',
+  devCode: '',
+  frameLogId: '',
+  configJson: '',
+  logtime: '',
+})
+
+const configItemList = ref<Array<IConfigItem>>([])
+
 // 逻辑
 const resetForm = () => {
   router.go(-1)
@@ -132,6 +154,21 @@
       deviceInfo.value = res.data
     }
   })
+
+  detailDeviceConfig(id).then((res) => {
+    if (res.code === 200) {
+      deviceConfig.value = res.data
+
+      if (res.data !== '' && res.data.configItemList.length > 0) {
+        configItemList.value = res.data.configItemList.map((item: any) => {
+          return {
+            ...item,
+            text: configItemName.value.filter(nameDict => nameDict.name === item.cmd)[0].text,
+          }
+        })
+      }
+    }
+  })
 }
 
 const initDialog = (params: any) => {
@@ -216,6 +253,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row :gutter="24" style="margin-top: 20px;">
+          <el-col :span="18">
+            <el-form-item label="当前配置：">
+              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
+                {{ item.text }} : {{ item.value }}
+              </el-tag>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="收到时间：">
+              {{ deviceConfig.logtime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 4de8091..9b505c6 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -39,6 +39,14 @@
   logtime?: string
 }
 
+export interface IDeviceConfig {
+  deviceId: string
+  devCode: string
+  frameLogId: string
+  configJson: string
+  logtime: string
+}
+
 export interface IConfigListQuery {
   devcode: string // 设备编号
   configType: string // 配置类型
@@ -50,3 +58,10 @@
   sort?: string
   order?: string
 }
+
+export interface IConfigItem {
+  idx: string
+  cmd: string
+  text: string
+  value: string
+}
diff --git a/src/views/data/query/data-query.ts b/src/views/data/query/data-query.ts
index fb07791..cac3ee8 100644
--- a/src/views/data/query/data-query.ts
+++ b/src/views/data/query/data-query.ts
@@ -4,6 +4,7 @@
   productId?: string // 产品
   devCode: string
   deviceType: string
+  bizType: string // 业务类型
   beginTime?: string // 电量
   endTime?: string //
   offset?: number
@@ -12,6 +13,35 @@
   order?: string
 }
 
+export interface IBizDataInfo {
+  id: string
+  frameLogId: string
+  groupId: string
+  groupName: string
+  devcode: string
+  deviceType?: string
+  deviceTypeName?: string
+  bizType: string // 业务类型
+  bizTypeName?: string
+  cell?: string
+  pci?: string
+  rsrp?: string
+  snr?: string
+  value: string
+  unit: string
+  logtime: string
+  uptime: string
+}
+
+export interface IFrameLogInfo {
+  id: string
+  devcode: string
+  rawFrame?: string
+  rawBizFrame?: string
+  dataJson?: string
+  logtime: string
+}
+
 export interface IDataDetailInfo {
   id: string
   groupId: string

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index 3609deb..0637168 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -18,6 +18,14 @@
   })
 }
 
+// 查询设备当前配置
+export function detailDeviceConfig(deviceId: string) {
+  return request({
+    url: `${prefix}/deviceConfig/${deviceId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDevice(data: object) {
   return request({
diff --git a/src/api/data/query.ts b/src/api/data/query.ts
index 8923b4d..203d05e 100644
--- a/src/api/data/query.ts
+++ b/src/api/data/query.ts
@@ -27,6 +27,13 @@
   })
 }
 
+export function getDataFrameLog(frameLogId: string) {
+  return request({
+    url: `${prefix}/frameLog/${frameLogId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDeviceData(data: object) {
   return request({
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 93d9fba..7622182 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,10 +1,22 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDeviceInfo } from './device-info'
+import type { IConfigItem, IDeviceConfig, IDeviceInfo } from './device-info'
 import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
-import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+import { addDevice, detailDevice, detailDeviceConfig, updateDevice } from '@/api/basic/device'
+
+const configItemName = ref([
+  { name: 'interval', text: '采集周期', unit: '分钟' },
+  { name: 'repeat', text: '重传次数', unit: '' },
+  { name: 'period', text: '上传周期', unit: '分钟' },
+  { name: 'times', text: '采集次数', unit: '' },
+  { name: 'acqStart', text: '采集开始时间', unit: '分钟' },
+  { name: 'upperLimit', text: '报警上限', unit: '' },
+  { name: 'lowerLimit', text: '报警上限', unit: '' },
+  { name: 'destIp', text: '地址', unit: '' },
+  { name: 'destPort', text: '端口', unit: '' },
+])
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -48,6 +60,16 @@
   dataValue: '',
 })
 
+const deviceConfig = ref<IDeviceConfig>({
+  deviceId: '',
+  devCode: '',
+  frameLogId: '',
+  configJson: '',
+  logtime: '',
+})
+
+const configItemList = ref<Array<IConfigItem>>([])
+
 // 逻辑
 const resetForm = () => {
   router.go(-1)
@@ -132,6 +154,21 @@
       deviceInfo.value = res.data
     }
   })
+
+  detailDeviceConfig(id).then((res) => {
+    if (res.code === 200) {
+      deviceConfig.value = res.data
+
+      if (res.data !== '' && res.data.configItemList.length > 0) {
+        configItemList.value = res.data.configItemList.map((item: any) => {
+          return {
+            ...item,
+            text: configItemName.value.filter(nameDict => nameDict.name === item.cmd)[0].text,
+          }
+        })
+      }
+    }
+  })
 }
 
 const initDialog = (params: any) => {
@@ -216,6 +253,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row :gutter="24" style="margin-top: 20px;">
+          <el-col :span="18">
+            <el-form-item label="当前配置：">
+              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
+                {{ item.text }} : {{ item.value }}
+              </el-tag>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="收到时间：">
+              {{ deviceConfig.logtime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 4de8091..9b505c6 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -39,6 +39,14 @@
   logtime?: string
 }
 
+export interface IDeviceConfig {
+  deviceId: string
+  devCode: string
+  frameLogId: string
+  configJson: string
+  logtime: string
+}
+
 export interface IConfigListQuery {
   devcode: string // 设备编号
   configType: string // 配置类型
@@ -50,3 +58,10 @@
   sort?: string
   order?: string
 }
+
+export interface IConfigItem {
+  idx: string
+  cmd: string
+  text: string
+  value: string
+}
diff --git a/src/views/data/query/data-query.ts b/src/views/data/query/data-query.ts
index fb07791..cac3ee8 100644
--- a/src/views/data/query/data-query.ts
+++ b/src/views/data/query/data-query.ts
@@ -4,6 +4,7 @@
   productId?: string // 产品
   devCode: string
   deviceType: string
+  bizType: string // 业务类型
   beginTime?: string // 电量
   endTime?: string //
   offset?: number
@@ -12,6 +13,35 @@
   order?: string
 }
 
+export interface IBizDataInfo {
+  id: string
+  frameLogId: string
+  groupId: string
+  groupName: string
+  devcode: string
+  deviceType?: string
+  deviceTypeName?: string
+  bizType: string // 业务类型
+  bizTypeName?: string
+  cell?: string
+  pci?: string
+  rsrp?: string
+  snr?: string
+  value: string
+  unit: string
+  logtime: string
+  uptime: string
+}
+
+export interface IFrameLogInfo {
+  id: string
+  devcode: string
+  rawFrame?: string
+  rawBizFrame?: string
+  dataJson?: string
+  logtime: string
+}
+
 export interface IDataDetailInfo {
   id: string
   groupId: string
diff --git a/src/views/data/query/dataDetailDialog.vue b/src/views/data/query/dataDetailDialog.vue
index 6026e94..a07eb92 100644
--- a/src/views/data/query/dataDetailDialog.vue
+++ b/src/views/data/query/dataDetailDialog.vue
@@ -1,18 +1,16 @@
 <!-- 数据详情 -->
 <script name="DataDetailDialog" lang="ts" setup>
-import type { IDataDetailInfo } from './data-query'
+import type { IBizDataInfo, IFrameLogInfo } from './data-query'
+import { getDataFrameLog } from '@/api/data/query'
 
 const emit = defineEmits(['recordSaved'])
 
-const dataDetail = ref<IDataDetailInfo>({
+const dataDetail = ref<IFrameLogInfo>({
   id: '',
   devcode: '',
-  groupId: '',
-  groupName: '',
-  deviceTypeName: '',
-  cell: '',
+  rawFrame: '',
+  rawBizFrame: '',
   dataJson: '',
-  uptime: '',
   logtime: '',
 })
 
@@ -23,22 +21,28 @@
   dataDetail.value = {
     id: '',
     devcode: '',
-    groupId: '',
-    groupName: '',
-    deviceTypeName: '',
-    cell: '',
+    rawFrame: '',
+    rawBizFrame: '',
     dataJson: '',
-    uptime: '',
     logtime: '',
   }
 
   showDialog.value = false
 }
 
-const initDialog = (row: IDataDetailInfo) => {
+const initDialog = (row: IBizDataInfo) => {
   // 从路由中获取参数
   dataDetail.value = row
   showDialog.value = true
+
+  getDataFrameLog(row.frameLogId).then((res) => {
+    if (res.code === 200) {
+      dataDetail.value = res.data
+    }
+    else {
+      resetForm()
+    }
+  })
 }
 
 defineExpose({
@@ -47,12 +51,12 @@
 </script>
 
 <template>
-  <el-dialog v-model="showDialog" title="数据详情" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
-    <detail-block title="数据详情">
+  <el-dialog v-model="showDialog" title="原始数据详情" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="原始数据详情">
       <el-form ref="infoFormRef" :model="dataDetail" label-position="right" label-width="110px" stripe>
         <el-row :gutter="24">
           <el-col :span="18" :offset="3">
-            <el-form-item label="数据id">
+            <el-form-item label="原始记录id">
               <el-input v-model="dataDetail.id" :disabled="true" />
             </el-form-item>
           </el-col>
@@ -68,30 +72,6 @@
 
         <el-row :gutter="24">
           <el-col :span="18" :offset="3">
-            <el-form-item label="分组">
-              <el-input v-model="dataDetail.groupName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-          <el-col :span="18" :offset="3">
-            <el-form-item label="设备类型">
-              <el-input v-model="dataDetail.deviceTypeName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-          <el-col :span="18" :offset="3">
-            <el-form-item label="电量">
-              <el-input v-model="dataDetail.cell" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-          <el-col :span="18" :offset="3">
             <el-form-item label="采集时间">
               <el-input v-model="dataDetail.logtime" :disabled="true" />
             </el-form-item>
@@ -100,8 +80,16 @@
 
         <el-row :gutter="24">
           <el-col :span="18" :offset="3">
-            <el-form-item label="上报时间">
-              <el-input v-model="dataDetail.uptime" :disabled="true" />
+            <el-form-item label="原始报文">
+              <el-input v-model="dataDetail.rawFrame" type="textarea" :rows="5" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="业务字段">
+              <el-input v-model="dataDetail.rawBizFrame" type="textarea" :rows="5" :disabled="true" />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index 3609deb..0637168 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -18,6 +18,14 @@
   })
 }
 
+// 查询设备当前配置
+export function detailDeviceConfig(deviceId: string) {
+  return request({
+    url: `${prefix}/deviceConfig/${deviceId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDevice(data: object) {
   return request({
diff --git a/src/api/data/query.ts b/src/api/data/query.ts
index 8923b4d..203d05e 100644
--- a/src/api/data/query.ts
+++ b/src/api/data/query.ts
@@ -27,6 +27,13 @@
   })
 }
 
+export function getDataFrameLog(frameLogId: string) {
+  return request({
+    url: `${prefix}/frameLog/${frameLogId}`,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportDeviceData(data: object) {
   return request({
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index 93d9fba..7622182 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,10 +1,22 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDeviceInfo } from './device-info'
+import type { IConfigItem, IDeviceConfig, IDeviceInfo } from './device-info'
 import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
-import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+import { addDevice, detailDevice, detailDeviceConfig, updateDevice } from '@/api/basic/device'
+
+const configItemName = ref([
+  { name: 'interval', text: '采集周期', unit: '分钟' },
+  { name: 'repeat', text: '重传次数', unit: '' },
+  { name: 'period', text: '上传周期', unit: '分钟' },
+  { name: 'times', text: '采集次数', unit: '' },
+  { name: 'acqStart', text: '采集开始时间', unit: '分钟' },
+  { name: 'upperLimit', text: '报警上限', unit: '' },
+  { name: 'lowerLimit', text: '报警上限', unit: '' },
+  { name: 'destIp', text: '地址', unit: '' },
+  { name: 'destPort', text: '端口', unit: '' },
+])
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -48,6 +60,16 @@
   dataValue: '',
 })
 
+const deviceConfig = ref<IDeviceConfig>({
+  deviceId: '',
+  devCode: '',
+  frameLogId: '',
+  configJson: '',
+  logtime: '',
+})
+
+const configItemList = ref<Array<IConfigItem>>([])
+
 // 逻辑
 const resetForm = () => {
   router.go(-1)
@@ -132,6 +154,21 @@
       deviceInfo.value = res.data
     }
   })
+
+  detailDeviceConfig(id).then((res) => {
+    if (res.code === 200) {
+      deviceConfig.value = res.data
+
+      if (res.data !== '' && res.data.configItemList.length > 0) {
+        configItemList.value = res.data.configItemList.map((item: any) => {
+          return {
+            ...item,
+            text: configItemName.value.filter(nameDict => nameDict.name === item.cmd)[0].text,
+          }
+        })
+      }
+    }
+  })
 }
 
 const initDialog = (params: any) => {
@@ -216,6 +253,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row :gutter="24" style="margin-top: 20px;">
+          <el-col :span="18">
+            <el-form-item label="当前配置：">
+              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
+                {{ item.text }} : {{ item.value }}
+              </el-tag>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="收到时间：">
+              {{ deviceConfig.logtime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 4de8091..9b505c6 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -39,6 +39,14 @@
   logtime?: string
 }
 
+export interface IDeviceConfig {
+  deviceId: string
+  devCode: string
+  frameLogId: string
+  configJson: string
+  logtime: string
+}
+
 export interface IConfigListQuery {
   devcode: string // 设备编号
   configType: string // 配置类型
@@ -50,3 +58,10 @@
   sort?: string
   order?: string
 }
+
+export interface IConfigItem {
+  idx: string
+  cmd: string
+  text: string
+  value: string
+}
diff --git a/src/views/data/query/data-query.ts b/src/views/data/query/data-query.ts
index fb07791..cac3ee8 100644
--- a/src/views/data/query/data-query.ts
+++ b/src/views/data/query/data-query.ts
@@ -4,6 +4,7 @@
   productId?: string // 产品
   devCode: string
   deviceType: string
+  bizType: string // 业务类型
   beginTime?: string // 电量
   endTime?: string //
   offset?: number
@@ -12,6 +13,35 @@
   order?: string
 }
 
+export interface IBizDataInfo {
+  id: string
+  frameLogId: string
+  groupId: string
+  groupName: string
+  devcode: string
+  deviceType?: string
+  deviceTypeName?: string
+  bizType: string // 业务类型
+  bizTypeName?: string
+  cell?: string
+  pci?: string
+  rsrp?: string
+  snr?: string
+  value: string
+  unit: string
+  logtime: string
+  uptime: string
+}
+
+export interface IFrameLogInfo {
+  id: string
+  devcode: string
+  rawFrame?: string
+  rawBizFrame?: string
+  dataJson?: string
+  logtime: string
+}
+
 export interface IDataDetailInfo {
   id: string
   groupId: string
diff --git a/src/views/data/query/dataDetailDialog.vue b/src/views/data/query/dataDetailDialog.vue
index 6026e94..a07eb92 100644
--- a/src/views/data/query/dataDetailDialog.vue
+++ b/src/views/data/query/dataDetailDialog.vue
@@ -1,18 +1,16 @@
 <!-- 数据详情 -->
 <script name="DataDetailDialog" lang="ts" setup>
-import type { IDataDetailInfo } from './data-query'
+import type { IBizDataInfo, IFrameLogInfo } from './data-query'
+import { getDataFrameLog } from '@/api/data/query'
 
 const emit = defineEmits(['recordSaved'])
 
-const dataDetail = ref<IDataDetailInfo>({
+const dataDetail = ref<IFrameLogInfo>({
   id: '',
   devcode: '',
-  groupId: '',
-  groupName: '',
-  deviceTypeName: '',
-  cell: '',
+  rawFrame: '',
+  rawBizFrame: '',
   dataJson: '',
-  uptime: '',
   logtime: '',
 })
 
@@ -23,22 +21,28 @@
   dataDetail.value = {
     id: '',
     devcode: '',
-    groupId: '',
-    groupName: '',
-    deviceTypeName: '',
-    cell: '',
+    rawFrame: '',
+    rawBizFrame: '',
     dataJson: '',
-    uptime: '',
     logtime: '',
   }
 
   showDialog.value = false
 }
 
-const initDialog = (row: IDataDetailInfo) => {
+const initDialog = (row: IBizDataInfo) => {
   // 从路由中获取参数
   dataDetail.value = row
   showDialog.value = true
+
+  getDataFrameLog(row.frameLogId).then((res) => {
+    if (res.code === 200) {
+      dataDetail.value = res.data
+    }
+    else {
+      resetForm()
+    }
+  })
 }
 
 defineExpose({
@@ -47,12 +51,12 @@
 </script>
 
 <template>
-  <el-dialog v-model="showDialog" title="数据详情" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
-    <detail-block title="数据详情">
+  <el-dialog v-model="showDialog" title="原始数据详情" :append-to-body="true" :close-on-click-modal="false" @closed="resetForm">
+    <detail-block title="原始数据详情">
       <el-form ref="infoFormRef" :model="dataDetail" label-position="right" label-width="110px" stripe>
         <el-row :gutter="24">
           <el-col :span="18" :offset="3">
-            <el-form-item label="数据id">
+            <el-form-item label="原始记录id">
               <el-input v-model="dataDetail.id" :disabled="true" />
             </el-form-item>
           </el-col>
@@ -68,30 +72,6 @@
 
         <el-row :gutter="24">
           <el-col :span="18" :offset="3">
-            <el-form-item label="分组">
-              <el-input v-model="dataDetail.groupName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-          <el-col :span="18" :offset="3">
-            <el-form-item label="设备类型">
-              <el-input v-model="dataDetail.deviceTypeName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-          <el-col :span="18" :offset="3">
-            <el-form-item label="电量">
-              <el-input v-model="dataDetail.cell" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-          <el-col :span="18" :offset="3">
             <el-form-item label="采集时间">
               <el-input v-model="dataDetail.logtime" :disabled="true" />
             </el-form-item>
@@ -100,8 +80,16 @@
 
         <el-row :gutter="24">
           <el-col :span="18" :offset="3">
-            <el-form-item label="上报时间">
-              <el-input v-model="dataDetail.uptime" :disabled="true" />
+            <el-form-item label="原始报文">
+              <el-input v-model="dataDetail.rawFrame" type="textarea" :rows="5" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="业务字段">
+              <el-input v-model="dataDetail.rawBizFrame" type="textarea" :rows="5" :disabled="true" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/data/query/list.vue b/src/views/data/query/list.vue
index 4fd73bd..9537c0d 100644
--- a/src/views/data/query/list.vue
+++ b/src/views/data/query/list.vue
@@ -2,7 +2,7 @@
 <script name="DataQueryList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, dayjs } from 'element-plus'
-import type { IDataDetailInfo, IListQuery } from './data-query'
+import type { IBizDataInfo, IListQuery } from './data-query'
 import DataDetailDialog from './dataDetailDialog.vue'
 import type { IDictType } from '@/views/basic/common-interface'
 import type { IGroupInfo } from '@/views/basic/group/group-info'
@@ -10,7 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import { getGroupList } from '@/api/basic/group'
-import { exportDeviceData, getDeviceBizDataListPage, getDeviceDataListPage } from '@/api/data/query'
+import { exportDeviceData, getDeviceBizDataListPage } from '@/api/data/query'
 
 const props = defineProps({
   embedded: {
@@ -33,6 +33,7 @@
   groupId: '', // 分组
   devCode: props.devCode === undefined ? '' : props.devCode,
   deviceType: '',
+  bizType: '',
   beginTime: '',
   endTime: '',
   offset: 1,
@@ -49,16 +50,18 @@
   { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
   { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
   { text: '电量(%)', value: 'cell', align: 'center', width: '80' },
-  { text: '业务类型', value: 'bizTypeName', align: 'center', width: '180' },
+  { text: '业务类型', value: 'bizTypeName', align: 'center', width: '140' },
   { text: '值', value: 'value', align: 'center' },
+  { text: '单位', value: 'unit', align: 'center', width: '100' },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上报时间', value: 'logtime', align: 'center', width: '180' },
   { text: '设备状态', value: 'status', align: 'center', width: '90' },
 ])
-const dataList = ref<Array<IDataDetailInfo>>([]) // 表格数据
+const dataList = ref<Array<IBizDataInfo>>([]) // 表格数据
 
 const statusDict = ref<Array<IDictType>>([])
 const deviceTypeDict = ref<Array<IDictType>>([])
+const bizTypeDict = ref<Array<IDictType>>([])
 
 // 逻辑
 
@@ -92,7 +95,7 @@
 }
 
 // 详情
-const detail = (row: IDataDetailInfo) => {
+const detail = (row: IBizDataInfo) => {
   refDataDialog.value.initDialog(row)
 }
 
@@ -105,7 +108,7 @@
   }
   getDeviceBizDataListPage(searchQuery.value).then((response) => {
     if (response.code === 200) {
-      dataList.value = response.data.rows.map((item: IDataDetailInfo) => {
+      dataList.value = response.data.rows.map((item: IBizDataInfo) => {
         return {
           ...item,
         }
@@ -139,6 +142,7 @@
     groupId: '', // 分组
     devCode: props.devCode,
     deviceType: '',
+    bizType: '',
     beginTime: '',
     endTime: '',
     offset: 1,
@@ -165,6 +169,14 @@
     }
   })
 }
+const getBizTypeDict = async () => {
+  getDictByCode('bizType').then((res: any) => {
+    if (res.code === 200) {
+      bizTypeDict.value = res.data
+      sessionStorage.setItem('bizType', JSON.stringify(bizTypeDict.value))
+    }
+  })
+}
 const getAllGroupList = async () => {
   await getGroupList({}).then((res: any) => {
     if (res.code === 200) {
@@ -175,6 +187,7 @@
 const getDict = async () => {
   await getStatusDict()
   await getDeviceTypeDict()
+  await getBizTypeDict()
   await getAllGroupList()
 }
 
@@ -212,12 +225,13 @@
   if (val.embedded === true) {
     searchQuery.value.devCode = props.devCode
   }
-})
+}, { immediate: true })
 
 onMounted(async () => {
   await getDict()
   initQuerySearch()
-  searchList()
+
+  setTimeout(searchList, 500)
 })
 </script>
 
@@ -239,6 +253,11 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="searchQuery.bizType" placeholder="业务类型" clearable>
+          <el-option v-for="dict in bizTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker v-model="dateRangeLog" type="daterange" start-placeholder="采集时间（开始）" end-placeholder="采集时间（结束）" />
       </search-item>
       <search-item>