From 4cc47274581a6c8955aa3137959b7a8745ad4252 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Mon, 27 Nov 2023 14:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E8=AE=BE=E5=A4=87=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E4=B8=8A=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/map.html                    |   1 -
 src/api/factorResources/index.js          |   8 ++
 src/assets/factor/car_end.png             | Bin 0 -> 1804 bytes
 src/assets/factor/car_start.png           | Bin 0 -> 1751 bytes
 src/assets/factor/factor04.png            | Bin 0 -> 1771 bytes
 src/views/compositeIndex/index.vue        |   1 +
 src/views/factor/components/factorMap.vue | 159 ++++++++++++++--------
 src/views/factor/index.vue                |  53 +++++++-
 8 files changed, 157 insertions(+), 65 deletions(-)
 create mode 100644 src/assets/factor/car_end.png
 create mode 100644 src/assets/factor/car_start.png
 create mode 100644 src/assets/factor/factor04.png
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 0000000000000000000000000000000000000000..2667c7a3004b0efa29133092a912ed33f2e8e913
GIT binary patch
literal 1804
zcmV+n2lM!eP)<h;3K|Lk000e1NJLTq000#L001Zm1^@s65%aO-00001b5ch_0Itp)
z=>Px*#z{m$R7gwhmTQPzR~5(qYoGVIkC{97IgeyAGnr}POxtK$;-g}vkhCdQi%<l$
zRs~By42nfiizp(cltQDJ4_1((m8Mo|loC<efN9#`BTZ-Wm`vkLGLL)b&VAo=@44r-
zx12j>+Sm?l!G7z3_2ul%kG1}5um9eJ_u!-VfQk2^|9@3C)ikxVcBd7OewqpKd6Fev
z5C{UCf}k2OdOTLD99i2oc>1kUdJ{A^cX_gwO&^vSyCvRnV7MNL3jkpdxWv#_6*P1e
z%<-N!^7dEPCNtI>;nzSDmBz<yRrzz$c67bt0GvYz4hV6T31UouBoGnRBL<p^d?}G%
zy(>Sl?fg~n1~k1;{GgSJy_{*b71?uz2m*xB1&0ylNz@H62_&sYN7t!r=$Fj1i@Pfy
z9&d!;4XEC*=hE%=nA&j!_kB>{Bk(<lU_IMV(C&6(>p)oslVy;spc#!&i{W>zMEsr&
zXwPcpe$uqVeYLs}o(Jx^cqo^~f^Fkx%XtVc@WpHj_h!<x@9eC=RiL7PDJqzvAfN0d
zvrxRbw0-!W-Av7D^GvF3Pf4~7?z)Hv0Zx5jobG(}9KX=CkXB^;b@z?TU<?({?@DmI
zX^HPI7r-<POx4heMN!kWN1V9%9m0_#lDYp=Zmw7ccbqW91KA|?Gls_&7Da>+9=>jz
zreYB~c<v%U(`e%958c2XoWCNTYg$6m^bkzYbrj;!s-1|XXyEjPk2OYz{+2G51@Cll
zgCdFFZXaRaI6ud~Hq=jb&x6l7o>*8EhjvY|*;Y%GJs$^VU*k+sNYZsknodm9QOG1k
zJ8sI9nZ10klS=%muT&O6rz1Ys6U7($5-g=EDA*m`e&SRRLWd0l&wTVIX(VFezSA?o
zu}ZaDHZ!yk$|OU_YBoddxXCCpJ-62$%pOY?OPsfD_??azml>YCey4QT$-f7->*2uI
zHuj~FE%b|jU*R+LhIn+>q;#TM7e8If^RvDWNi#??4HU8&*gd99n48m#%s@N4vMPeM
zjWGuC>z!lLTE{`jam944A<~+P-z+Tg`$o62-!JCHwAIAHiS6v!N`+6mJ|x{BibPOM
zCaQKap6+(vDAi|^)!G;}E%6ae!99Jw?A3ZhoUhi!nQ~PWZKpdd`}))Ly{R4SU-gD~
z;QVV`QWcU617UQM3984Vhn$}1x4O{ya_Q?Nv&VW?3OulF2*(jyBngwIju<04U8##N
zk8Wj0mkQ$LYK`|81}Z`j)71Y$b(FRavB>h;?zPF0S2iX}t5_HM)=Fbv(G~jcV2-tX
zA7Mr>6xR5&ODp^{gZ=F8p?)?RjnI=zdH&0lRbF8Xq-kVl)6~}WKiHYXXRjI4_{GIN
zZmQ?Ssg;6&-4Tn8Cb;WC_?`$ywQDLw*wGuOgA=3dc&#Ch)|(=T#i%lnt*LX%JDPiT
zmal<!wVf|~lbPxxeG7|0;5Z0e7w~)$1U^_-RqD<>DKbf#3Z@$<j&5aYvvX^6ICJ7n
zE_L;XQLO&auv&MRt0m4uw+gcj9ZQJN_PS=m6q&;DtZf;PgvWnm4QGG2sh@@msS_7s
zjh%xt$$Vizwye;xx;EG?KlCU`2B`|#$s}35@#mdX&%Xb4|F^tO;<Hz7c2d13GmFcD
z92cCg`zja%lO*`2N#$I&tWIB?YJT#j(mR57^}Sp;C>iRbseCcm$TT!)MaJsj08=WB
zPc*j=zW9#rs5fphiq)g0<L-~w8|(K85lX2P6SngMYg_Keo87~kzfhJt*GZmxixk7p
z(^gB;JP(#>pswg^j?4B#H!q>F;9_K?vw8VT?IAGfeii;?!f=nPa^QIZi_4y)mz3Cp
zsg_M8U8|@3=0jS96<whirM7Xq%gG4@dkKp6IMUR7{hSu8>kZ&1gVEMgsYqi<h3Rs*
z!MRHBUf0uZQ-wECkE*$Z<;~knnoDTyXNG&M>9B1cxUy`;CT-5jrFh~g5Q%R2*-B-q
zKW6vGWUp+3975o$P=db{(tjFJcs)vJ+IA<QnQFZju-;`Ki?`+S-}a$1A05?)qRlt;
z8!tEFDu(pK>zXcgCS=ARj>_KiyW{S$oK|Z~(8ZFY>aR4Sw>mz?IFTknv<!*Q>`m8C
zN)RFd(M(%S&s&kZTRx2ix^VzWYP{a47le$7_I@U$eF>dE;rQ4S2n@)K7a7PN*4n2E
zL1e`C__!}vG7yxDsr*pQWxE0{W-w&FwCR{`bn+iU!2kvj*g43G0oyqbQ%S=o8M?BD
uBvwNG-t{@%>>R$`|My?gZ>P|^U;htehCx=FN9>#c0000<MNUMnLSTaUqKH5M

literal 0
HcmV?d00001

diff --git a/src/assets/factor/car_start.png b/src/assets/factor/car_start.png
new file mode 100644
index 0000000000000000000000000000000000000000..811dc3e5496d41a57de4b6dfd155aedd13ad2c60
GIT binary patch
literal 1751
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

literal 0
HcmV?d00001

diff --git a/src/assets/factor/factor04.png b/src/assets/factor/factor04.png
new file mode 100644
index 0000000000000000000000000000000000000000..db5ad217e4113e8a4f6ba0d04d872ed2c8b09d6a
GIT binary patch
literal 1771
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
N002ovPDHLkV1hMoUp)W-

literal 0
HcmV?d00001

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 {
