diff --git a/src/api/ywts/cszl/gw.js b/src/api/ywts/cszl/gw.js
index f5dc2bf..8c89c12 100644
--- a/src/api/ywts/cszl/gw.js
+++ b/src/api/ywts/cszl/gw.js
@@ -19,3 +19,13 @@
     params: data
   });
 }
+
+// 智慧管网-管网物联设备点位列表
+export function getAlarmList(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/wlgjlbfy",
+    method: "post",
+    data,
+    params: data
+  });
+}

diff --git a/src/api/ywts/cszl/gw.js b/src/api/ywts/cszl/gw.js
index f5dc2bf..8c89c12 100644
--- a/src/api/ywts/cszl/gw.js
+++ b/src/api/ywts/cszl/gw.js
@@ -19,3 +19,13 @@
     params: data
   });
 }
+
+// 智慧管网-管网物联设备点位列表
+export function getAlarmList(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/wlgjlbfy",
+    method: "post",
+    data,
+    params: data
+  });
+}
diff --git "a/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png" "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
new file mode 100644
index 0000000..bacd6e7
--- /dev/null
+++ "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
Binary files differ

diff --git a/src/api/ywts/cszl/gw.js b/src/api/ywts/cszl/gw.js
index f5dc2bf..8c89c12 100644
--- a/src/api/ywts/cszl/gw.js
+++ b/src/api/ywts/cszl/gw.js
@@ -19,3 +19,13 @@
     params: data
   });
 }
+
+// 智慧管网-管网物联设备点位列表
+export function getAlarmList(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/wlgjlbfy",
+    method: "post",
+    data,
+    params: data
+  });
+}
diff --git "a/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png" "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
new file mode 100644
index 0000000..bacd6e7
--- /dev/null
+++ "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
Binary files differ
diff --git a/src/pages/ywts/cszl/gw/alarmPop.vue b/src/pages/ywts/cszl/gw/alarmPop.vue
new file mode 100644
index 0000000..02af7d8
--- /dev/null
+++ b/src/pages/ywts/cszl/gw/alarmPop.vue
@@ -0,0 +1,264 @@
+<template>
+  <div class="bottom" :style="{ left: `${windowPostion.x}px`, top: `${windowPostion.y}px`, height: heightDict[gwAlarmInfo.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="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">编号: {{ gwAlarmInfo.code || '--' }}</span></i> -->
+            <i class="el-icon-office-building item-line one-line" style="width: 100%;"><span style="margin-left: 5px">名称: {{ gwAlarmInfo.devicetypename }}</span></i>
+            <i class="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">状态: {{ gwAlarmInfo.alarmstatusname }}</span></i>
+            <i class="el-icon-location item-line one-line" style="width: 100%;" ><span style="margin-left: 5px">位置: {{ gwAlarmInfo.location }}</span></i>
+            <i class="el-icon-news item-line one-line" style="width: 100%;"><span style="margin-left: 5px">告警内容: {{ gwAlarmInfo.alarmcontent || '--' }}</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: ['', '', '', ''],
+      gwAlarmInfo: {},
+      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: '135px',
+        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.gwAlarmInfo = item
+    }
+  },
+}
+</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/cszl/gw.js b/src/api/ywts/cszl/gw.js
index f5dc2bf..8c89c12 100644
--- a/src/api/ywts/cszl/gw.js
+++ b/src/api/ywts/cszl/gw.js
@@ -19,3 +19,13 @@
     params: data
   });
 }
+
+// 智慧管网-管网物联设备点位列表
+export function getAlarmList(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/wlgjlbfy",
+    method: "post",
+    data,
+    params: data
+  });
+}
diff --git "a/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png" "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
new file mode 100644
index 0000000..bacd6e7
--- /dev/null
+++ "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
Binary files differ
diff --git a/src/pages/ywts/cszl/gw/alarmPop.vue b/src/pages/ywts/cszl/gw/alarmPop.vue
new file mode 100644
index 0000000..02af7d8
--- /dev/null
+++ b/src/pages/ywts/cszl/gw/alarmPop.vue
@@ -0,0 +1,264 @@
+<template>
+  <div class="bottom" :style="{ left: `${windowPostion.x}px`, top: `${windowPostion.y}px`, height: heightDict[gwAlarmInfo.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="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">编号: {{ gwAlarmInfo.code || '--' }}</span></i> -->
+            <i class="el-icon-office-building item-line one-line" style="width: 100%;"><span style="margin-left: 5px">名称: {{ gwAlarmInfo.devicetypename }}</span></i>
+            <i class="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">状态: {{ gwAlarmInfo.alarmstatusname }}</span></i>
+            <i class="el-icon-location item-line one-line" style="width: 100%;" ><span style="margin-left: 5px">位置: {{ gwAlarmInfo.location }}</span></i>
+            <i class="el-icon-news item-line one-line" style="width: 100%;"><span style="margin-left: 5px">告警内容: {{ gwAlarmInfo.alarmcontent || '--' }}</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: ['', '', '', ''],
+      gwAlarmInfo: {},
+      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: '135px',
+        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.gwAlarmInfo = item
+    }
+  },
+}
+</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/cszl/gw/index.vue b/src/pages/ywts/cszl/gw/index.vue
index aad4675..b227543 100644
--- a/src/pages/ywts/cszl/gw/index.vue
+++ b/src/pages/ywts/cszl/gw/index.vue
@@ -3,13 +3,14 @@
   <div>
     <div class="video-menu">
       <layer-manager-mix title="物联设备" :isNeedIcon="false" :layer="dev" :layer-hover="devHover" :menu-tab="menuTab" :menus="menus" :select="selectIndex==='layerBtn'" @btnClick="btnClick" @menuClick="menuClick"/>
