diff --git a/src/api/ywts/cszl/gw.js b/src/api/ywts/cszl/gw.js
new file mode 100644
index 0000000..f5dc2bf
--- /dev/null
+++ b/src/api/ywts/cszl/gw.js
@@ -0,0 +1,21 @@
+/**
+ * 管网接口
+ */
+import request from "@/utils/request";
+// 智慧管网-管网概况统计
+export function getStatistics() {
+  return request({
+    url: "zhgw-gktj/zhgw/gwgktj",
+    method: "post"
+  });
+}
+
+// 智慧管网-管网物联设备点位列表
+export function getArea(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/sbdwlb",
+    method: "post",
+    data,
+    params: data
+  });
+}

diff --git a/src/api/ywts/cszl/gw.js b/src/api/ywts/cszl/gw.js
new file mode 100644
index 0000000..f5dc2bf
--- /dev/null
+++ b/src/api/ywts/cszl/gw.js
@@ -0,0 +1,21 @@
+/**
+ * 管网接口
+ */
+import request from "@/utils/request";
+// 智慧管网-管网概况统计
+export function getStatistics() {
+  return request({
+    url: "zhgw-gktj/zhgw/gwgktj",
+    method: "post"
+  });
+}
+
+// 智慧管网-管网物联设备点位列表
+export function getArea(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/sbdwlb",
+    method: "post",
+    data,
+    params: data
+  });
+}
diff --git a/src/pages/ywts/cszl/gw/index.vue b/src/pages/ywts/cszl/gw/index.vue
index 9865d3b..aad4675 100644
--- a/src/pages/ywts/cszl/gw/index.vue
+++ b/src/pages/ywts/cszl/gw/index.vue
@@ -1,13 +1,15 @@
+<!-- 管网 -->
 <template>
   <div>
     <div class="video-menu">
-      <layer-manager-mix title="基础设施" :layer="dev" :layer-hover="devHover" :menu-tab="menuTab" :menus="menus" :select="selectIndex==='layerBtn'" @btnClick="btnClick" @menuClick="layer"/>
+      <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" />
-      <time-manager v-show="selectIndex==='caseBtn'" @handleTimeRange="handleTimeRange"/>
     </div>
-    <list-page title="监测事件" :list="caseList" :query="caseListQuery" :total="caseTotal" @change="changePage" v-show="isListPage"  @close="isListPage=false"/>
+    <!-- <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" />
   </div>
 </template>
 
@@ -16,23 +18,38 @@
 import LayerManagerMix from "@/components/LayerManagerMix";
 import TimeManager from "@/components/TimeManager";
 import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, AddLabelPoint } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
 import {
   getHeat,
-  getArea,
   getDevList,
-  getStatistics,
   getCasePointList, getCaseInfo
 } from "../../../../api/ywts/cszl/gd";
+import {
+  getStatistics,
+  getArea
+} 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";
 
 export default {
   name: 'Gw',
-  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
+  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop},
+  // components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
   data() {
     return {
       isListPage: false,
+      isShow: false,
+      showPop: false,
+      listQuery: {
+        deviceType: '',
+        startTime: '',
+        endTime: '',
+        isAlarm: '',
+        hasOrder: '',
+        keywords: '',
+      },
       ktSelect: '',
       selectIndex: 'layerBtn',
       caseList: [],
@@ -72,7 +89,7 @@
       caseBg: require('@/assets/images/function/物联网/物联事件未选中.png'),
       caseHover: require('@/assets/images/function/物联网/物联事件选中.png'),
       menuTab: [{
-        name: '基础设施',
+        name: '物联设备',
         value: 'device'
       }
       // , {
@@ -91,6 +108,8 @@
     }
   },
   mounted() {
+    clearResetMap()
+    // 获取概况统计
     getStatistics().then(response => {
       if(response.code === 200) {
         this.menus.device = response.data.value
@@ -112,141 +131,96 @@
           break
       }
     },
-    // 设备图层控制
-    layer(item) {
-      // clearUpMap()
-      const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
-      const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
-      getDevList({type: item.type}).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          response.data.value.forEach(item => {
-            AddLabelPoint(
-              item.id,
-              '',
-              item.status === '1'? iconOnline: iconOffline,
-              [item.lon, item.lat, 0], 'gd-dev', item,
-              null)
-          })
-        }
-      })
-    },
-    // 事件点位
-    casePoint() {
-      console.log(this.time)
-      getCasePointList(this.time).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          const data = []
-          response.data.value.forEach(item => {
-            if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
-              data.push(item)
-            }
-          })
-          data.forEach(item => {
-            AddLabelPoint(
-              item.id,
-              '',
-              this.caseIcon[item.status],
-              [item.lon, item.lat, 0], 'gd-case', item,
-              this.clickCase)
-          })
-        }
-      })
-    },
-    // 查询工地点位
+    // 查询管网物联设备点位
     search() {
       const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
       const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
-      getArea({}).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          response.data.value.forEach(item => {
-            // console.log(item.areaboundary)
-            // todo : 画范围
-            AddLabelPoint(
-              item.id,
-              item.name,
-              item.status === '2' ? iconDoing: iconDone,
-              [item.lon, item.lat, 0], 'gd', item,
-              this.clickHw)
-          })
-        }
-      })
+      // 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)
+        })
     },
