Merge remote-tracking branch 'origin/dev' into dev

src/views/BI/components/bottom_options.vue

@@ -37,11 +37,11 @@ import GraveDangerous from "@/views/BI/components/grave_dangerous.vue";
 import VideoAIAnalysis from "@/views/BI/components/video_ai_analysis.vue";
 import VideoAIAnalysisRight from "@/views/BI/components/video_ai_analysisRight.vue";
 import { useVModels } from "@vueuse/core";
-import { handleTrajectory,handleFence } from "@/views/BI/js/trajectory.js";
+import { handleTrajectory, handleFence } from "@/views/BI/js/trajectory.js";
 import {
   handleHortwork,
   handleConfinedspaceWork,
-  handleHighWork
+  handleHighWork,
 } from "@/views/BI/js/eight_work.js";
 import { handleCamera } from "@/views/BI/js/camera.js";
 
@@ -319,12 +319,20 @@ const bottomOptionsList = [
     type: "videoAIAnalysis",
     check: false,
     components: [markRaw(VideoAIAnalysis), markRaw(VideoAIAnalysisRight)],
+    action: handleCamera,
   },
 ];
 const data = reactive({
   bottomOptionsList,
 });
 const fnBottomOptionsListChange = (item, index) => {
+  // ai 视频报警
+  if (index === 4) {
+    data.bottomOptionsList[index].action(
+      !data.bottomOptionsList[index].check,
+      item.type
+    );
+  }
   for (let i = 0; i < data.bottomOptionsList.length; i++) {
     if (index === i) {
       data.bottomOptionsList[index].check =
@@ -345,7 +353,8 @@ const fnBottomChildOptionsListChange = (index, item1, index1) => {
   data.bottomOptionsList[index].list[index1].check =
     !data.bottomOptionsList[index].list[index1].check;
   data.bottomOptionsList[index].list[index1].action(
-    data.bottomOptionsList[index].list[index1].check,item1.type
+    data.bottomOptionsList[index].list[index1].check,
+    item1.type
   );
 };
 </script>

src/views/BI/components/entrance_control.vue

@@ -79,17 +79,17 @@ const data = reactive({
     {
       img: new URL("/src/assets/images/map/img7.png", import.meta.url).href,
       label: "人员闸机数",
-      count: 3500,
+      count: 0,
     },
     {
       img: new URL("/src/assets/images/map/img8.png", import.meta.url).href,
       label: "车辆闸机数",
-      count: 3500,
+      count: 0,
     },
     {
       img: new URL("/src/assets/images/map/img9.png", import.meta.url).href,
       label: "摄像头数",
-      count: 3500,
+      count: 0,
     },
   ],
   block3List: [

src/views/BI/components/grave_dangerous.vue

@@ -58,17 +58,17 @@ const data = reactive({
     {
       img: new URL("/src/assets/images/map/img10.png", import.meta.url).href,
       label: "重大危险源",
-      count: 3500,
+      count: 0,
     },
     {
       img: new URL("/src/assets/images/map/img11.png", import.meta.url).href,
       label: "检测点数",
-      count: 3500,
+      count: 0,
     },
     {
       img: new URL("/src/assets/images/map/img12.png", import.meta.url).href,
       label: "检测天数",
-      count: 3500,
+      count: 0,
     },
   ],
   block4List: [

src/views/BI/components/personnel.vue

@@ -65,13 +65,13 @@ const data = reactive({
     {
       img: new URL("/src/assets/images/map/img1.png", import.meta.url).href,
       label: "全部人员",
-      count: 3500,
+      count: 0,
     },
   ],
   block2OptionsList: [
     {
       label: "滞留报警",
-      count: 3500,
+      count: 0,
     },
     {
       label: "越界报警",

src/views/BI/components/video_ai_analysis.vue

@@ -61,17 +61,17 @@ const data = reactive({
     {
       img: new URL("/src/assets/images/map/img13.png", import.meta.url).href,
       label: "总数",
-      count: 3500,
+      count: 0,
     },
     {
       img: new URL("/src/assets/images/map/img14.png", import.meta.url).href,
       label: "已处理数",
-      count: 3500,
+      count: 0,
     },
     {
       img: new URL("/src/assets/images/map/img15.png", import.meta.url).href,
       label: "待处理数",
-      count: 3500,
+      count: 0,
     },
   ],
   block4List: [
@@ -101,10 +101,10 @@ const getCameraAlarmData = async () => {
     if (item.type === 3) {
       disposed = item.count;
     }
-    data.block1OptionsList[0].count = allAlarm;
-    data.block1OptionsList[1].count = allAlarm - disposed;
-    data.block1OptionsList[2].count = disposed;
   });
+  data.block1OptionsList[0].count = allAlarm;
+  data.block1OptionsList[1].count = allAlarm - disposed;
+  data.block1OptionsList[2].count = disposed;
 };
 const getCameraAlarmTimeData = async () => {
   const resData = await getCameraAlarmTimeCount();

src/views/BI/js/camera.js

@@ -20,6 +20,7 @@ const showCameraList = async (mapPointName) => {
   const { varList } = await getCameraList({ CAMREA_TYPE: mapPointName });
   const NAME_POINT = {
     workSafelyCamera: "八项作业摄像头",
+    videoAIAnalysis: "视频AI分析摄像头",
   };
   varList.forEach(({ VIDEOMANAGER_ID, VIDEONAME, lon, lat, alt }) => {
     addEntity(

src/views/BI/js/map.js

@@ -84,7 +84,7 @@ const handleMouseClick = () => {
     if (model._name.indexOf("高处作业") > -1) {
       clickHighwork(model);
     }
-    if (model._name.indexOf("八项作业摄像头") > -1) {
+    if (model._name.indexOf("摄像头") > -1) {
       clickCamera(model);
     }
   });
@@ -201,10 +201,10 @@ const clickPerson = async (model) => {
   handleDialog(userDialog, pd);
 };
 const clickCamera = async (model) => {
+  console.log("clickCamera");
   const id = model._id;
   const pd = await getVideoManagerView({ VIDEOMANAGER_ID: id });
   pd.pd.cameraType = model._name;
-  console.log(pd);
   handleDialog(cameraDialog, pd);
 };