-      <common-btn id="healthBtn" :select="selectIndex==='healthBtn'" :bg="health" :bg-hover="healthHover" width="5" height="5" text-hover="健康评分" @click="btnClick" />
-      <common-btn id="alarmBtn" :select="selectIndex==='alarmBtn'" :bg="alarmBg" :bg-hover="alarmHover" width="5" height="5" text-hover="管网告警" @click="btnClick" />
-      <common-btn id="caseBtn" :select="selectIndex==='caseBtn'" :bg="caseBg" :bg-hover="caseHover" width="5" height="5" text-hover="管网事件" @click="btnClick" />
+      <common-btn id="healthBtn" :select="selectIndex==='healthBtn'" :bg="health" :bg-hover="healthHover" width="5" height="5" text-hover="健康评分" @click="handleClickButton('score')" />
+      <common-btn id="alarmBtn" :select="selectIndex==='alarmBtn'" :bg="alarmBg" :bg-hover="alarmHover" width="5" height="5" text-hover="管网告警" @click="handleClickButton('alarm')" />
+      <common-btn id="caseBtn" :select="selectIndex==='caseBtn'" :bg="caseBg" :bg-hover="caseHover" width="5" height="5" text-hover="管网事件" @click="handleClickButton('event')" />
     </div>
     <!-- <list-page title="监测事件" :list="caseList" :query="caseListQuery" :total="caseTotal" @change="changePage" v-show="isListPage"  @close="isListPage=false"/> -->
     <!-- 信息窗体 -->
     <Pop ref="pop" v-if="showPop" @close="showPop = false" />
+    <AlarmPop ref="alarmPopRef" v-if="showAlarmPop" @close="showAlarmPop = false" />
   </div>
 </template>
 
@@ -26,22 +27,24 @@
 } from "../../../../api/ywts/cszl/gd";
 import {
   getStatistics,
-  getArea
+  getArea,
+  getAlarmList
 } from "../../../../api/ywts/cszl/gw";
 import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
 import ListPage from "@/components/ListPage";
-import Pop from "./pop.vue";
-import { TEXT_STYLE_OPTIONS } from "echarts/lib/util/model";
+import Pop from "./popup.vue";
+import AlarmPop from "./alarmPop.vue";
 
 export default {
   name: 'Gw',
-  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop},
+  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop, AlarmPop},
   // components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
   data() {
     return {
       isListPage: false,
       isShow: false,
       showPop: false,
+      showAlarmPop: false, // 是否显示报警点位的popup
       listQuery: {
         deviceType: '',
         startTime: '',
@@ -92,18 +95,10 @@
         name: '物联设备',
         value: 'device'
       }
-      // , {
-      //   name: '环监设备',
-      //   value: 'others'
-      // }
       ],
       menus: {
         device: [
         ],
-        // others: [
-        //   {type : "1", typename: "****设备", total: "111"},
-        //   {type : "2", typename: "****设备", total: "111"}
-        // ]
       }
     }
   },
@@ -113,9 +108,11 @@
     getStatistics().then(response => {
       if(response.code === 200) {
         this.menus.device = response.data.value
+        if(response.data.value && Array.isArray(response.data.value) && response.data.value.length) {
+          this.search(response.data.value[0].type)
+        }
       }
     })
-    this.search()
   },
   methods: {
     async btnClick(e) {
@@ -131,60 +128,69 @@
           break
       }
     },
+    // 点击按钮
+    handleClickButton(type) {
+      clearUpMap()
+      switch (type) {
+        case "alarm": // 点击管网告警
+          this.fetchAlarmList()
+          break
+      }
+    },
     // 查询管网物联设备点位