-    // 智慧工地-工地近1月综合得分
-    score() {
-      getArea({}).then(response => {
-        if(response.code === 200) {
-          response.data.value.forEach(item => {
-            console.log(item.areaboundary)
-            // todo : 画范围
-          })
-        }
-      })
-    },
-    // 点击事件icon
-    clickCase(eventArg) {
+    // 点击icon事件
+    clickGw(eventArg) {
       const item = eventArg._data.data
-      // 恢复上一个marker
-      if(this.preCase !== null ) {
-        window.mmManager.removeById(this.preCase.id)
-        AddLabelPoint(
-          this.preCase.id,
-          '',
-          this.caseIcon[this.preCase.status],
-          [this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
-          this.clickCase)
-      }
-      // 保存当前marker
-      this.preCase = item
-      // 高亮当前marker
-      window.mmManager.removeById(item.id)
-      AddDivPointHighlight(item, this.caseColor[item.status])
-
-      // 查询事件详情
-      this.isListPage = true
-      this.caseListQuery = {
-        startTime: this.time.startTime,
-        endTime: this.time.endTime,
-        id: item.id,
-        pageNo: 0,
-        pageSize: 5
-      }
-      this.searchCaseMarkerList()
-    },
-    // 事件换页
-    changePage(val) {
-      if (val && val.page) {
-        this.caseListQuery.pageNo = val.page
-      }
-      this.searchCaseMarkerList()
-    },
-    searchCaseMarkerList() {
-      // getCaseInfo(this.caseListQuery).then(response => {
-      getCaseInfo(this.caseListQuery).then(response => {
-        if(response.code === 200) {
-          console.log(response.data.value)
-          // 右侧看板
-          this.caseList  = response.data.value
-          // todo
-          // this.caseTotal  = response.data.value.length
-          this.caseTotal  = 12
-        }
+      this.isShow = true
+      console.log('点击icon', item);
+      this.$nextTick(() => {
+        this.$refs.gwPop.initData(item)
       })
     },
-    changeState(v) {
-      this.ktSelect = v
-    },
-    handleTimeRange(time) {
-      this.isListPage = false
-      if(this.time.startTime !== '') {
-        this.time = time
-        this.casePoint()
-      } else {
-        this.time = time
+    // 点击点位
+    clickMarker(eventArg) {
+      const showPop = (e) => {
+        const item = e._data.data
+        this.showPop = true
+        // console.log(this.$refs.popRef)
+        this.$nextTick(() => {
+          this.$refs.pop.initData(item)
+        })
       }
-    }
+      if (this.showPop) {
+        this.showPop = false
+        setTimeout(() => {
+          showPop(eventArg)
+        }, 100);
+      }
+      else {
+        showPop(eventArg)
+      }
+    },
+    // 点击menu
+    menuClick(e) {
+      console.log(e, 'menuClick')
+      clearResetMap()
+      this.search()
+    },
   }
 }
 </script>

diff --git a/src/api/ywts/cszl/gw.js b/src/api/ywts/cszl/gw.js
new file mode 100644
index 0000000..f5dc2bf
--- /dev/null
+++ b/src/api/ywts/cszl/gw.js
@@ -0,0 +1,21 @@
+/**
+ * 管网接口
+ */
+import request from "@/utils/request";
+// 智慧管网-管网概况统计
+export function getStatistics() {
+  return request({
+    url: "zhgw-gktj/zhgw/gwgktj",
+    method: "post"
+  });
+}
+
+// 智慧管网-管网物联设备点位列表
+export function getArea(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/sbdwlb",
+    method: "post",
+    data,
+    params: data
+  });
+}
diff --git a/src/pages/ywts/cszl/gw/index.vue b/src/pages/ywts/cszl/gw/index.vue
index 9865d3b..aad4675 100644
--- a/src/pages/ywts/cszl/gw/index.vue
+++ b/src/pages/ywts/cszl/gw/index.vue
@@ -1,13 +1,15 @@
+<!-- 管网 -->
 <template>
   <div>
     <div class="video-menu">
-      <layer-manager-mix title="基础设施" :layer="dev" :layer-hover="devHover" :menu-tab="menuTab" :menus="menus" :select="selectIndex==='layerBtn'" @btnClick="btnClick" @menuClick="layer"/>
+      <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" />
-      <time-manager v-show="selectIndex==='caseBtn'" @handleTimeRange="handleTimeRange"/>
     </div>
-    <list-page title="监测事件" :list="caseList" :query="caseListQuery" :total="caseTotal" @change="changePage" v-show="isListPage"  @close="isListPage=false"/>
+    <!-- <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" />
   </div>
 </template>
 
@@ -16,23 +18,38 @@
 import LayerManagerMix from "@/components/LayerManagerMix";
 import TimeManager from "@/components/TimeManager";
 import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, AddLabelPoint } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
 import {
   getHeat,
-  getArea,
   getDevList,
-  getStatistics,
   getCasePointList, getCaseInfo
 } from "../../../../api/ywts/cszl/gd";
+import {
+  getStatistics,
+  getArea
+} 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";
 
 export default {
   name: 'Gw',
-  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
+  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop},
+  // components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
   data() {
     return {
       isListPage: false,
+      isShow: false,
+      showPop: false,
+      listQuery: {
+        deviceType: '',
+        startTime: '',
+        endTime: '',
+        isAlarm: '',
+        hasOrder: '',
+        keywords: '',
+      },
       ktSelect: '',
       selectIndex: 'layerBtn',
       caseList: [],
@@ -72,7 +89,7 @@
       caseBg: require('@/assets/images/function/物联网/物联事件未选中.png'),
       caseHover: require('@/assets/images/function/物联网/物联事件选中.png'),
       menuTab: [{
-        name: '基础设施',
+        name: '物联设备',
         value: 'device'
       }
       // , {
@@ -91,6 +108,8 @@
     }
   },
   mounted() {
+    clearResetMap()
+    // 获取概况统计
     getStatistics().then(response => {
       if(response.code === 200) {
         this.menus.device = response.data.value
@@ -112,141 +131,96 @@
           break
       }
     },
-    // 设备图层控制
-    layer(item) {
-      // clearUpMap()
-      const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
-      const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
-      getDevList({type: item.type}).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          response.data.value.forEach(item => {
-            AddLabelPoint(
-              item.id,
-              '',
-              item.status === '1'? iconOnline: iconOffline,
-              [item.lon, item.lat, 0], 'gd-dev', item,
-              null)
-          })
-        }
-      })
-    },
-    // 事件点位
-    casePoint() {
-      console.log(this.time)
-      getCasePointList(this.time).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          const data = []
-          response.data.value.forEach(item => {
-            if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
-              data.push(item)
-            }
-          })
-          data.forEach(item => {
-            AddLabelPoint(
-              item.id,
-              '',
-              this.caseIcon[item.status],
-              [item.lon, item.lat, 0], 'gd-case', item,
-              this.clickCase)
-          })
-        }
-      })
-    },
-    // 查询工地点位
+    // 查询管网物联设备点位
     search() {
       const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
       const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
-      getArea({}).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          response.data.value.forEach(item => {
-            // console.log(item.areaboundary)
-            // todo : 画范围
-            AddLabelPoint(
-              item.id,
-              item.name,
-              item.status === '2' ? iconDoing: iconDone,
-              [item.lon, item.lat, 0], 'gd', item,
-              this.clickHw)
-          })
-        }
-      })
+      // 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)
+        })
     },
-    // 智慧工地-工地近1月综合得分
-    score() {
-      getArea({}).then(response => {
-        if(response.code === 200) {
-          response.data.value.forEach(item => {
-            console.log(item.areaboundary)
-            // todo : 画范围
-          })
-        }
-      })
-    },
-    // 点击事件icon
-    clickCase(eventArg) {
+    // 点击icon事件
+    clickGw(eventArg) {
       const item = eventArg._data.data
-      // 恢复上一个marker
-      if(this.preCase !== null ) {
-        window.mmManager.removeById(this.preCase.id)
-        AddLabelPoint(
-          this.preCase.id,
-          '',
-          this.caseIcon[this.preCase.status],
-          [this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
-          this.clickCase)
-      }
-      // 保存当前marker
-      this.preCase = item
-      // 高亮当前marker
-      window.mmManager.removeById(item.id)
-      AddDivPointHighlight(item, this.caseColor[item.status])
-
-      // 查询事件详情
-      this.isListPage = true
-      this.caseListQuery = {
-        startTime: this.time.startTime,
-        endTime: this.time.endTime,
-        id: item.id,
-        pageNo: 0,
-        pageSize: 5
-      }
-      this.searchCaseMarkerList()
-    },
-    // 事件换页
-    changePage(val) {
-      if (val && val.page) {
-        this.caseListQuery.pageNo = val.page
-      }
-      this.searchCaseMarkerList()
-    },
-    searchCaseMarkerList() {
-      // getCaseInfo(this.caseListQuery).then(response => {
-      getCaseInfo(this.caseListQuery).then(response => {
-        if(response.code === 200) {
-          console.log(response.data.value)
-          // 右侧看板
-          this.caseList  = response.data.value
-          // todo
-          // this.caseTotal  = response.data.value.length
-          this.caseTotal  = 12
-        }
+      this.isShow = true
+      console.log('点击icon', item);
+      this.$nextTick(() => {
+        this.$refs.gwPop.initData(item)
       })
     },
-    changeState(v) {
-      this.ktSelect = v
-    },
-    handleTimeRange(time) {
-      this.isListPage = false
-      if(this.time.startTime !== '') {
-        this.time = time
-        this.casePoint()
-      } else {
-        this.time = time
+    // 点击点位
+    clickMarker(eventArg) {
+      const showPop = (e) => {
+        const item = e._data.data
+        this.showPop = true
+        // console.log(this.$refs.popRef)
+        this.$nextTick(() => {
+          this.$refs.pop.initData(item)
+        })
       }
-    }
+      if (this.showPop) {
+        this.showPop = false
+        setTimeout(() => {
+          showPop(eventArg)
+        }, 100);
+      }
+      else {
+        showPop(eventArg)
+      }
+    },
+    // 点击menu
+    menuClick(e) {
+      console.log(e, 'menuClick')
+      clearResetMap()
+      this.search()
+    },
   }
 }
 </script>
diff --git a/src/pages/ywts/cszl/gw/pop.vue b/src/pages/ywts/cszl/gw/pop.vue
new file mode 100644
index 0000000..053b489
--- /dev/null
+++ b/src/pages/ywts/cszl/gw/pop.vue
@@ -0,0 +1,279 @@
+<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
new file mode 100644
index 0000000..f5dc2bf
--- /dev/null
+++ b/src/api/ywts/cszl/gw.js
@@ -0,0 +1,21 @@
+/**
+ * 管网接口
+ */
+import request from "@/utils/request";
+// 智慧管网-管网概况统计
+export function getStatistics() {
+  return request({
+    url: "zhgw-gktj/zhgw/gwgktj",
+    method: "post"
+  });
+}
+
+// 智慧管网-管网物联设备点位列表
+export function getArea(data) {
+  return request({
+    url: "zhgw-gktj/zhgw/sbdwlb",
+    method: "post",
+    data,
+    params: data
+  });
+}
diff --git a/src/pages/ywts/cszl/gw/index.vue b/src/pages/ywts/cszl/gw/index.vue
index 9865d3b..aad4675 100644
--- a/src/pages/ywts/cszl/gw/index.vue
+++ b/src/pages/ywts/cszl/gw/index.vue
@@ -1,13 +1,15 @@
+<!-- 管网 -->
 <template>
   <div>
     <div class="video-menu">
-      <layer-manager-mix title="基础设施" :layer="dev" :layer-hover="devHover" :menu-tab="menuTab" :menus="menus" :select="selectIndex==='layerBtn'" @btnClick="btnClick" @menuClick="layer"/>
+      <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" />
-      <time-manager v-show="selectIndex==='caseBtn'" @handleTimeRange="handleTimeRange"/>
     </div>
-    <list-page title="监测事件" :list="caseList" :query="caseListQuery" :total="caseTotal" @change="changePage" v-show="isListPage"  @close="isListPage=false"/>
+    <!-- <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" />
   </div>
 </template>
 
@@ -16,23 +18,38 @@
 import LayerManagerMix from "@/components/LayerManagerMix";
 import TimeManager from "@/components/TimeManager";
 import { heat } from '@/utils/freedo/heat'
-import { clearUpMap, AddLabelPoint } from '@/utils/freedo'
+import { clearUpMap, clearResetMap, AddLabelPoint } from '@/utils/freedo'
 import {
   getHeat,
-  getArea,
   getDevList,
-  getStatistics,
   getCasePointList, getCaseInfo
 } from "../../../../api/ywts/cszl/gd";
+import {
+  getStatistics,
+  getArea
+} 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";
 
 export default {
   name: 'Gw',
-  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
+  components: { TimeManager, LayerManagerMix, ListPage, CommonBtn, Pop},
+  // components: { TimeManager, LayerManagerMix, ListPage, CommonBtn },
   data() {
     return {
       isListPage: false,
+      isShow: false,
+      showPop: false,
+      listQuery: {
+        deviceType: '',
+        startTime: '',
+        endTime: '',
+        isAlarm: '',
+        hasOrder: '',
+        keywords: '',
+      },
       ktSelect: '',
       selectIndex: 'layerBtn',
       caseList: [],
@@ -72,7 +89,7 @@
       caseBg: require('@/assets/images/function/物联网/物联事件未选中.png'),
       caseHover: require('@/assets/images/function/物联网/物联事件选中.png'),
       menuTab: [{
-        name: '基础设施',
+        name: '物联设备',
         value: 'device'
       }
       // , {
@@ -91,6 +108,8 @@
     }
   },
   mounted() {
+    clearResetMap()
+    // 获取概况统计
     getStatistics().then(response => {
       if(response.code === 200) {
         this.menus.device = response.data.value
@@ -112,141 +131,96 @@
           break
       }
     },
-    // 设备图层控制
-    layer(item) {
-      // clearUpMap()
-      const iconOnline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'在线.png')
-      const iconOffline = require('@/assets/images/icon/工地地图点位/'+item.typename.replace(/ /g,'')+'离线.png')
-      getDevList({type: item.type}).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          response.data.value.forEach(item => {
-            AddLabelPoint(
-              item.id,
-              '',
-              item.status === '1'? iconOnline: iconOffline,
-              [item.lon, item.lat, 0], 'gd-dev', item,
-              null)
-          })
-        }
-      })
-    },
-    // 事件点位
-    casePoint() {
-      console.log(this.time)
-      getCasePointList(this.time).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          const data = []
-          response.data.value.forEach(item => {
-            if(!data.map(da => da.id).includes(item.id) && !data.map(da => da.lon).includes(item.lon) && item.id !== null) {
-              data.push(item)
-            }
-          })
-          data.forEach(item => {
-            AddLabelPoint(
-              item.id,
-              '',
-              this.caseIcon[item.status],
-              [item.lon, item.lat, 0], 'gd-case', item,
-              this.clickCase)
-          })
-        }
-      })
-    },
-    // 查询工地点位
+    // 查询管网物联设备点位
     search() {
       const iconDone = require('@/assets/images/icon/工地地图点位/工地已完成.png')
       const iconDoing = require('@/assets/images/icon/工地地图点位/工地进行中.png')
-      getArea({}).then(response => {
-        if(response.code === 200) {
-          clearUpMap()
-          response.data.value.forEach(item => {
-            // console.log(item.areaboundary)
-            // todo : 画范围
-            AddLabelPoint(
-              item.id,
-              item.name,
-              item.status === '2' ? iconDoing: iconDone,
-              [item.lon, item.lat, 0], 'gd', item,
-              this.clickHw)
-          })
-        }
-      })
+      // 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)
+        })
     },
-    // 智慧工地-工地近1月综合得分
-    score() {
-      getArea({}).then(response => {
-        if(response.code === 200) {
-          response.data.value.forEach(item => {
-            console.log(item.areaboundary)
-            // todo : 画范围
-          })
-        }
-      })
-    },
-    // 点击事件icon
-    clickCase(eventArg) {
+    // 点击icon事件
+    clickGw(eventArg) {
       const item = eventArg._data.data
-      // 恢复上一个marker
-      if(this.preCase !== null ) {
-        window.mmManager.removeById(this.preCase.id)
-        AddLabelPoint(
-          this.preCase.id,
-          '',
-          this.caseIcon[this.preCase.status],
-          [this.preCase.lon, this.preCase.lat, 0], 'gd-case', this.preCase,
-          this.clickCase)
-      }
-      // 保存当前marker
-      this.preCase = item
-      // 高亮当前marker
-      window.mmManager.removeById(item.id)
-      AddDivPointHighlight(item, this.caseColor[item.status])
-
-      // 查询事件详情
-      this.isListPage = true
-      this.caseListQuery = {
-        startTime: this.time.startTime,
-        endTime: this.time.endTime,
-        id: item.id,
-        pageNo: 0,
-        pageSize: 5
-      }
-      this.searchCaseMarkerList()
-    },
-    // 事件换页
-    changePage(val) {
-      if (val && val.page) {
-        this.caseListQuery.pageNo = val.page
-      }
-      this.searchCaseMarkerList()
-    },
-    searchCaseMarkerList() {
-      // getCaseInfo(this.caseListQuery).then(response => {
-      getCaseInfo(this.caseListQuery).then(response => {
-        if(response.code === 200) {
-          console.log(response.data.value)
-          // 右侧看板
-          this.caseList  = response.data.value
-          // todo
-          // this.caseTotal  = response.data.value.length
-          this.caseTotal  = 12
-        }
+      this.isShow = true
+      console.log('点击icon', item);
+      this.$nextTick(() => {
+        this.$refs.gwPop.initData(item)
       })
     },
-    changeState(v) {
-      this.ktSelect = v
-    },
-    handleTimeRange(time) {
-      this.isListPage = false
-      if(this.time.startTime !== '') {
-        this.time = time
-        this.casePoint()
-      } else {
-        this.time = time
+    // 点击点位
+    clickMarker(eventArg) {
+      const showPop = (e) => {
+        const item = e._data.data
+        this.showPop = true
+        // console.log(this.$refs.popRef)
+        this.$nextTick(() => {
+          this.$refs.pop.initData(item)
+        })
       }
-    }
+      if (this.showPop) {
+        this.showPop = false
+        setTimeout(() => {
+          showPop(eventArg)
+        }, 100);
+      }
+      else {
+        showPop(eventArg)
+      }
+    },
+    // 点击menu
+    menuClick(e) {
+      console.log(e, 'menuClick')
+      clearResetMap()
+      this.search()
+    },
   }
 }
 </script>
diff --git a/src/pages/ywts/cszl/gw/pop.vue b/src/pages/ywts/cszl/gw/pop.vue
new file mode 100644
index 0000000..053b489
--- /dev/null
+++ b/src/pages/ywts/cszl/gw/pop.vue
@@ -0,0 +1,279 @@
+<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/zyhj/yl/index.vue b/src/pages/ywts/zyhj/yl/index.vue
index 787d735..af47c91 100644
--- a/src/pages/ywts/zyhj/yl/index.vue
+++ b/src/pages/ywts/zyhj/yl/index.vue
@@ -218,6 +218,7 @@
     },
     // 点击icon事件
     clickYl(eventArg) {
+      console.log('clickYl');
       const item = eventArg._data.data
       this.isShow = true
       this.$nextTick(() => {
@@ -226,6 +227,7 @@
     },
     // 点击事件icon
     clickCase(eventArg) {
+      console.log('clickCase');
       const item = eventArg._data.data
       // 恢复上一个marker
       if (this.preCase !== null) {
@@ -340,6 +342,7 @@
     },
     // 点击点位
     clickMarker(eventArg) {
+      console.log('clickMarker');
       const showPop = (e) => {
         const item = e._data.data
         this.showPop = true