diff --git a/public/static/map.html b/public/static/map.html
index 14abdef..ed952c6 100644
--- a/public/static/map.html
+++ b/public/static/map.html
@@ -24,7 +24,6 @@
 <body>
     <div id="container"></div>
     <script>
-        // import { Engine } from 'mapv-three';
         // 创建地图实例  
         var map = new BMapGL.Map("container"); // 创建地图实例 
         var point = new BMapGL.Point(121.619992, 30.025703); // 创建点坐标 
diff --git a/src/api/factorResources/index.js b/src/api/factorResources/index.js
index d26b323..8fb0699 100644
--- a/src/api/factorResources/index.js
+++ b/src/api/factorResources/index.js
@@ -46,4 +46,12 @@ export function car_line(params) {
         method:'get',
         params
     })
+}
+// 感知设备
+export function camera_point(params) {
+    return request({
+        url:'/ThreeProoFingsData/CameraList',
+        method:'get',
+        params
+    })
 }
\ No newline at end of file
diff --git a/src/assets/factor/car_end.png b/src/assets/factor/car_end.png
new file mode 100644
index 0000000..2667c7a
Binary files /dev/null and b/src/assets/factor/car_end.png differ
diff --git a/src/assets/factor/car_start.png b/src/assets/factor/car_start.png
new file mode 100644
index 0000000..811dc3e
Binary files /dev/null and b/src/assets/factor/car_start.png differ
diff --git a/src/assets/factor/factor04.png b/src/assets/factor/factor04.png
new file mode 100644
index 0000000..db5ad21
Binary files /dev/null and b/src/assets/factor/factor04.png differ
diff --git a/src/views/compositeIndex/index.vue b/src/views/compositeIndex/index.vue
index ca4cb04..5fd479f 100644
--- a/src/views/compositeIndex/index.vue
+++ b/src/views/compositeIndex/index.vue
@@ -106,6 +106,7 @@ export default {
         });
       }
     },
+    // 排名查询
     async get_rank() {
       let params = {
         scoreType: 'month'
diff --git a/src/views/factor/components/factorMap.vue b/src/views/factor/components/factorMap.vue
index a6e48d1..905013f 100644
--- a/src/views/factor/components/factorMap.vue
+++ b/src/views/factor/components/factorMap.vue
@@ -24,6 +24,11 @@ export default {
       type: Array,
       default: () => [],
     },
+    // 感知设备
+    camera_list: {
+      type: Array,
+      default: () => [],
+    },
     // 车辆轨迹
     new_line: {
       type: Array,
@@ -107,6 +112,26 @@ export default {
             that.$emit("get_car_text", item);
           });
         });
+        // 感知设备点位上图
+        that.camera_list.forEach((item) => {
+          var camera_point = new BMap.Point(item.longitude, item.latitude);
+          // 自定义图标;
+          var camera_icon = {};
+          camera_icon = new BMap.Icon(
+            require("@/assets/factor/factor04.png"),
+            new BMap.Size(20, 40),
+            {
+              imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移
+            }
+          );
+          var camera_marker = new BMap.Marker(camera_point, { icon: camera_icon }); // 创建点位
+          map.addOverlay(camera_marker);
+          // camera_marker.addEventListener("click", function () {
+          //   // 查看车辆轨迹
+          //   // 查看轨迹的点击事件是要重新创建地图的，以该车坐标为中心
+          //   that.$emit("get_car_text", item);
+          // });
+        });
       }, 500);
       map.centerAndZoom(
         new BMap.Point(this.center_point[0], this.center_point[1]),
@@ -210,14 +235,19 @@ export default {
           styleJson,
         },
       });
+      console.log("item", item);
       //let that = this; // 不改指向后面很多函数无法执行