-    search() {
+    search(type = '') {
       const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
       const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
-      // getArea({
-      //   deviceType: '',
-      //   startTime: '',
-      //   endTime: '',
-      //   isAlarm: '',
-      //   hasOrder: '',
-      //   keywords: '',
-      // }).then(response => {
-      //   if(response.code === 200) {
-      //     clearUpMap()
-      //     response.data.value.forEach(item => {
-      //       // console.log(item.areaboundary)
-      //       // todo : 画范围
-      //       AddLabelPoint(
-      //         item.id,
-      //         item.name,
-      //         item.deviceStatus === '2' ? iconDoing: iconDone,
-      //         [item.lon, item.lat, 0], 'gw', item,
-      //         this.clickGw)
-      //     })
-      //   }
-      // })
-        const res = {
-        data: {
-          value: [
-            {
-              id: '1',
-              name: '111',
-              deviceStatus: '2',
-              lon: '114.87665',
-              lat: '25.76418',
-            },
-            {
-              id: '2',
-              name: '122211',
-              deviceStatus: '1',
-              lon: '114.87365',
-              lat: '25.76118',
-            }
-          ]
-        }}
-        const tempData = res.data.value
-        tempData.forEach(item => {
-          AddLabelPoint(
-            item.id,
-            item.name,
-            item.deviceStatus === '2' ? iconDoing : iconDone,
-            [item.lon, item.lat, 0], 'gw', item,
-            this.clickMarker)
-        })
+      getArea({
+        deviceType: type,
+        startTime: '',
+        endTime: '',
+        isAlarm: '',
+        hasOrder: '',
+        keywords: '',
+      }).then(response => {
+        if(response.code === 200) {
+          clearUpMap()
+          response.data.value.forEach(item => {
+            // console.log(item.areaboundary)
+            // todo : 画范围
+            AddLabelPoint(
+              item.id,
+              item.name,
+              item.deviceStatus === '2' ? iconDoing: iconDone,
+              [item.lon, item.lat, 0], 'gw', item,
+              this.clickGw)
+          })
+        }
+      })
+        // const res = {
+        // data: {
+        //   value: [
+        //     {
+        //       id: '1',
+        //       name: '111',
+        //       deviceStatus: '2',
+        //       lon: '114.87665',
+        //       lat: '25.76418',
+        //     },
+        //     {
+        //       id: '2',
+        //       name: '122211',
+        //       deviceStatus: '1',
+        //       lon: '114.87365',
+        //       lat: '25.76118',
+        //     }
+        //   ]
+        // }}
+        // const tempData = res.data.value
+        // tempData.forEach(item => {
+        //   AddLabelPoint(
+        //     item.id,
+        //     item.name,
+        //     item.deviceStatus === '2' ? iconDoing : iconDone,
+        //     [item.lon, item.lat, 0], 'gw', item,
+        //     this.clickMarker)
+        // })
     },
     // 点击icon事件
     clickGw(eventArg) {
@@ -219,7 +225,94 @@
     menuClick(e) {
       console.log(e, 'menuClick')
       clearResetMap()
-      this.search()
+      this.search(e.type.trim())
+    },
+    // ----------------------------------------管网告警------------------------------------------
+    // 获取官网告警列表
+    fetchAlarmList() {
+      const icon = require('@/assets/images/icon/智慧管网/alarm.png')
+      const params = {
+        pageNo: 1,
+        pageSize: 10,
+        startTime: '',
+        endTime: '',
+        keywords: '',
+      }
+      getAlarmList(params).then(response => {
+        if(response.code === 200) {
+          clearUpMap()
+          response.data.value.forEach(item => {
+            AddLabelPoint(
+              item.id,
+              item.devicetypename,
+              icon,
+              [item.lon, item.lat, 0], 'gw', item,
+              this.clickAlarmMarker)
+          })
+        }
+      })
+      const temp = [
+        {
+          createtime:"2023-04-18 06:01:42",
+          code:null,
+          orderid:null,
+          alarmstatusname:"历史告警",
+          alarmcontent:null,
+          lotid:"112021020027",
+          lon:"114.87665",
+          devicetype:"5",
+          alarmstatus:"0",
+          imgurl:null,
+          location:"刺桐路",
+          id:"1353824",
+          devicetypename:"液位监测仪",
+          lat:"25.76418",
+        },
+        {
+          createtime:"2023-04-18 06:01:38",
+          code:null,
+          orderid:null,
+          alarmstatusname:"历史告警",
+          alarmcontent:null,
+          lotid:"112019020098",
+          lon:"114.899962",
+          devicetype:"5",
+          alarmstatus:"0",
+          imgurl:null,
+          location:"佳辰路",
+          id:"1353818",
+          devicetypename:"液位监测仪",
+          lat:"25.807828",
+        }
+      ]
+      // temp.forEach(item => {
+      //       AddLabelPoint(
+      //         item.id,
+      //         item.devicetypename,
+      //         icon,
+      //         [item.lon, item.lat, 0], 'gw', item,
+      //         this.clickAlarmMarker)
+      //   })
+    },
+    // 点击点位
+    clickAlarmMarker(eventArg) {
+      const showAlarmPop = (e) => {
+        const item = e._data.data
+        this.showAlarmPop = true
+        this.$nextTick(() => {
+          console.log('ppp[p]', item);
+          this.$refs.alarmPopRef.initData(item)
+        })
+      }
+      if (this.showAlarmPop) {
+        this.showAlarmPop = false
+        setTimeout(() => {
+          showAlarmPop(eventArg)
+        }, 100);
+      }
+      else {
+        showAlarmPop(eventArg)
+      }
     },
   }
 }

diff --git a/src/api/ywts/cszl/gw.js b/src/api/ywts/cszl/gw.js
index f5dc2bf..8c89c12 100644
--- a/src/api/ywts/cszl/gw.js
+++ b/src/api/ywts/cszl/gw.js
@@ -19,3 +19,13 @@
     params: data
   });
 }
