no message

src/components/map/fireproofData.ts

@@ -54,4 +54,64 @@ export const fireproofData = [
     left: 26,
     right: -89,
   },
+  {
+    markerContent: `
+    <div class="watch"">
+      <div class="watch_text">
+      森林公园电视塔
+         <div class="icon"></div>
+      </div>
+      <div class="watch_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 115.364333,
+    lat: 28.859717,
+    ele: ".marker",
+    title: "森林公园电视塔",
+    left: 26,
+    right: -89,
+    rtspaddr: "rtsp://admin:hik12345@6.205.67.203/Streaming/Channels/102",
+  },
+  {
+    markerContent: `
+    <div class="watch"">
+      <div class="watch_text">
+      三爪仑乡街上
+         <div class="icon"></div>
+      </div>
+      <div class="watch_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 115.211794,
+    lat: 29.027232,
+    ele: ".marker",
+    title: "三爪仑乡街上",
+    left: 26,
+    right: -89,
+    rtspaddr: "rtsp://admin:hik12345@6.205.67.204/Streaming/Channels/102",
+  },
+  {
+    markerContent: `
+    <div class="watch"">
+      <div class="watch_text">
+      中源乡三坪乡
+         <div class="icon"></div>
+      </div>
+      <div class="watch_icon">
+         
+      </div>
+    </div>
+    `,
+    lng: 114.968157,
+    lat: 28.841495,
+    ele: ".marker",
+    title: "中源乡三坪乡",
+    left: 26,
+    right: -89,
+    rtspaddr: "rtsp://admin:hik12345@6.205.67.205/Streaming/Channels/102",
+  },
 ];

src/components/map/map.vue

@@ -217,7 +217,7 @@ const initAMap = () => {
 watch($props, async () => {
   console.log($props.type);
 
-  if ($props.type === "防火点位") {
+  if ($props.type === "防火 鹰眼点位") {
     const res = await reqGetSmokeCount();
 
     // console.log(res);
@@ -315,7 +315,7 @@ const getData = () => {
     return petrolData;
   } else if ($props.type === "监控点位") {
     return watchData;
-  } else if ($props.type === "防火点位") {
+  } else if ($props.type === "防火 鹰眼点位") {
     return fireproofData;
   } else if ($props.type === "广播点位") {
     return radioData;
@@ -518,10 +518,10 @@ onUnmounted(() => {
     height: 30px;
     font-size: 20px;
     font-weight: bold;
-    color: #ff5733;
+    color: #5cc5df;
     white-space: wrap;
     border-radius: 18px;
-    background-color: rgba(255, 87, 51, 0.4);
+    background-color: rgba(92, 197, 223, 0.4);
 
     .icon {
       width: 11px;
@@ -532,10 +532,10 @@ onUnmounted(() => {
   }
 
   .radio_icon {
-    width: 75px;
+    width: 61px;
     height: 61px;
     background-image: url(@/assets/images/72.png);
-    background-size: cover;
+    background-size: contain;
   }
 }
 

src/views/safe/center/centerSafe.vue

@@ -95,7 +95,7 @@ const list = ref([
     url: img,
   },
   {
-    title: "防火点位",
+    title: "防火 鹰眼点位",
     url: img2,
   },
   {
@@ -164,8 +164,8 @@ const changeIndex = (index: number, item: any) => {
   currentValue.value = item.title;
   if (item.title === "监控点位") {
     pointCount.value = 33;
-  } else if (item.title === "防火点位") {
-    pointCount.value = 3;
+  } else if (item.title === "防火 鹰眼点位") {
+    pointCount.value = 6;
   } else if (item.title === "广播点位") {
     pointCount.value = 11;
   } else if (item.title === "其他点位") {
@@ -180,9 +180,18 @@ const clickMarker = (title: string, type: string) => {
   if (type === "监控点位") {
     currentWatch.value = title;
     showWatch.value = true;
-  } else if (type === "防火点位") {
-    currentFire.value = title;
-    showFire.value = true;
+  } else if (type === "防火 鹰眼点位") {
+    if (
+      title == "中源景区防火" ||
+      title == "三爪仑虎啸峡森林防火" ||
+      title == "宝峰小湾森林防火"
+    ) {
+      currentFire.value = title;
+      showFire.value = true;
+    } else {
+      currentWatch.value = title;
+      showWatch.value = true;
+    }
   } else if (type === "广播点位") {
     currentRadio.value = title;
     showRadio.value = true;
@@ -249,7 +258,7 @@ defineExpose({
     position: absolute;
     right: 0;
     bottom: 197px;
-    width: 320px;
+    width: 322px;
     height: 465px;
 
     .list_box {
@@ -261,7 +270,7 @@ defineExpose({
         display: flex;
         align-items: center;
         padding: 8px;
-        width: 320px;
+        width: 322px;
         height: 88px;
         font-size: 30px;
         font-family: "庞门正道标题体";

src/views/safe/center/watchDetailDialog.vue

@@ -43,6 +43,8 @@
 import { ref, onMounted, onUnmounted } from "vue";
 // 引入监控数据
 import { watchData } from "@/components/map/watchData";
+import { fireproofData } from "@/components/map/fireproofData";
+
 // 引入监控相关的数据接口
 import {
   getVedio,
@@ -159,7 +161,10 @@ const getVideosData = async (url: string) => {
   if (url) {
     res = url;
   } else {
-    const Obj = watchData.find((ele) => ele.title === props.currentWatch);
+    let Obj: any = watchData.find((ele) => ele.title === props.currentWatch);
+    if (!Obj) {
+      Obj = fireproofData.find((ele) => ele.title === props.currentWatch);
+    }
 
     res = await getVedio(Obj?.rtspaddr as string);
   }

src/views/server/center/centerServer.vue

@@ -123,7 +123,7 @@ import { countUpNum } from "@/utils/countUpNum.ts";
 import { reqGetHotelListByName } from "@/api/serve/index";
 
 // 点位总计数据
-const pointCount = ref<number>(11);
+const pointCount = ref<number>(25);
 const pointList = ref<string[]>([]);
 const pointListDom = ref();
 // 切换列表数据
@@ -230,7 +230,7 @@ const changeIndex = (index: number, item: any) => {
   currentIndex.value = index;
   currentValue.value = item.title;
   if (item.title === "民宿") {
-    pointCount.value = 11;
+    pointCount.value = 25;
   } else if (item.title === "厕所") {
     pointCount.value = 21;
   } else if (item.title === "停车场") {

src/views/server/right/latrineScene.vue

@@ -266,7 +266,32 @@ const getToiletDataById = async () => {
 
 // 筛选框切换回调
 const handleChange = (e: any) => {
-  console.log(e);
+  // console.log(e);
+  if (e == 29) {
+    enter_man.value = 29;
+    leave_man.value = 28;
+    stay_man.value = 1;
+
+    enter_woman.value = 38;
+    leave_woman.value = 36;
+    stay_woman.value = 2;
+
+    enter_free.value = 2;
+    leave_free.value = 2;
+    stay_free.value = 0;
+  } else {
+    enter_man.value = 25;
+    leave_man.value = 23;
+    stay_man.value = 2;
+
+    enter_woman.value = 28;
+    leave_woman.value = 25;
+    stay_woman.value = 3;
+
+    enter_free.value = 3;
+    leave_free.value = 3;
+    stay_free.value = 0;
+  }
 };
 </script>