diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index ce5970a..656ee03 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -1,3 +1,4 @@
+<!-- 设备详情 没用-->
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="deviceForm" label-well-code="right" label-width="100px">

diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index ce5970a..656ee03 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -1,3 +1,4 @@
+<!-- 设备详情 没用-->
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="deviceForm" label-well-code="right" label-width="100px">
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index bb1db56..8447d0b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -10,6 +10,13 @@
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="18">
+          <el-form-item label="设备名称" prop="devName">
+            <el-input v-model.trim="deviceForm.devName" :maxlength="20" type="text" placeholder="必填" show-word-limit/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
           <el-form-item label="业务类型" prop="devType">
             <el-checkbox-group v-model="checkList">
               <el-checkbox
@@ -74,6 +81,7 @@
       dialogStatus: '', // 对话框类型：create,update
       deviceForm: {
         devCode: '',
+        devName: '',
         devType: '',
         devIp: '',
         description: ''
@@ -89,6 +97,7 @@
       showModelType: true, // 是否显示型号选项
       rules: {
         devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        devName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }],
         devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }]
       }, // 前端校验规则
@@ -119,6 +128,7 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deviceForm = {
           devCode: row.devCode,
+          devName: row.devName,
           devType: row.devType,
           devIp: row.devIp,
           description: row.description,
@@ -135,6 +145,7 @@
     resetForm() {
       this.deviceForm = {
         devCode: '',
+        devName: '',
         devType: '',
         devIp: '',
         description: ''

diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index ce5970a..656ee03 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -1,3 +1,4 @@
+<!-- 设备详情 没用-->
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="deviceForm" label-well-code="right" label-width="100px">
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index bb1db56..8447d0b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -10,6 +10,13 @@
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="18">
+          <el-form-item label="设备名称" prop="devName">
+            <el-input v-model.trim="deviceForm.devName" :maxlength="20" type="text" placeholder="必填" show-word-limit/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
           <el-form-item label="业务类型" prop="devType">
             <el-checkbox-group v-model="checkList">
               <el-checkbox
@@ -74,6 +81,7 @@
       dialogStatus: '', // 对话框类型：create,update
       deviceForm: {
         devCode: '',
+        devName: '',
         devType: '',
         devIp: '',
         description: ''
@@ -89,6 +97,7 @@
       showModelType: true, // 是否显示型号选项
       rules: {
         devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        devName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }],
         devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }]
       }, // 前端校验规则
@@ -119,6 +128,7 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deviceForm = {
           devCode: row.devCode,
+          devName: row.devName,
           devType: row.devType,
           devIp: row.devIp,
           description: row.description,
@@ -135,6 +145,7 @@
     resetForm() {
       this.deviceForm = {
         devCode: '',
+        devName: '',
         devType: '',
         devIp: '',
         description: ''
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 8a3c16b..2550f87 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -77,6 +77,11 @@
           width: 140
         },
         {
+          text: '设备名称',
+          value: 'devName',
+          align: 'center'
+        },
+        {
           text: '业务类型',
           value: 'devTypeName',
           align: 'center'

diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index ce5970a..656ee03 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -1,3 +1,4 @@
+<!-- 设备详情 没用-->
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :model="deviceForm" label-well-code="right" label-width="100px">
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index bb1db56..8447d0b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -10,6 +10,13 @@
       </el-row>
       <el-row type="flex" justify="center">
         <el-col :span="18">
+          <el-form-item label="设备名称" prop="devName">
+            <el-input v-model.trim="deviceForm.devName" :maxlength="20" type="text" placeholder="必填" show-word-limit/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
           <el-form-item label="业务类型" prop="devType">
             <el-checkbox-group v-model="checkList">
               <el-checkbox
@@ -74,6 +81,7 @@
       dialogStatus: '', // 对话框类型：create,update
       deviceForm: {
         devCode: '',
+        devName: '',
         devType: '',
         devIp: '',
         description: ''
@@ -89,6 +97,7 @@
       showModelType: true, // 是否显示型号选项
       rules: {
         devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        devName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }],
         devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }]
       }, // 前端校验规则