+
+// 智慧管网-管网物联设备点位列表
+export function getAlarmList(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/wlgjlbfy",
+    method: "post",
+    data,
+    params: data
+  });
+}
diff --git "a/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png" "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
new file mode 100644
index 0000000..bacd6e7
--- /dev/null
+++ "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
Binary files differ
diff --git a/src/pages/ywts/cszl/gw/alarmPop.vue b/src/pages/ywts/cszl/gw/alarmPop.vue
new file mode 100644
index 0000000..02af7d8
--- /dev/null
+++ b/src/pages/ywts/cszl/gw/alarmPop.vue
@@ -0,0 +1,264 @@
+<template>
+  <div class="bottom" :style="{ left: `${windowPostion.x}px`, top: `${windowPostion.y}px`, height: heightDict[gwAlarmInfo.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="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">编号: {{ gwAlarmInfo.code || '--' }}</span></i> -->
+            <i class="el-icon-office-building item-line one-line" style="width: 100%;"><span style="margin-left: 5px">名称: {{ gwAlarmInfo.devicetypename }}</span></i>
+            <i class="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">状态: {{ gwAlarmInfo.alarmstatusname }}</span></i>
+            <i class="el-icon-location item-line one-line" style="width: 100%;" ><span style="margin-left: 5px">位置: {{ gwAlarmInfo.location }}</span></i>
+            <i class="el-icon-news item-line one-line" style="width: 100%;"><span style="margin-left: 5px">告警内容: {{ gwAlarmInfo.alarmcontent || '--' }}</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: ['', '', '', ''],
+      gwAlarmInfo: {},
+      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: '135px',
+        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.gwAlarmInfo = item
+    }
+  },
+}
+</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/cszl/gw/index.vue b/src/pages/ywts/cszl/gw/index.vue
index aad4675..b227543 100644
--- a/src/pages/ywts/cszl/gw/index.vue
+++ b/src/pages/ywts/cszl/gw/index.vue
@@ -3,13 +3,14 @@
   <div>
     <div class="video-menu">
       <layer-manager-mix title="物联设备" :isNeedIcon="false" :layer="dev" :layer-hover="devHover" :menu-tab="menuTab" :menus="menus" :select="selectIndex==='layerBtn'" @btnClick="btnClick" @menuClick="menuClick"/>
-      <common-btn id="healthBtn" :select="selectIndex==='healthBtn'" :bg="health" :bg-hover="healthHover" width="5" height="5" text-hover="健康评分" @click="btnClick" />
-      <common-btn id="alarmBtn" :select="selectIndex==='alarmBtn'" :bg="alarmBg" :bg-hover="alarmHover" width="5" height="5" text-hover="管网告警" @click="btnClick" />
-      <common-btn id="caseBtn" :select="selectIndex==='caseBtn'" :bg="caseBg" :bg-hover="caseHover" width="5" height="5" text-hover="管网事件" @click="btnClick" />
+      <common-btn id="healthBtn" :select="selectIndex==='healthBtn'" :bg="health" :bg-hover="healthHover" width="5" height="5" text-hover="健康评分" @click="handleClickButton('score')" />
+      <common-btn id="alarmBtn" :select="selectIndex==='alarmBtn'" :bg="alarmBg" :bg-hover="alarmHover" width="5" height="5" text-hover="管网告警" @click="handleClickButton('alarm')" />
+      <common-btn id="caseBtn" :select="selectIndex==='caseBtn'" :bg="caseBg" :bg-hover="caseHover" width="5" height="5" text-hover="管网事件" @click="handleClickButton('event')" />
     </div>
     <!-- <list-page title="监测事件" :list="caseList" :query="caseListQuery" :total="caseTotal" @change="changePage" v-show="isListPage"  @close="isListPage=false"/> -->
     <!-- 信息窗体 -->
     <Pop ref="pop" v-if="showPop" @close="showPop = false" />
+    <AlarmPop ref="alarmPopRef" v-if="showAlarmPop" @close="showAlarmPop = false" />
   </div>
 </template>
 
@@ -26,22 +27,24 @@
 } from "../../../../api/ywts/cszl/gd";
 import {
   getStatistics,
-  getArea
+  getArea,
+  getAlarmList
 } from "../../../../api/ywts/cszl/gw";
 import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
 import ListPage from "@/components/ListPage";
-import Pop from "./pop.vue";
-import { TEXT_STYLE_OPTIONS } from "echarts/lib/util/model";
+import Pop from "./popup.vue";
+import AlarmPop from "./alarmPop.vue";
 
 export default {
   name: 'Gw',
-  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop},
+  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop, AlarmPop},
   // components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
   data() {
     return {
       isListPage: false,
       isShow: false,
       showPop: false,
+      showAlarmPop: false, // 是否显示报警点位的popup
       listQuery: {
         deviceType: '',
         startTime: '',
@@ -92,18 +95,10 @@
         name: '物联设备',
         value: 'device'
       }
-      // , {
-      //   name: '环监设备',
-      //   value: 'others'
-      // }
       ],
       menus: {
         device: [
         ],
-        // others: [
-        //   {type : "1", typename: "****设备", total: "111"},
-        //   {type : "2", typename: "****设备", total: "111"}
-        // ]
       }
     }
   },
@@ -113,9 +108,11 @@
     getStatistics().then(response => {
       if(response.code === 200) {
         this.menus.device = response.data.value
+        if(response.data.value && Array.isArray(response.data.value) && response.data.value.length) {
+          this.search(response.data.value[0].type)
+        }
       }
     })
-    this.search()
   },
   methods: {
     async btnClick(e) {
@@ -131,60 +128,69 @@
           break
       }
     },
+    // 点击按钮
+    handleClickButton(type) {
+      clearUpMap()
+      switch (type) {
+        case "alarm": // 点击管网告警
+          this.fetchAlarmList()
+          break
+      }
+    },
     // 查询管网物联设备点位
-    search() {
+    search(type = '') {
       const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
       const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
-      // getArea({
-      //   deviceType: '',
-      //   startTime: '',
-      //   endTime: '',
-      //   isAlarm: '',
-      //   hasOrder: '',
-      //   keywords: '',
-      // }).then(response => {
-      //   if(response.code === 200) {
-      //     clearUpMap()
-      //     response.data.value.forEach(item => {
-      //       // console.log(item.areaboundary)
-      //       // todo : 画范围
-      //       AddLabelPoint(
-      //         item.id,
-      //         item.name,
-      //         item.deviceStatus === '2' ? iconDoing: iconDone,
-      //         [item.lon, item.lat, 0], 'gw', item,
-      //         this.clickGw)
-      //     })
-      //   }
-      // })
-        const res = {
-        data: {
-          value: [
-            {
-              id: '1',
-              name: '111',
-              deviceStatus: '2',
-              lon: '114.87665',
-              lat: '25.76418',
-            },
-            {
-              id: '2',
-              name: '122211',
-              deviceStatus: '1',
-              lon: '114.87365',
-              lat: '25.76118',
-            }
-          ]
-        }}
-        const tempData = res.data.value
-        tempData.forEach(item => {
-          AddLabelPoint(
-            item.id,
-            item.name,
-            item.deviceStatus === '2' ? iconDoing : iconDone,
-            [item.lon, item.lat, 0], 'gw', item,
-            this.clickMarker)
-        })
+      getArea({
+        deviceType: type,
+        startTime: '',
+        endTime: '',
+        isAlarm: '',
+        hasOrder: '',
+        keywords: '',
+      }).then(response => {
+        if(response.code === 200) {
+          clearUpMap()
+          response.data.value.forEach(item => {
+            // console.log(item.areaboundary)
+            // todo : 画范围
+            AddLabelPoint(
+              item.id,
+              item.name,
+              item.deviceStatus === '2' ? iconDoing: iconDone,
+              [item.lon, item.lat, 0], 'gw', item,
+              this.clickGw)
+          })
+        }
+      })
+        // const res = {
+        // data: {
+        //   value: [
+        //     {
+        //       id: '1',
+        //       name: '111',
+        //       deviceStatus: '2',
+        //       lon: '114.87665',
+        //       lat: '25.76418',
+        //     },
+        //     {
+        //       id: '2',
+        //       name: '122211',
+        //       deviceStatus: '1',
+        //       lon: '114.87365',
+        //       lat: '25.76118',
+        //     }
+        //   ]
+        // }}
+        // const tempData = res.data.value
+        // tempData.forEach(item => {
+        //   AddLabelPoint(
+        //     item.id,
+        //     item.name,
+        //     item.deviceStatus === '2' ? iconDoing : iconDone,
+        //     [item.lon, item.lat, 0], 'gw', item,
+        //     this.clickMarker)
+        // })
     },
     // 点击icon事件
     clickGw(eventArg) {
@@ -219,7 +225,94 @@
     menuClick(e) {
       console.log(e, 'menuClick')
       clearResetMap()
-      this.search()
+      this.search(e.type.trim())
+    },
+    // ----------------------------------------管网告警------------------------------------------
+    // 获取官网告警列表
+    fetchAlarmList() {
+      const icon = require('@/assets/images/icon/智慧管网/alarm.png')
+      const params = {
+        pageNo: 1,
+        pageSize: 10,
+        startTime: '',
+        endTime: '',
+        keywords: '',
+      }
+      getAlarmList(params).then(response => {
+        if(response.code === 200) {
+          clearUpMap()
+          response.data.value.forEach(item => {
+            AddLabelPoint(
+              item.id,
+              item.devicetypename,
+              icon,
+              [item.lon, item.lat, 0], 'gw', item,
+              this.clickAlarmMarker)
+          })
+        }
+      })
+      const temp = [
+        {
+          createtime:"2023-04-18 06:01:42",
+          code:null,
+          orderid:null,
+          alarmstatusname:"历史告警",
+          alarmcontent:null,
+          lotid:"112021020027",
+          lon:"114.87665",
+          devicetype:"5",
+          alarmstatus:"0",
+          imgurl:null,
+          location:"刺桐路",
+          id:"1353824",
+          devicetypename:"液位监测仪",
+          lat:"25.76418",
+        },
+        {
+          createtime:"2023-04-18 06:01:38",
+          code:null,
+          orderid:null,
+          alarmstatusname:"历史告警",
+          alarmcontent:null,
+          lotid:"112019020098",
+          lon:"114.899962",
+          devicetype:"5",
+          alarmstatus:"0",
+          imgurl:null,
+          location:"佳辰路",
+          id:"1353818",
+          devicetypename:"液位监测仪",
+          lat:"25.807828",
+        }
+      ]
+      // temp.forEach(item => {
+      //       AddLabelPoint(
+      //         item.id,
+      //         item.devicetypename,
+      //         icon,
+      //         [item.lon, item.lat, 0], 'gw', item,
+      //         this.clickAlarmMarker)
+      //   })
+    },
+    // 点击点位
+    clickAlarmMarker(eventArg) {
+      const showAlarmPop = (e) => {
+        const item = e._data.data
+        this.showAlarmPop = true
+        this.$nextTick(() => {
+          console.log('ppp[p]', item);
+          this.$refs.alarmPopRef.initData(item)
+        })
+      }
+      if (this.showAlarmPop) {
+        this.showAlarmPop = false
+        setTimeout(() => {
+          showAlarmPop(eventArg)
+        }, 100);
+      }
+      else {
+        showAlarmPop(eventArg)
+      }
     },
   }
 }
