diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java
index eaa3b11..48aa3bd 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java
@@ -65,5 +65,8 @@ public interface TbPeopleMapper {
      */
     List<PeoplePositionVo> queryPeoplePositionByProId(@Param("proId") Integer proId);
 
+
+
+
 }
 
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java
index 2addc6b..9403349 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java
@@ -26,6 +26,13 @@ public class ProjectDetailsViewController extends BaseController {
     @Autowired
     private ProjectDetailsViewServiceImpl projectDetailsViewService;
 
+    /**
+     * 根据工程id查询所有设备
+     */
+    @GetMapping("/queryDevInfoByProject")
+    public AjaxResult queryDevInfoByProject(Integer proId) {
+        return AjaxResult.success(projectDetailsViewService.queryDevInfoByProject(proId));
+    }
 
     /**
      * 查询工程人员安全帽定位信息
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java
index 3fe5c7b..0b4e96b 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java
@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author : 阮世耀
@@ -17,6 +18,8 @@ import java.util.List;
 @Mapper
 public interface TbDeviceDataRecord {
 
+    List<Map<String,String>> queryDevInfoByProject(@Param("proId") Integer proId);
+
     List<DeviceWarnRecordVo> getDeviceWarnRecord(DeviceWarnRecordVo deviceWarnRecordVo);
 
     /**
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java
index 6ac16f2..179bfbe 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java
@@ -24,6 +24,10 @@ public class ProjectDetailsViewServiceImpl {
     private TbDeviceDataRecord tbDeviceDataRecordMapper;
 
 
+    public AjaxResult queryDevInfoByProject(Integer proId) {
+        return AjaxResult.success(tbDeviceDataRecordMapper.queryDevInfoByProject(proId));
+    }
+
     public AjaxResult getDevAttributeLatestInfoById(Integer proId) {
         return AjaxResult.success(tbDeviceDataRecordMapper.getDevAttributeLatestInfoById(proId));
     }
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml
index 410cd36..ead81c2 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml
@@ -2,6 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.screen.mapper.TbDeviceDataRecord">
 
+    <select id="queryDevInfoByProject" resultType="java.util.Map">
+        SELECT
+            device.id,device.dev_name,project.id AS proId,project.pro_name AS proName,
+            device.dev_type
+        FROM
+        tb_device device
+        LEFT JOIN tb_bd_device_record tbdr ON device.bd_id = tbdr.id
+        LEFT JOIN tb_project project ON project.id = tbdr.pro_id AND project.del_flag = 0
+        WHERE project.id = #{proId} and device.del_flag = 0
+    </select>
+
     <select id="getDeviceWarnRecord" resultType="com.bonus.screen.vo.DeviceWarnRecordVo">
         SELECT
             tddr.id,