-      let label = new BMap.Label();
+      // let label = new BMap.Label();
+      // 以车辆出发点为中心重新绘制地图
+      //119.460741
+      //29.531762999999998
+      //29.531762
       setTimeout(() => {
-        var point = new BMap.Point(item.longitude, item.latitude);
-        // 自定义图标;
+        var point = new BMap.Point(new_line[0].longitude, new_line[0].latitude);
+        // 自定义起点图标;
         var myIcon = {};
         myIcon = new BMap.Icon(
-          require("@/assets/factor/factor03.png"),
+          require("@/assets/factor/car_start.png"),
           new BMap.Size(20, 40),
           {
             imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移
@@ -225,8 +255,23 @@ export default {
         );
         var marker = new BMap.Marker(point, { icon: myIcon }); // 创建点位
         map.addOverlay(marker);
+        // 自定义终点坐标
+        var end_point = new BMap.Point(
+          new_line[new_line.length - 1].longitude,
+          new_line[new_line.length - 1].latitude
+        );
+        var end_icon = {};
+        end_icon = new BMap.Icon(
+          require("@/assets/factor/car_end.png"),
+          new BMap.Size(20, 40),
+          {
+            imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移
+          }
+        );
+        var end_marker = new BMap.Marker(end_point, { icon: end_icon }); // 创建点位
+        map.addOverlay(end_marker);
 
-         // 车辆轨迹绘画
+        // 车辆轨迹绘画
         var line_point = [];
         for (let i = 0; i < new_line.length; i++) {
           line_point.push(
@@ -243,68 +288,68 @@ export default {
         map.addOverlay(polyline);
       }, 500);
 
-      map.centerAndZoom(new BMap.Point(item.longitude, item.latitude), 16); // 创建点坐标
+      map.centerAndZoom(new BMap.Point(item.longitude, item.latitude), 8); // 创建点坐标
       map.setMinZoom(12); // 初始化地图，设置中心点坐标和地图级别
       map.setMaxZoom(19);
       map.enableScrollWheelZoom(true);
-      
-      showBoundaryx(MapLine.features[5]);
 
-      function showBoundaryx(city) {
-        var paths = [];
-        var list = city.geometry.coordinates;
-        var polygon = {};
-        if (list.length > 1) {
-          for (let a = 0; a < list.length; a++) {
-            paths = [];
-            for (let i = 0; i < list[a][0].length; i++) {
-              let lat = list[a][0][i][1],
-                lng = list[a][0][i][0];
-              paths.push(new BMap.Point(lng, lat));
-            }
-            console.log('paths',paths);
-            polygon = new BMap.Polygon(paths, {
-              fillColor: "#3b4c44",
-              strokeColor: "#0f1423",
-              fillOpacity: 0.6,
-              strokeWeight: 1,
-            }); //创建多边形
-            polygon.disableMassClear();
-            map.addOverlay(polygon); //增加多边形
-          }
-        } else {
-          for (let i = 0; i < list[0].length; i++) {
-            let lat = list[0][i][1],
-              lng = list[0][i][0];
-            paths.push(new BMap.Point(lng, lat));
-          }
-          console.log('paths',paths);
-          polygon = new BMap.Polygon(paths, {
-            fillColor: "#3b4c44",
-            strokeColor: "#0f1423",
-            fillOpacity: 0.6,
-            strokeWeight: 1,
-          }); //创建多边形
-          polygon.disableMassClear();
-          map.addOverlay(polygon); //增加多边形
-        }
-        polygon.infowindow = new BMap.InfoWindow();
-        polygon.infowindow.name = city.properties.name;
-        polygon.addEventListener("mouseover", function () {
-          polygon.setFillColor("#ffa500");
-        });
-        polygon.addEventListener("mouseout", function () {
-          map.removeOverlay(label);
-          polygon.setFillColor("#3b4c44");
-        });
-      }
+      // showBoundaryx(MapLine.features[5]);
+
+      // function showBoundaryx(city) {
+      //   var paths = [];
+      //   var list = city.geometry.coordinates;
+      //   var polygon = {};
+      //   if (list.length > 1) {
+      //     for (let a = 0; a < list.length; a++) {
+      //       paths = [];
+      //       for (let i = 0; i < list[a][0].length; i++) {
+      //         let lat = list[a][0][i][1],
+      //           lng = list[a][0][i][0];
+      //         paths.push(new BMap.Point(lng, lat));
+      //       }
+      //       console.log('paths',paths);
+      //       polygon = new BMap.Polygon(paths, {
+      //         fillColor: "#3b4c44",
+      //         strokeColor: "#0f1423",
+      //         fillOpacity: 0.6,
+      //         strokeWeight: 1,
+      //       }); //创建多边形
+      //       polygon.disableMassClear();
+      //       map.addOverlay(polygon); //增加多边形
+      //     }
+      //   } else {
+      //     for (let i = 0; i < list[0].length; i++) {
+      //       let lat = list[0][i][1],
+      //         lng = list[0][i][0];
+      //       paths.push(new BMap.Point(lng, lat));
+      //     }
+      //     console.log('paths',paths);
+      //     polygon = new BMap.Polygon(paths, {
+      //       fillColor: "#3b4c44",
+      //       strokeColor: "#0f1423",
+      //       fillOpacity: 0.6,
+      //       strokeWeight: 1,
+      //     }); //创建多边形
+      //     polygon.disableMassClear();
+      //     map.addOverlay(polygon); //增加多边形
+      //   }
+      //   polygon.infowindow = new BMap.InfoWindow();
+      //   polygon.infowindow.name = city.properties.name;
+      //   polygon.addEventListener("mouseover", function () {
+      //     polygon.setFillColor("#ffa500");
+      //   });
+      //   polygon.addEventListener("mouseout", function () {
+      //     map.removeOverlay(label);
+      //     polygon.setFillColor("#3b4c44");
+      //   });
+      // }
     },
   },
 };
 </script>
 <style lang="less" scoped>
 /* 去除百度地图logo */
-.anchorBL {              
+.anchorBL {
   display: none;
 }
 .map {
diff --git a/src/views/factor/index.vue b/src/views/factor/index.vue
index 21cee08..0d1b9be 100644
--- a/src/views/factor/index.vue
+++ b/src/views/factor/index.vue
@@ -10,6 +10,7 @@
             :company_list="company_list"
             :video_list="video_list"
             :car_list="car_list"
+            :camera_list="camera_list"
             @get_company_text="get_company_text"
             @get_video_text="get_video_text"
             @get_car_text="get_car_text"
@@ -58,6 +59,9 @@
               <el-button size="small" @click="get_car()">{{
                 this.btn_car
               }}</el-button>
+              <el-button size="small" @click="get_camera()">{{
+                this.btn_camera
+              }}</el-button>
             </div>
           </div>
           <!-- 公司信息文本展示 -->
@@ -159,6 +163,7 @@ import {
   queryVideo,
   car_point,
   car_line,
+  camera_point,
 } from "@/api/factorResources";
 export default {
   name: "factor",
@@ -170,6 +175,7 @@ export default {
       company_list: [], // 七个区域所有的企业
       video_list: [], // 七个区域所有监控单位
       car_list: [], // 车辆点位
+      camera_list: [], // 感知设备点位
       search: {
         word: "",
         select: "企业",
@@ -181,6 +187,7 @@ export default {
       btn_video: "", // 复选框文字
       btn_item: "", // 复选框文字
       btn_car: "", // 危化品车辆文字
+      btn_camera: "", // 感知设备文字
       company_flag: "0", // 公司详情框展示
       /////////// 以下范围公司详情框所需对应变量声明
       text_company: "",
@@ -209,6 +216,7 @@ export default {
     // 默认地图打开展示视频监控
     this.get_video();
     this.get_car_point();
+    this.get_camera_point();
   },
   methods: {
     // 七个区域所有的企业
@@ -251,6 +259,7 @@ export default {
       };
       queryVideo(param).then((res) => {
         this.video_list = res.data;
+        this.camera_list = [];
         this.company_list = [];
         this.car_list = [];
         // 重新在地图打点
@@ -264,6 +273,7 @@ export default {
       console.log("resss", res);
       if (res.code == 200) {
         this.car_list = res.data;
+        this.camera_list = [];
         this.company_list = [];
         this.video_list = [];
         // 重新在地图打点
@@ -273,6 +283,21 @@ export default {
         this.$message.warning(res.msg);
       }
     },
+    // 展示感知设备点位
+    async get_camera() {
+      this.company_flag = "0";
+      let res = await camera_point();
+      if (res.code == 200) {
+        this.camera_list = res.data;
+        this.car_list = [];
+        this.company_list = [];
+        this.video_list = [];
+        // 重新在地图打点
+        this.$refs.factorMap.init_map();
+      } else if (res.code == 500) {
+        this.$message.warning(res.msg);
+      }
+    },
     // 查询企业
     search_map() {
       let param = {
@@ -330,15 +355,19 @@ export default {
       };
       let res = await car_line(params);
       if (res.code == 200) {
-        console.log("res", res);
-        let arr = [
-          { longitude: 121.597849, latitude: 29.904037 },
-          { longitude: 121.593864, latitude: 29.903234 },
-        ];
+        console.log("res", res.data);
+        // let arr = [
+        //   { longitude: 121.597849, latitude: 29.904037 },
+        //   { longitude: 121.593864, latitude: 29.903234 },
+        //   { longitude: 121.594464, latitude: 29.905234 },
+        //   { longitude: 121.596364, latitude: 29.904434 },
+        // ];
+        let arr = res.data;
         const new_line = arr.map((item) => ({
           longitude: item.longitude,
           latitude: item.latitude,
         }));
+        console.log("nnn", new_line);
         this.$message.success("车辆轨迹查询中...");
         // 查看轨迹的点击事件是要重新创建地图的，以该车坐标为中心
         this.$refs.factorMap.cause_car_line_map(item, new_line);
@@ -355,6 +384,16 @@ export default {
         this.$message.warning(res.msg);
       }
     },
+    async get_camera_point() {
+      let res = await camera_point();
+      console.log("resssc", res);
+      if (res.code == 200) {
+        // this.car_list = res.data
+        this.btn_camera = `感知设备(${res.data.length})`;
+      } else if (res.code == 500) {
+        this.$message.warning(res.msg);
+      }
+    },
     // 点击跳转企业档案详情页面
     turn() {
       sessionStorage.setItem("companyID", this.id);
@@ -488,7 +527,7 @@ export default {
         }
         .left_check {
           width: 13vw;
-          height: 18vh;
+          height: 23vh;
           border: 0.1px solid #28847e;
           background: #212f30;
           border-radius: 4px;
@@ -507,7 +546,7 @@ export default {
             margin-top: 1vh;
             margin-left: 1vw;
             width: 11vw;
-            height: 13vh;
+            height: 18vh;
             display: flex;
             flex-direction: column;
             .el-button {