diff --git a/src/pages/ywts/cszl/gw/pop.vue b/src/pages/ywts/cszl/gw/pop.vue
deleted file mode 100644
index 053b489..0000000
--- a/src/pages/ywts/cszl/gw/pop.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<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="el-icon-office-building item-line one-line" style="width: 100%;"><span style="margin-left: 5px">名称: {{ gdInfo.name }}</span></i>
-            <i class="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">类型: {{ gdInfo.typename }}</span></i>
-            <i class="el-icon-news item-line one-line" style="width: 100%;"><span style="margin-left: 5px">状态: {{ gdInfo.statusname }}</span></i>
-            <i class="el-icon-location item-line one-line" style="width: 100%;" ><span style="margin-left: 5px">位置: {{ gdInfo.location }}
-              </span></i>
-              <video v-if="gdInfo.typename.includes('监控') && gdInfo.statusname=== '在线'" src="" width="100%" height="160px" controls muted autoplay style="margin-top: 10px;"></video>
-          </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: '135px',
-        video: '300px'
-      }
-    }
-  },
-  methods: {
-    initData(item) {
-      console.log(item, '弹窗内容')
-      if (!item.lon || !item.lat) { return }
-      showPositin(item.lon, item.lat)
-
-      if(item.typename.includes('监控') && item.deviceStatusName=== '在线') {
-        item.showType = 'video'
-      }
-      else {
-        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/cszl/gw.js b/src/api/ywts/cszl/gw.js
index f5dc2bf..8c89c12 100644
--- a/src/api/ywts/cszl/gw.js
+++ b/src/api/ywts/cszl/gw.js
@@ -19,3 +19,13 @@
     params: data
   });
 }
+
+// 智慧管网-管网物联设备点位列表
+export function getAlarmList(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/wlgjlbfy",
+    method: "post",
+    data,
+    params: data
+  });
+}
diff --git "a/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png" "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
new file mode 100644
index 0000000..bacd6e7
--- /dev/null
+++ "b/src/assets/images/icon/\346\231\272\346\205\247\347\256\241\347\275\221/alarm.png"
Binary files differ
diff --git a/src/pages/ywts/cszl/gw/alarmPop.vue b/src/pages/ywts/cszl/gw/alarmPop.vue
new file mode 100644
index 0000000..02af7d8
--- /dev/null
+++ b/src/pages/ywts/cszl/gw/alarmPop.vue
@@ -0,0 +1,264 @@
+<template>
+  <div class="bottom" :style="{ left: `${windowPostion.x}px`, top: `${windowPostion.y}px`, height: heightDict[gwAlarmInfo.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="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">编号: {{ gwAlarmInfo.code || '--' }}</span></i> -->
+            <i class="el-icon-office-building item-line one-line" style="width: 100%;"><span style="margin-left: 5px">名称: {{ gwAlarmInfo.devicetypename }}</span></i>
+            <i class="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">状态: {{ gwAlarmInfo.alarmstatusname }}</span></i>
+            <i class="el-icon-location item-line one-line" style="width: 100%;" ><span style="margin-left: 5px">位置: {{ gwAlarmInfo.location }}</span></i>
+            <i class="el-icon-news item-line one-line" style="width: 100%;"><span style="margin-left: 5px">告警内容: {{ gwAlarmInfo.alarmcontent || '--' }}</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: ['', '', '', ''],
+      gwAlarmInfo: {},
+      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: '135px',
+        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.gwAlarmInfo = item
+    }
+  },
+}
+</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/cszl/gw/index.vue b/src/pages/ywts/cszl/gw/index.vue
index aad4675..b227543 100644
--- a/src/pages/ywts/cszl/gw/index.vue
+++ b/src/pages/ywts/cszl/gw/index.vue
@@ -3,13 +3,14 @@
   <div>
     <div class="video-menu">
       <layer-manager-mix title="物联设备" :isNeedIcon="false" :layer="dev" :layer-hover="devHover" :menu-tab="menuTab" :menus="menus" :select="selectIndex==='layerBtn'" @btnClick="btnClick" @menuClick="menuClick"/>
-      <common-btn id="healthBtn" :select="selectIndex==='healthBtn'" :bg="health" :bg-hover="healthHover" width="5" height="5" text-hover="健康评分" @click="btnClick" />
-      <common-btn id="alarmBtn" :select="selectIndex==='alarmBtn'" :bg="alarmBg" :bg-hover="alarmHover" width="5" height="5" text-hover="管网告警" @click="btnClick" />
-      <common-btn id="caseBtn" :select="selectIndex==='caseBtn'" :bg="caseBg" :bg-hover="caseHover" width="5" height="5" text-hover="管网事件" @click="btnClick" />
+      <common-btn id="healthBtn" :select="selectIndex==='healthBtn'" :bg="health" :bg-hover="healthHover" width="5" height="5" text-hover="健康评分" @click="handleClickButton('score')" />
+      <common-btn id="alarmBtn" :select="selectIndex==='alarmBtn'" :bg="alarmBg" :bg-hover="alarmHover" width="5" height="5" text-hover="管网告警" @click="handleClickButton('alarm')" />
+      <common-btn id="caseBtn" :select="selectIndex==='caseBtn'" :bg="caseBg" :bg-hover="caseHover" width="5" height="5" text-hover="管网事件" @click="handleClickButton('event')" />
     </div>
     <!-- <list-page title="监测事件" :list="caseList" :query="caseListQuery" :total="caseTotal" @change="changePage" v-show="isListPage"  @close="isListPage=false"/> -->
     <!-- 信息窗体 -->
     <Pop ref="pop" v-if="showPop" @close="showPop = false" />