@@ -119,6 +128,7 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deviceForm = {
           devCode: row.devCode,
+          devName: row.devName,
           devType: row.devType,
           devIp: row.devIp,
           description: row.description,
@@ -135,6 +145,7 @@
     resetForm() {
       this.deviceForm = {
         devCode: '',
+        devName: '',
         devType: '',
         devIp: '',
         description: ''
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 8a3c16b..2550f87 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -77,6 +77,11 @@
           width: 140
         },
         {
+          text: '设备名称',
+          value: 'devName',
+          align: 'center'
+        },
+        {
           text: '业务类型',
           value: 'devTypeName',
           align: 'center'
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 9e731c6..d020b83 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
+        <!--<el-row>-->
           <el-form-item prop="resourceName">
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
           </el-form-item>
@@ -18,46 +18,51 @@
           <!--:value="item.doorCode"/>-->
           <!--</el-select>-->
           <!--</el-form-item>-->
-          <el-form-item>
-            <el-select v-model="listQuery.devCode" placeholder="设备编号" class="selectForm-container-item" clearable value="">
-              <el-option
-                v-for="item in deviceList"
-                :key="item.id"
-                :label="item.devCode"
-                :value="item.devCode">
-                <span style="float: left">{{ item.devCode }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable class="selectForm-container-item" value="">
-              <el-option
-                v-for="item in temperatureState"
-                :key="'temp_'+item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item>
-            <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
+        <el-form-item>
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value"/>
+        </el-select>
+      </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.devCode" placeholder="设备编号" class="selectForm-container-item" clearable value="">
+            <el-option
+              v-for="item in deviceList"
+              :key="item.id"
+              :label="item.devCode"
+              :value="item.devCode">
+              <span style="float: left">{{ item.devCode }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable class="selectForm-container-item" value="">
+            <el-option
+              v-for="item in temperatureState"
+              :key="'temp_'+item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <!--</el-row>-->
+        <!--<el-row>-->
+        <el-form-item>
+          <el-date-picker
+            v-model="listQuery.beginTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择开始时间"/>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            v-model="listQuery.endTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择结束时间"/>
+        </el-form-item>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <!--</el-row>-->
       </el-form>
     </div>
     <!--查询结果Table显示-->
@@ -97,6 +102,7 @@
 <script>
 import selectTree from '@/components/SelectTree/singleSelect'
 import { getRecordList, getDoorSourceList, getDeviceLabelList, exportRecords } from '@/api/query'
+import { getBusinessType } from '@/api/device'
 import DownloadTemplate from '@/components/DownloadTemplate'
 import DeptSelect from '@/components/DeptSelect/index'
 import { downloadFile } from '@/utils/downloadUtils'
@@ -108,9 +114,6 @@
     return {
       doorList: [],
       deviceList: [],
-      devQuery: {
-        devType: '1'
-      },
       listQuery: {
         offset: 1,
         limit: 20,
@@ -122,7 +125,8 @@
         endTime: '',
         keyword: '',
         personDeptId: '',
-        isAbnormal: ''
+        isAbnormal: '',
+        deviceType: ''
       }, // 筛选条件
       columns: [
         {
@@ -194,12 +198,14 @@
       detailShow: false, // 是否显示编辑框
       filename: 'device_template.xlsx',
       deptShowTop: false, // 权属单位下拉是否显示顶级
-      deptShow: true
+      deptShow: true,
+      deviceTypeList: []
     }
   },
   mounted() {
     this.getDoorSource()
     this.getDeviceSource()
+    this.getDeviceType()
     this.fetchData()// 获取数据
   },
   methods: {
@@ -215,6 +221,13 @@
         this.deviceList = response.data
       })
     },
+    // 获取设备类型列表
+    getDeviceType() {
+      getBusinessType().then(response => {
+        this.deviceTypeList = response.data
+        console.log(this.deviceTypeList)
+      })
+    },
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {