diff --git a/src/api/ywts/shms/jy.js b/src/api/ywts/shms/jy.js
index f3ac251..56f48e3 100644
--- a/src/api/ywts/shms/jy.js
+++ b/src/api/ywts/shms/jy.js
@@ -116,7 +116,7 @@
   return request({
     url: 'zhjy-gktj/zhjy/sbdwlb',
     method: 'post',
-    data,
+    // data,
     params: data
   })
 }

diff --git a/src/api/ywts/shms/jy.js b/src/api/ywts/shms/jy.js
index f3ac251..56f48e3 100644
--- a/src/api/ywts/shms/jy.js
+++ b/src/api/ywts/shms/jy.js
@@ -116,7 +116,7 @@
   return request({
     url: 'zhjy-gktj/zhjy/sbdwlb',
     method: 'post',
-    data,
+    // data,
     params: data
   })
 }
diff --git a/src/pages/ywts/shms/jy/devicePop.vue b/src/pages/ywts/shms/jy/devicePop.vue
new file mode 100644
index 0000000..2c44979
--- /dev/null
+++ b/src/pages/ywts/shms/jy/devicePop.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="bottom"
+    :style="{ left: `${windowPostion.x}px`, top: `${windowPostion.y}px`, height: heightDict[gdInfo.showType] }">
+    <i class="el-icon-close close-pop" @click="$emit('close')" />
+    <div class="list-down" style="width: 100%;margin: 0 auto;">
+      <div class="list-item">
+        <div style="width:100%;">
+          <div style="width: 100%">
+            <i class="item-line one-line" style="width: 100%;"><span>设备名称: {{
+              gdInfo.name }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>设备类型: {{
+              gdInfo.typename }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>设备状态: {{
+              gdInfo.statusName }}</span></i>
+            <i class="item-line one-line" style="width: 100%;" :title="gdInfo.location"><span>设备位置: {{
+              gdInfo.location }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>时间: {{ gdInfo.time
+            }}</span></i>
+            <i class="item-line one-line" v-if="gdInfo.type === '2'" style="width: 100%;"><span>进/出人口数: {{ gdInfo.in
+                }}/{{ gdInfo.out }}</span></i>
+            <i class="item-line one-line" v-if="gdInfo.type === '1'" style="width: 100%;"><span>是否赋能: 否</span></i>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { showPositin } from '@/utils/freedo/index'
+export default {
+  name: 'videoPop',
+  data() {
+    return {
+      titleImg: require('@/assets/images/popup/title.png'), // 背景图片
+      titleAll: require('@/assets/images/popup/title-all.png'),// 背景图片
+      list: ['', '', '', ''],
+      gdInfo: {},
+      windowPostion: { x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+      defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+      statusColor: {
+        1: '#a1a1a1',
+        2: '#f8e31a',
+        3: '#5ab1fc',
+        4: '#f89835',
+        5: '#3def83',
+      },
+      urgencyColor: {
+        'C': '#2f8d00',
+        'B': '#c4ad00',
+        'A': '#8d0000'
+      },
+      heightDict: {
+        normal: '170px',
+        video: '300px'
+      }
+    }
+  },
+  methods: {
+    initData(item) {
+      console.log(item, '弹窗内容')
+      if (!item.lon || !item.lat) { return }
+      showPositin(item.lon, item.lat)
+      item.showType = 'normal'
+      // 弹窗位置
+      if (window.localStorage.getItem('mousePosition')) {
+        this.windowPostion = {
+          x: window.innerWidth / 2 - 165,
+          y: window.innerHeight / 2
+        }
+      }
+      else {
+        this.windowPostion = {
+          x: window.innerWidth / 2 - 165,
+          y: window.innerHeight / 2
+        }
+      }
+      this.gdInfo = item
+      // window.addEventListener('mousemove', (event) => {
+      //   this.windowPostion = {
+      //     x: event.clientX - 165,
+      //     y: event.clientY - 250
+      //   }
+      // })
+    }
+  },
+  // mounted(){
+
+  // }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.children-item {
+  width: 96% !important;
+  margin: 10px auto !important;
+  color: #fff !important;
+  // border: 1px solid #fff;
+  border-radius: 6px;
+  padding: 10px;
+  box-sizing: border-box;
+
+}
+
+.bottom {
+  z-index: 111111111111;
+  width: 100%;
+  height: 160px;
+  width: 27rem;
+  position: absolute;
+  bottom: 10px;
+  left: 0px;
+  display: flex;
+  overflow: hidden;
+  padding: 10px;
+  padding-right: 20px;
+  background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
+  background-size: 100% 100% !important;
+  overflow: hidden;
+
+  .block {
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    background: linear-gradient(to top left, rgba(5, 30, 61, 0.62), #0D3F7E9D);
+    border-radius: 5px;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    margin: 0px 5px;
+    flex-direction: column;
+  }
+
+  .block1 {
+    width: 500px;
+    height: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    background: linear-gradient(to top left, rgba(5, 30, 61, 0.62), #0D3F7E9D);
+    border-radius: 5px;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    margin: 0px 10px;
+    flex-direction: column;
+  }
+
+  .title {
+    text-shadow: 0 0 5px #d1ffff;
+    height: 35px;
+    float: left;
+    text-align: left;
+    background-repeat: no-repeat;
+    -webkit-background-size: 100% 100%;
+    background-size: 100% 100% !important;
+    color: white;
+    font-weight: bold;
+    padding-top: 4px;
+    padding-left: 30px;
+    font-family: 黑体;
+    letter-spacing: 1px;
+  }
+
+  .item-text {
+    text-shadow: 0 0 2px #d1ffff;
+    flex: 1;
+    font-weight: bold;
+    text-align: center;
+    font-size: 18px;
+  }
+
+  .base-map-image {
+    width: 60px;
+    height: 60px;
+  }
+
+  .num {
+    text-shadow: 0 0 5px #ffb441;
+    color: #ffb441;
+    font-size: 20px;
+    padding-top: 2px;
+  }
+
+  .unit {
+    color: #B3F3F6;
+    font-size: 14px;
+    margin-left: 1px;
+  }
+
+  .item {
+    width: 25%;
+    height: 32%;
+    display: flex;
+    justify-content: left;
+    align-items: center;
+  }
+}
+
+.list-down {
+  // margin-top: 10px;
+  // overflow-y: scroll;
+  width: 100%;
+  // height: calc(100% - 6rem);
+  padding: 0px 10px;
+}
+
+.list-item {
+  width: calc(100% - 35px);
+  // height: 12rem;
+  display: flex;
+  justify-content: flex-start;
+  flex-direction: column;
+  flex-wrap: wrap;
+  font-size: 1.4rem;
+  padding: 0.8rem 10px;
+  margin: 0.2rem 0rem;
+  letter-spacing: 2px;
+  cursor: pointer;
+  background-size: 100% 100% !important;
+  color: white;
+  border-top: 2px solid #0494f3;
+  border-radius: 10px;
+}
+
+.list-item:hover {
+  background-size: cover !important;
+  background: url('../../../../assets/images/right/选中.png') !important;
+  background-size: 100% 100% !important;
+}
+
+.item-title {
+  width: 90%;
+  text-align: left;
+  margin-bottom: 5px;
+  white-space: nowrap;
+  /* 防止换行 */
+  overflow: hidden;
+  /* 溢出隐藏 */
+  text-overflow: ellipsis;
+  /* 文本显示为省略号 */
+}
+
+.item-line {
+  display: flex;
+  font-size: 1.2rem;
+  color: #aed2f3;
+  padding-left: 20px;
+  line-height: 1.8rem;
+  width: 95%;
+  word-break: break-all;
+  text-align: left;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* 设置最大行数 */
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.colorbox-text {
+  background-color: #0a88fc;
+  border-radius: 10px;
+  color: white;
+  font-size: 1rem;
+  padding: 0rem 0.4rem;
+  margin-left: 5px;
+  text-align: center;
+  width: 5rem;
+  margin-bottom: 4px;
+  cursor: pointer;
+}
+
+.one-line {
+  display: block !important;
+  white-space: nowrap;
+  /* 防止换行 */
+  overflow: hidden;
+  /* 溢出隐藏 */
+  text-overflow: ellipsis;
+  /* 文本显示为省略号 */
+}
+</style>

diff --git a/src/api/ywts/shms/jy.js b/src/api/ywts/shms/jy.js
index f3ac251..56f48e3 100644
--- a/src/api/ywts/shms/jy.js
+++ b/src/api/ywts/shms/jy.js
@@ -116,7 +116,7 @@
   return request({
     url: 'zhjy-gktj/zhjy/sbdwlb',
     method: 'post',
-    data,
+    // data,
     params: data
   })
 }
diff --git a/src/pages/ywts/shms/jy/devicePop.vue b/src/pages/ywts/shms/jy/devicePop.vue
new file mode 100644
index 0000000..2c44979
--- /dev/null
+++ b/src/pages/ywts/shms/jy/devicePop.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="bottom"
+    :style="{ left: `${windowPostion.x}px`, top: `${windowPostion.y}px`, height: heightDict[gdInfo.showType] }">
+    <i class="el-icon-close close-pop" @click="$emit('close')" />
+    <div class="list-down" style="width: 100%;margin: 0 auto;">
+      <div class="list-item">
+        <div style="width:100%;">
+          <div style="width: 100%">
+            <i class="item-line one-line" style="width: 100%;"><span>设备名称: {{
+              gdInfo.name }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>设备类型: {{
+              gdInfo.typename }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>设备状态: {{
+              gdInfo.statusName }}</span></i>
+            <i class="item-line one-line" style="width: 100%;" :title="gdInfo.location"><span>设备位置: {{
+              gdInfo.location }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>时间: {{ gdInfo.time
+            }}</span></i>
+            <i class="item-line one-line" v-if="gdInfo.type === '2'" style="width: 100%;"><span>进/出人口数: {{ gdInfo.in
+                }}/{{ gdInfo.out }}</span></i>
+            <i class="item-line one-line" v-if="gdInfo.type === '1'" style="width: 100%;"><span>是否赋能: 否</span></i>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { showPositin } from '@/utils/freedo/index'
+export default {
+  name: 'videoPop',
+  data() {
+    return {
+      titleImg: require('@/assets/images/popup/title.png'), // 背景图片
+      titleAll: require('@/assets/images/popup/title-all.png'),// 背景图片
+      list: ['', '', '', ''],
+      gdInfo: {},
+      windowPostion: { x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+      defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+      statusColor: {
+        1: '#a1a1a1',
+        2: '#f8e31a',
+        3: '#5ab1fc',
+        4: '#f89835',
+        5: '#3def83',
+      },
+      urgencyColor: {
+        'C': '#2f8d00',
+        'B': '#c4ad00',
+        'A': '#8d0000'
+      },
+      heightDict: {
+        normal: '170px',
+        video: '300px'
+      }
+    }
+  },
+  methods: {
+    initData(item) {
+      console.log(item, '弹窗内容')
+      if (!item.lon || !item.lat) { return }
+      showPositin(item.lon, item.lat)
+      item.showType = 'normal'
+      // 弹窗位置
+      if (window.localStorage.getItem('mousePosition')) {
+        this.windowPostion = {
+          x: window.innerWidth / 2 - 165,
+          y: window.innerHeight / 2
+        }
+      }
+      else {
+        this.windowPostion = {
+          x: window.innerWidth / 2 - 165,
+          y: window.innerHeight / 2
+        }
+      }
+      this.gdInfo = item
+      // window.addEventListener('mousemove', (event) => {
+      //   this.windowPostion = {
+      //     x: event.clientX - 165,
+      //     y: event.clientY - 250
+      //   }
+      // })
+    }
+  },
+  // mounted(){
+
+  // }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.children-item {
+  width: 96% !important;
+  margin: 10px auto !important;
+  color: #fff !important;
+  // border: 1px solid #fff;
+  border-radius: 6px;
+  padding: 10px;
+  box-sizing: border-box;
+
+}
+
+.bottom {
+  z-index: 111111111111;
+  width: 100%;
+  height: 160px;
+  width: 27rem;
+  position: absolute;
+  bottom: 10px;
+  left: 0px;
+  display: flex;
+  overflow: hidden;
+  padding: 10px;
+  padding-right: 20px;
+  background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
+  background-size: 100% 100% !important;
+  overflow: hidden;
+
+  .block {
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    background: linear-gradient(to top left, rgba(5, 30, 61, 0.62), #0D3F7E9D);
+    border-radius: 5px;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    margin: 0px 5px;
+    flex-direction: column;
+  }
+
+  .block1 {
+    width: 500px;
+    height: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    background: linear-gradient(to top left, rgba(5, 30, 61, 0.62), #0D3F7E9D);
+    border-radius: 5px;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    margin: 0px 10px;
+    flex-direction: column;
+  }
+
+  .title {
+    text-shadow: 0 0 5px #d1ffff;
+    height: 35px;
+    float: left;
+    text-align: left;
+    background-repeat: no-repeat;
+    -webkit-background-size: 100% 100%;
+    background-size: 100% 100% !important;
+    color: white;
+    font-weight: bold;
+    padding-top: 4px;
+    padding-left: 30px;
+    font-family: 黑体;
+    letter-spacing: 1px;
+  }
+
+  .item-text {
+    text-shadow: 0 0 2px #d1ffff;
+    flex: 1;
+    font-weight: bold;
+    text-align: center;
+    font-size: 18px;
+  }
+
+  .base-map-image {
+    width: 60px;
+    height: 60px;
+  }
+
+  .num {
+    text-shadow: 0 0 5px #ffb441;
+    color: #ffb441;
+    font-size: 20px;
+    padding-top: 2px;
+  }
+
+  .unit {
+    color: #B3F3F6;
+    font-size: 14px;
+    margin-left: 1px;
+  }
+
+  .item {
+    width: 25%;
+    height: 32%;
+    display: flex;
+    justify-content: left;
+    align-items: center;
+  }
+}
+
+.list-down {
+  // margin-top: 10px;
+  // overflow-y: scroll;
+  width: 100%;
+  // height: calc(100% - 6rem);
+  padding: 0px 10px;
+}
+
+.list-item {
+  width: calc(100% - 35px);
+  // height: 12rem;
+  display: flex;
+  justify-content: flex-start;
+  flex-direction: column;
+  flex-wrap: wrap;
+  font-size: 1.4rem;
+  padding: 0.8rem 10px;
+  margin: 0.2rem 0rem;
+  letter-spacing: 2px;
+  cursor: pointer;
+  background-size: 100% 100% !important;
+  color: white;
+  border-top: 2px solid #0494f3;
+  border-radius: 10px;
+}
+
+.list-item:hover {
+  background-size: cover !important;
+  background: url('../../../../assets/images/right/选中.png') !important;
+  background-size: 100% 100% !important;
+}
+
+.item-title {
+  width: 90%;
+  text-align: left;
+  margin-bottom: 5px;
+  white-space: nowrap;
+  /* 防止换行 */
+  overflow: hidden;
+  /* 溢出隐藏 */
+  text-overflow: ellipsis;
+  /* 文本显示为省略号 */
+}
+
+.item-line {
+  display: flex;
+  font-size: 1.2rem;
+  color: #aed2f3;
+  padding-left: 20px;
+  line-height: 1.8rem;
+  width: 95%;
+  word-break: break-all;
+  text-align: left;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* 设置最大行数 */
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.colorbox-text {
+  background-color: #0a88fc;
+  border-radius: 10px;
+  color: white;
+  font-size: 1rem;
+  padding: 0rem 0.4rem;
+  margin-left: 5px;
+  text-align: center;
+  width: 5rem;
+  margin-bottom: 4px;
+  cursor: pointer;
+}
+
+.one-line {
+  display: block !important;
+  white-space: nowrap;
+  /* 防止换行 */
+  overflow: hidden;
+  /* 溢出隐藏 */
+  text-overflow: ellipsis;
+  /* 文本显示为省略号 */
+}
+</style>
diff --git a/src/pages/ywts/shms/jy/index.vue b/src/pages/ywts/shms/jy/index.vue
index b1eb984..1293f28 100644
--- a/src/pages/ywts/shms/jy/index.vue
+++ b/src/pages/ywts/shms/jy/index.vue
@@ -11,6 +11,8 @@
         @click="selectIndex = 'keywordBtn'" @localPoint="localPoint" />
     </div>
     <school-pop ref="schoolPop" v-if="isShow" @close="isShow = false" />
+    <!-- 信息窗体 -->
+    <devicePop ref="deviceRef" v-if="showDevice" @close="showDevice = false" />
   </div>
 </template>
 
@@ -29,13 +31,15 @@
 import mapJson from "@/assets/mapJson/map.json";
 import modelJson from "@/assets/mapJson/school.json";
 import { eventBus } from "../../../../main";
+import devicePop from './devicePop.vue'
 
 export default {
   name: 'Jy',
-  components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+  components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn, devicePop },
   data() {
     return {
       isShow: false,
+      showDevice: false,
       ktSelect: '',
       keyword: '',
       keywordList: [],
@@ -56,10 +60,15 @@
       },
       menus: {
         device: [
-          { type: "1", typename: "视频设备", total: "111" },
-          { type: "2", typename: "门禁设备", total: "111" }
+          { type: "1", typename: "视频设备", total: "0" },
+          { type: "2", typename: "门禁设备", total: "0" }
         ]
-      }
+      },
+      markerList: [],
+      markerBakList: [],
+      videoIcon: require('@/assets/images/icon/视频云/枪机未赋能在线.png'),
+      controlIcon: require('@/assets/images/icon/一卡通/门禁.png'),
+
     }
   },
   mounted() {
@@ -194,10 +203,109 @@
     },
     // 搜索学校设备
     searchDevice() {
-      getDevice({}).then(res => {
-        console.log('学校数据')
+      getDevice({ keywords: '' }).then(res => {
+        this.markerList = [
+          {
+            "name": "设备1",
+            "lon": "114.859995",
+            "location": "江西省赣州市南康区三江乡",
+            "id": "1676397864375291905",
+            "lat": "25.802129",
+            "type": "1",
+            "typename": "视频设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备2",
+            "lon": "114.861027",
+            "location": "江西省赣州市章贡区潭六路135号靠近逸夫小学",
+            "id": "1676398916763914241",
+            "lat": "25.757553",
+            "type": "2",
+            "typename": "门禁设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备3",
+            "lon": "114.880246",
+            "location": "江西省赣州市章贡区潭东镇弘腾路毅德城",
+            "id": "1676414593390350337",
+            "lat": "25.753119",
+            "type": "1",
+            "typename": "视频设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备4",
+            "lon": "114.879855",
+            "location": "江西省赣州市章贡区潭东镇弘腾路毅德城",
+            "id": "1676414955455254529",
+            "lat": "25.752771",
+            "type": "1",
+            "typename": "视频设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备5",
+            "lon": "114.875438",
+            "location": "江西省赣州市章贡区潭东镇弘腾路毅德城",
+            "id": "1676418661630349312",
+            "lat": "25.748733",
+            "type": "2",
+            "typename": "门禁设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备6",
+            "lon": "114.867371",
+            "location": "江西省赣州市章贡区105国道135号靠近松岭上",
+            "id": "1676422908220542977",
+            "lat": "25.750388",
+            "typename": "2",
+            "typename": "门禁设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+        ]
+        this.markerBakList = JSON.parse(JSON.stringify(this.markerList))
+        this.menus.device[0].total = this.markerList.filter((item) => item.type === '1').length
+        this.menus.device[1].total = this.markerList.filter((item) => item.type === '2').length
+        // 绘制点位
+        this.markerList.forEach((item) => {
+          AddLabelPoint(
+            item.id,
+            `${item.name}`,
+            item.type === '1' ? this.videoIcon : this.controlIcon,
+            [item.lon, item.lat, 0], 'yl-dev', item,
+            this.clickDevice)
+        })
       })
-    }
+    },
+    // 设备点位点击
+    clickDevice(eventArg) {
+      const item = eventArg._data.data
+      this.showDevice = true
+      this.$nextTick(() => {
+        this.$refs.deviceRef.initData(item)
+      })
+    },
   }
 }
 </script>

diff --git a/src/api/ywts/shms/jy.js b/src/api/ywts/shms/jy.js
index f3ac251..56f48e3 100644
--- a/src/api/ywts/shms/jy.js
+++ b/src/api/ywts/shms/jy.js
@@ -116,7 +116,7 @@
   return request({
     url: 'zhjy-gktj/zhjy/sbdwlb',
     method: 'post',
-    data,
+    // data,
     params: data
   })
 }
diff --git a/src/pages/ywts/shms/jy/devicePop.vue b/src/pages/ywts/shms/jy/devicePop.vue
new file mode 100644
index 0000000..2c44979
--- /dev/null
+++ b/src/pages/ywts/shms/jy/devicePop.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="bottom"
+    :style="{ left: `${windowPostion.x}px`, top: `${windowPostion.y}px`, height: heightDict[gdInfo.showType] }">
+    <i class="el-icon-close close-pop" @click="$emit('close')" />
+    <div class="list-down" style="width: 100%;margin: 0 auto;">
+      <div class="list-item">
+        <div style="width:100%;">
+          <div style="width: 100%">
+            <i class="item-line one-line" style="width: 100%;"><span>设备名称: {{
+              gdInfo.name }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>设备类型: {{
+              gdInfo.typename }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>设备状态: {{
+              gdInfo.statusName }}</span></i>
+            <i class="item-line one-line" style="width: 100%;" :title="gdInfo.location"><span>设备位置: {{
+              gdInfo.location }}</span></i>
+            <i class="item-line one-line" style="width: 100%;"><span>时间: {{ gdInfo.time
+            }}</span></i>
+            <i class="item-line one-line" v-if="gdInfo.type === '2'" style="width: 100%;"><span>进/出人口数: {{ gdInfo.in
+                }}/{{ gdInfo.out }}</span></i>
+            <i class="item-line one-line" v-if="gdInfo.type === '1'" style="width: 100%;"><span>是否赋能: 否</span></i>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { showPositin } from '@/utils/freedo/index'
+export default {
+  name: 'videoPop',
+  data() {
+    return {
+      titleImg: require('@/assets/images/popup/title.png'), // 背景图片
+      titleAll: require('@/assets/images/popup/title-all.png'),// 背景图片
+      list: ['', '', '', ''],
+      gdInfo: {},
+      windowPostion: { x: window.innerWidth - 165, y: window.innerHeight }, // 弹窗的位置
+      defaultPhoto: require('@/assets/images/global_images/photo_error.png'),
+      statusColor: {
+        1: '#a1a1a1',
+        2: '#f8e31a',
+        3: '#5ab1fc',
+        4: '#f89835',
+        5: '#3def83',
+      },
+      urgencyColor: {
+        'C': '#2f8d00',
+        'B': '#c4ad00',
+        'A': '#8d0000'
+      },
+      heightDict: {
+        normal: '170px',
+        video: '300px'
+      }
+    }
+  },
+  methods: {
+    initData(item) {
+      console.log(item, '弹窗内容')
+      if (!item.lon || !item.lat) { return }
+      showPositin(item.lon, item.lat)
+      item.showType = 'normal'
+      // 弹窗位置
+      if (window.localStorage.getItem('mousePosition')) {
+        this.windowPostion = {
+          x: window.innerWidth / 2 - 165,
+          y: window.innerHeight / 2
+        }
+      }
+      else {
+        this.windowPostion = {
+          x: window.innerWidth / 2 - 165,
+          y: window.innerHeight / 2
+        }
+      }
+      this.gdInfo = item
+      // window.addEventListener('mousemove', (event) => {
+      //   this.windowPostion = {
+      //     x: event.clientX - 165,
+      //     y: event.clientY - 250
+      //   }
+      // })
+    }
+  },
+  // mounted(){
+
+  // }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.children-item {
+  width: 96% !important;
+  margin: 10px auto !important;
+  color: #fff !important;
+  // border: 1px solid #fff;
+  border-radius: 6px;
+  padding: 10px;
+  box-sizing: border-box;
+
+}
+
+.bottom {
+  z-index: 111111111111;
+  width: 100%;
+  height: 160px;
+  width: 27rem;
+  position: absolute;
+  bottom: 10px;
+  left: 0px;
+  display: flex;
+  overflow: hidden;
+  padding: 10px;
+  padding-right: 20px;
+  background: url("../../../../assets/images/popup/case/事件看板背景.png") !important;
+  background-size: 100% 100% !important;
+  overflow: hidden;
+
+  .block {
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    background: linear-gradient(to top left, rgba(5, 30, 61, 0.62), #0D3F7E9D);
+    border-radius: 5px;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    margin: 0px 5px;
+    flex-direction: column;
+  }
+
+  .block1 {
+    width: 500px;
+    height: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    background: linear-gradient(to top left, rgba(5, 30, 61, 0.62), #0D3F7E9D);
+    border-radius: 5px;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    margin: 0px 10px;
+    flex-direction: column;
+  }
+
+  .title {
+    text-shadow: 0 0 5px #d1ffff;
+    height: 35px;
+    float: left;
+    text-align: left;
+    background-repeat: no-repeat;
+    -webkit-background-size: 100% 100%;
+    background-size: 100% 100% !important;
+    color: white;
+    font-weight: bold;
+    padding-top: 4px;
+    padding-left: 30px;
+    font-family: 黑体;
+    letter-spacing: 1px;
+  }
+
+  .item-text {
+    text-shadow: 0 0 2px #d1ffff;
+    flex: 1;
+    font-weight: bold;
+    text-align: center;
+    font-size: 18px;
+  }
+
+  .base-map-image {
+    width: 60px;
+    height: 60px;
+  }
+
+  .num {
+    text-shadow: 0 0 5px #ffb441;
+    color: #ffb441;
+    font-size: 20px;
+    padding-top: 2px;
+  }
+
+  .unit {
+    color: #B3F3F6;
+    font-size: 14px;
+    margin-left: 1px;
+  }
+
+  .item {
+    width: 25%;
+    height: 32%;
+    display: flex;
+    justify-content: left;
+    align-items: center;
+  }
+}
+
+.list-down {
+  // margin-top: 10px;
+  // overflow-y: scroll;
+  width: 100%;
+  // height: calc(100% - 6rem);
+  padding: 0px 10px;
+}
+
+.list-item {
+  width: calc(100% - 35px);
+  // height: 12rem;
+  display: flex;
+  justify-content: flex-start;
+  flex-direction: column;
+  flex-wrap: wrap;
+  font-size: 1.4rem;
+  padding: 0.8rem 10px;
+  margin: 0.2rem 0rem;
+  letter-spacing: 2px;
+  cursor: pointer;
+  background-size: 100% 100% !important;
+  color: white;
+  border-top: 2px solid #0494f3;
+  border-radius: 10px;
+}
+
+.list-item:hover {
+  background-size: cover !important;
+  background: url('../../../../assets/images/right/选中.png') !important;
+  background-size: 100% 100% !important;
+}
+
+.item-title {
+  width: 90%;
+  text-align: left;
+  margin-bottom: 5px;
+  white-space: nowrap;
+  /* 防止换行 */
+  overflow: hidden;
+  /* 溢出隐藏 */
+  text-overflow: ellipsis;
+  /* 文本显示为省略号 */
+}
+
+.item-line {
+  display: flex;
+  font-size: 1.2rem;
+  color: #aed2f3;
+  padding-left: 20px;
+  line-height: 1.8rem;
+  width: 95%;
+  word-break: break-all;
+  text-align: left;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* 设置最大行数 */
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.colorbox-text {
+  background-color: #0a88fc;
+  border-radius: 10px;
+  color: white;
+  font-size: 1rem;
+  padding: 0rem 0.4rem;
+  margin-left: 5px;
+  text-align: center;
+  width: 5rem;
+  margin-bottom: 4px;
+  cursor: pointer;
+}
+
+.one-line {
+  display: block !important;
+  white-space: nowrap;
+  /* 防止换行 */
+  overflow: hidden;
+  /* 溢出隐藏 */
+  text-overflow: ellipsis;
+  /* 文本显示为省略号 */
+}
+</style>
diff --git a/src/pages/ywts/shms/jy/index.vue b/src/pages/ywts/shms/jy/index.vue
index b1eb984..1293f28 100644
--- a/src/pages/ywts/shms/jy/index.vue
+++ b/src/pages/ywts/shms/jy/index.vue
@@ -11,6 +11,8 @@
         @click="selectIndex = 'keywordBtn'" @localPoint="localPoint" />
     </div>
     <school-pop ref="schoolPop" v-if="isShow" @close="isShow = false" />
+    <!-- 信息窗体 -->
+    <devicePop ref="deviceRef" v-if="showDevice" @close="showDevice = false" />
   </div>
 </template>
 
@@ -29,13 +31,15 @@
 import mapJson from "@/assets/mapJson/map.json";
 import modelJson from "@/assets/mapJson/school.json";
 import { eventBus } from "../../../../main";
+import devicePop from './devicePop.vue'
 
 export default {
   name: 'Jy',
-  components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn },
+  components: { SchoolPop, TimeManager, KeywordManager, LayerManagerMix, CommonBtn, devicePop },
   data() {
     return {
       isShow: false,
+      showDevice: false,
       ktSelect: '',
       keyword: '',
       keywordList: [],
@@ -56,10 +60,15 @@
       },
       menus: {
         device: [
-          { type: "1", typename: "视频设备", total: "111" },
-          { type: "2", typename: "门禁设备", total: "111" }
+          { type: "1", typename: "视频设备", total: "0" },
+          { type: "2", typename: "门禁设备", total: "0" }
         ]
-      }
+      },
+      markerList: [],
+      markerBakList: [],
+      videoIcon: require('@/assets/images/icon/视频云/枪机未赋能在线.png'),
+      controlIcon: require('@/assets/images/icon/一卡通/门禁.png'),
+
     }
   },
   mounted() {
@@ -194,10 +203,109 @@
     },
     // 搜索学校设备
     searchDevice() {
-      getDevice({}).then(res => {
-        console.log('学校数据')
+      getDevice({ keywords: '' }).then(res => {
+        this.markerList = [
+          {
+            "name": "设备1",
+            "lon": "114.859995",
+            "location": "江西省赣州市南康区三江乡",
+            "id": "1676397864375291905",
+            "lat": "25.802129",
+            "type": "1",
+            "typename": "视频设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备2",
+            "lon": "114.861027",
+            "location": "江西省赣州市章贡区潭六路135号靠近逸夫小学",
+            "id": "1676398916763914241",
+            "lat": "25.757553",
+            "type": "2",
+            "typename": "门禁设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备3",
+            "lon": "114.880246",
+            "location": "江西省赣州市章贡区潭东镇弘腾路毅德城",
+            "id": "1676414593390350337",
+            "lat": "25.753119",
+            "type": "1",
+            "typename": "视频设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备4",
+            "lon": "114.879855",
+            "location": "江西省赣州市章贡区潭东镇弘腾路毅德城",
+            "id": "1676414955455254529",
+            "lat": "25.752771",
+            "type": "1",
+            "typename": "视频设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备5",
+            "lon": "114.875438",
+            "location": "江西省赣州市章贡区潭东镇弘腾路毅德城",
+            "id": "1676418661630349312",
+            "lat": "25.748733",
+            "type": "2",
+            "typename": "门禁设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+          {
+            "name": "设备6",
+            "lon": "114.867371",
+            "location": "江西省赣州市章贡区105国道135号靠近松岭上",
+            "id": "1676422908220542977",
+            "lat": "25.750388",
+            "typename": "2",
+            "typename": "门禁设备",
+            statusName: '正常',
+            time: '2025-06-16 09:05:05',
+            in: '0',
+            out: '0',
+          },
+        ]
+        this.markerBakList = JSON.parse(JSON.stringify(this.markerList))
+        this.menus.device[0].total = this.markerList.filter((item) => item.type === '1').length
+        this.menus.device[1].total = this.markerList.filter((item) => item.type === '2').length
+        // 绘制点位
+        this.markerList.forEach((item) => {
+          AddLabelPoint(
+            item.id,
+            `${item.name}`,
+            item.type === '1' ? this.videoIcon : this.controlIcon,
+            [item.lon, item.lat, 0], 'yl-dev', item,
+            this.clickDevice)
+        })
       })
-    }
+    },
+    // 设备点位点击
+    clickDevice(eventArg) {
+      const item = eventArg._data.data
+      this.showDevice = true
+      this.$nextTick(() => {
+        this.$refs.deviceRef.initData(item)
+      })
+    },
   }
 }
 </script>
diff --git a/src/pages/ywts/zyhj/hb/index.vue b/src/pages/ywts/zyhj/hb/index.vue
index 974bbf1..cb6936a 100644
--- a/src/pages/ywts/zyhj/hb/index.vue
+++ b/src/pages/ywts/zyhj/hb/index.vue
@@ -120,6 +120,17 @@
     },
     menuClick(e) {
       console.log(e, 'e')
+      clearResetMap()
+      this.markerList = this.markerListBak.filter(item => item.typename === e.type)
+      console.log(this.markerList)
+      this.markerList.forEach((item) => {
+        AddLabelPoint(
+          item.id,
+          `${item.name}`,
+          undefined,
+          [item.lon, item.lat, 0], 'yl-dev', item,
+          this.clickMarker)
+      })
     },
     // 获取概括统计
     fetchData() {