+    <AlarmPop ref="alarmPopRef" v-if="showAlarmPop" @close="showAlarmPop = false" />
   </div>
 </template>
 
@@ -26,22 +27,24 @@
 } from "../../../../api/ywts/cszl/gd";
 import {
   getStatistics,
-  getArea
+  getArea,
+  getAlarmList
 } from "../../../../api/ywts/cszl/gw";
 import {AddDivPointHighlight, AddLabel} from "../../../../utils/freedo";
 import ListPage from "@/components/ListPage";
-import Pop from "./pop.vue";
-import { TEXT_STYLE_OPTIONS } from "echarts/lib/util/model";
+import Pop from "./popup.vue";
+import AlarmPop from "./alarmPop.vue";
 
 export default {
   name: 'Gw',
-  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop},
+  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop, AlarmPop},
   // components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
   data() {
     return {
       isListPage: false,
       isShow: false,
       showPop: false,
+      showAlarmPop: false, // 是否显示报警点位的popup
       listQuery: {
         deviceType: '',
         startTime: '',
@@ -92,18 +95,10 @@
         name: '物联设备',
         value: 'device'
       }
-      // , {
-      //   name: '环监设备',
-      //   value: 'others'
-      // }
       ],
       menus: {
         device: [
         ],
-        // others: [
-        //   {type : "1", typename: "****设备", total: "111"},
-        //   {type : "2", typename: "****设备", total: "111"}
-        // ]
       }
     }
   },
@@ -113,9 +108,11 @@
     getStatistics().then(response => {
       if(response.code === 200) {
         this.menus.device = response.data.value
+        if(response.data.value && Array.isArray(response.data.value) && response.data.value.length) {
+          this.search(response.data.value[0].type)
+        }
       }
     })
-    this.search()
   },
   methods: {
     async btnClick(e) {
@@ -131,60 +128,69 @@
           break
       }
     },
+    // 点击按钮
+    handleClickButton(type) {
+      clearUpMap()
+      switch (type) {
+        case "alarm": // 点击管网告警
+          this.fetchAlarmList()
+          break
+      }
+    },
     // 查询管网物联设备点位
-    search() {
+    search(type = '') {
       const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
       const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
-      // getArea({
-      //   deviceType: '',
-      //   startTime: '',
-      //   endTime: '',
-      //   isAlarm: '',
-      //   hasOrder: '',
-      //   keywords: '',
-      // }).then(response => {
-      //   if(response.code === 200) {
-      //     clearUpMap()
-      //     response.data.value.forEach(item => {
-      //       // console.log(item.areaboundary)
-      //       // todo : 画范围
-      //       AddLabelPoint(
-      //         item.id,
-      //         item.name,
-      //         item.deviceStatus === '2' ? iconDoing: iconDone,
-      //         [item.lon, item.lat, 0], 'gw', item,
-      //         this.clickGw)
-      //     })
-      //   }
-      // })
-        const res = {
-        data: {
-          value: [
-            {
-              id: '1',
-              name: '111',
-              deviceStatus: '2',
-              lon: '114.87665',
-              lat: '25.76418',
-            },
-            {
-              id: '2',
-              name: '122211',
-              deviceStatus: '1',
-              lon: '114.87365',
-              lat: '25.76118',
-            }
-          ]
-        }}
-        const tempData = res.data.value
-        tempData.forEach(item => {
-          AddLabelPoint(
-            item.id,
-            item.name,
-            item.deviceStatus === '2' ? iconDoing : iconDone,
-            [item.lon, item.lat, 0], 'gw', item,
-            this.clickMarker)
-        })
+      getArea({
+        deviceType: type,
+        startTime: '',
+        endTime: '',
+        isAlarm: '',
+        hasOrder: '',
+        keywords: '',
+      }).then(response => {
+        if(response.code === 200) {
+          clearUpMap()
+          response.data.value.forEach(item => {
+            // console.log(item.areaboundary)
+            // todo : 画范围
+            AddLabelPoint(
+              item.id,
+              item.name,
+              item.deviceStatus === '2' ? iconDoing: iconDone,
+              [item.lon, item.lat, 0], 'gw', item,
+              this.clickGw)
+          })
+        }
+      })
+        // const res = {
+        // data: {
+        //   value: [
+        //     {
+        //       id: '1',
+        //       name: '111',
+        //       deviceStatus: '2',
+        //       lon: '114.87665',
+        //       lat: '25.76418',
+        //     },
+        //     {
+        //       id: '2',
+        //       name: '122211',
+        //       deviceStatus: '1',
+        //       lon: '114.87365',
+        //       lat: '25.76118',
+        //     }
+        //   ]
+        // }}
+        // const tempData = res.data.value
+        // tempData.forEach(item => {
+        //   AddLabelPoint(
+        //     item.id,
+        //     item.name,
+        //     item.deviceStatus === '2' ? iconDoing : iconDone,
+        //     [item.lon, item.lat, 0], 'gw', item,
+        //     this.clickMarker)
+        // })
     },
     // 点击icon事件
     clickGw(eventArg) {
@@ -219,7 +225,94 @@
     menuClick(e) {
       console.log(e, 'menuClick')
       clearResetMap()
-      this.search()
+      this.search(e.type.trim())
+    },
+    // ----------------------------------------管网告警------------------------------------------
+    // 获取官网告警列表
+    fetchAlarmList() {
+      const icon = require('@/assets/images/icon/智慧管网/alarm.png')
+      const params = {
+        pageNo: 1,
+        pageSize: 10,
+        startTime: '',
+        endTime: '',
+        keywords: '',
+      }
+      getAlarmList(params).then(response => {
+        if(response.code === 200) {
+          clearUpMap()
+          response.data.value.forEach(item => {
+            AddLabelPoint(
+              item.id,
+              item.devicetypename,
+              icon,
+              [item.lon, item.lat, 0], 'gw', item,
+              this.clickAlarmMarker)
+          })
+        }
+      })
+      const temp = [
+        {
+          createtime:"2023-04-18 06:01:42",
+          code:null,
+          orderid:null,
+          alarmstatusname:"历史告警",
+          alarmcontent:null,
+          lotid:"112021020027",
+          lon:"114.87665",
+          devicetype:"5",
+          alarmstatus:"0",
+          imgurl:null,
+          location:"刺桐路",
+          id:"1353824",
+          devicetypename:"液位监测仪",
+          lat:"25.76418",
+        },
+        {
+          createtime:"2023-04-18 06:01:38",
+          code:null,
+          orderid:null,
+          alarmstatusname:"历史告警",
+          alarmcontent:null,
+          lotid:"112019020098",
+          lon:"114.899962",
+          devicetype:"5",
+          alarmstatus:"0",
+          imgurl:null,
+          location:"佳辰路",
+          id:"1353818",
+          devicetypename:"液位监测仪",
+          lat:"25.807828",
+        }
+      ]
+      // temp.forEach(item => {
+      //       AddLabelPoint(
+      //         item.id,
+      //         item.devicetypename,
+      //         icon,
+      //         [item.lon, item.lat, 0], 'gw', item,
+      //         this.clickAlarmMarker)
+      //   })
+    },
+    // 点击点位
+    clickAlarmMarker(eventArg) {
+      const showAlarmPop = (e) => {
+        const item = e._data.data
+        this.showAlarmPop = true
+        this.$nextTick(() => {
+          console.log('ppp[p]', item);
+          this.$refs.alarmPopRef.initData(item)
+        })
+      }
+      if (this.showAlarmPop) {
+        this.showAlarmPop = false
+        setTimeout(() => {
+          showAlarmPop(eventArg)
+        }, 100);
+      }
+      else {
+        showAlarmPop(eventArg)
+      }
     },
   }
 }
diff --git a/src/pages/ywts/cszl/gw/pop.vue b/src/pages/ywts/cszl/gw/pop.vue
deleted file mode 100644
index 053b489..0000000
--- a/src/pages/ywts/cszl/gw/pop.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<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="el-icon-office-building item-line one-line" style="width: 100%;"><span style="margin-left: 5px">名称: {{ gdInfo.name }}</span></i>
-            <i class="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">类型: {{ gdInfo.typename }}</span></i>
-            <i class="el-icon-news item-line one-line" style="width: 100%;"><span style="margin-left: 5px">状态: {{ gdInfo.statusname }}</span></i>
-            <i class="el-icon-location item-line one-line" style="width: 100%;" ><span style="margin-left: 5px">位置: {{ gdInfo.location }}
-              </span></i>
-              <video v-if="gdInfo.typename.includes('监控') && gdInfo.statusname=== '在线'" src="" width="100%" height="160px" controls muted autoplay style="margin-top: 10px;"></video>
-          </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: '135px',
-        video: '300px'
-      }
-    }
-  },
-  methods: {
-    initData(item) {
-      console.log(item, '弹窗内容')
-      if (!item.lon || !item.lat) { return }
-      showPositin(item.lon, item.lat)
-
-      if(item.typename.includes('监控') && item.deviceStatusName=== '在线') {
-        item.showType = 'video'
-      }
-      else {
-        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/cszl/gw/popup.vue b/src/pages/ywts/cszl/gw/popup.vue
new file mode 100644
index 0000000..6544264
--- /dev/null
+++ b/src/pages/ywts/cszl/gw/popup.vue
@@ -0,0 +1,269 @@
+<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="el-icon-office-building item-line one-line" style="width: 100%;"><span style="margin-left: 5px">名称: {{ gdInfo.name }}</span></i>
+            <i class="el-icon-film item-line one-line" style="width: 100%;"><span style="margin-left: 5px">类型: {{ gdInfo.typename }}</span></i>
+            <i class="el-icon-news item-line one-line" style="width: 100%;"><span style="margin-left: 5px">状态: {{ gdInfo.statusname }}</span></i>
+            <i class="el-icon-location item-line one-line" style="width: 100%;" ><span style="margin-left: 5px">位置: {{ gdInfo.location }}</span></i>
+              <video v-if="gwAlarmInfo.typename.includes('监控') && gwAlarmInfo.statusname=== '在线'" src="" width="100%" height="160px" controls muted autoplay style="margin-top: 10px;"></video>
+          </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: '135px',
+        video: '300px'
+      }
+    }
+  },
+  methods: {
+    initData(item) {
+      // console.log(item, '弹窗内容')
+      // if (!item.lon || !item.lat) { return }
+      // showPositin(item.lon, item.lat)
+
+      // if(item.typename.includes('监控') && item.deviceStatusName=== '在线') {
+      //   item.showType = 'video'
+      // }
+      // else {
+      //   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
+    }
+  },
+}
+</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>