Merge branch 'lifeline_develop_siping_v3' of http://192.168.10.18:3000/sooka_onest/visu_lifeline into lifeline_develop_siping_v3

src/components/DetailDialog/ThermalPower.vue

@@ -82,7 +82,7 @@ export default{
       divOptionDialog:false,
       hasPositionLabels: [
         '管线管理', '窨井管理','场站管理','企业管理',
-        '城市体检','维护监管', '基础事件', '设备预警', '催办事件', '督办事件',
+        '城市体检','日常监管', '基础事件', '设备预警', '催办事件', '督办事件',
         '物资管理', '设备管理',
       ],
       currentType:'',

src/components/DetailDialog/UtilityTunnel.vue

@@ -81,7 +81,7 @@ export default{
       detailInfo:[],
       detailInfoVisible:false,
       divOptionDialog:false,
-      hasPositionLabels: ['管廊管理', '窨井管理', '城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件', '设备管理','用户管理'],//有定位功能的列表类型
+      hasPositionLabels: ['管廊管理', '窨井管理', '城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件', '设备管理','用户管理'],//有定位功能的列表类型
       currentType:'',
     }
   },

src/components/DetailDialog/eventDetail.vue

@@ -0,0 +1,710 @@
+<!--
+    *@description: 生命线 - 综合信息详情弹窗
+    *@author: yh Fu
+    *@date: 2025-10-16 13:24:13
+    *@version: V1.0.5
+ -->
+<template>
+  <div>
+    <el-dialog title="事件详情" :visible.sync="eventDialogVisible" custom-class="eventDialog"
+               style="margin-top: 5vh !important;"
+    >
+      <div class="transferBg d1">
+        <h3>事件基本信息</h3>
+        <div class="eventInfo_contain">
+          <div style="width: 100%;" class="sj_tit">事件名称：{{ eventInfo.eventTitle || '' }}</div>
+          <div>事件类型：{{ eventInfo.eventTypeDlLabel || '' }}</div>
+          <div>上报时间：{{ eventInfo.createTime || '' }}</div>
+          <div>事件状态：{{ eventInfo.eventStatusLabel || '' }}</div>
+          <div>经度：{{ eventInfo.longitude || '' }}</div>
+          <div>纬度：{{ eventInfo.latitude || '' }}</div>
+          <div class="videoLinkage"></div>
+        </div>
+      </div>
+      <div class="transferBg d2">
+        <h3>事件处理流程</h3>
+        <div class="progress_contain" v-if="eventInfo.eventStatusLabel=='上报'">
+          <div class="line"></div>
+          <div class="e1" v-if="eventInfo.eventStatusLabel=='上报'">
+            <img src="@/assets/images/eventLogo2.png">
+            <div>事件发起</div>
+          </div>
+          <!--          <div class="e2" v-if="eventInfo.eventStatusLabel=='签收'">-->
+          <!--            <img src="@/assets/images/eventLogo2.png">-->
+          <!--            <div>事件签收</div>-->
+          <!--          </div>-->
+        </div>
+        <div class="progress_contain" v-if="eventInfo.eventStatusLabel=='办结'">
+          <div class="line"></div>
+          <div class="e1">
+            <img src="@/assets/images/eventLogo2.png">
+            <div>事件发起</div>
+          </div>
+          <!--          <div class="e2">-->
+          <!--            <img src="@/assets/images/eventLogo2.png">-->
+          <!--            <div>事件签收</div>-->
+          <!--          </div>-->
+          <div class="e2">
+            <img src="@/assets/images/eventLogo2.png">
+            <div>事件处理</div>
+          </div>
+        </div>
+        <div class="progress_contain" v-if="eventInfo.eventStatusLabel=='归档'">
+          <div class="line"></div>
+          <div class="e1">
+            <img src="@/assets/images/eventLogo2.png">
+            <div>事件发起</div>
+          </div>
+          <!--          <div class="e2">-->
+          <!--            <img src="@/assets/images/eventLogo2.png">-->
+          <!--            <div>事件签收</div>-->
+          <!--          </div>-->
+          <div class="e2">
+            <img src="@/assets/images/eventLogo2.png">
+            <div>事件处理</div>
+          </div>
+          <div class="e3">
+            <img src="@/assets/images/eventLogo2.png">
+            <div>事件结束</div>
+          </div>
+        </div>
+      </div>
+      <div class="d3">
+        <div class="transferBg video" v-if="demoIdx != 1">
+          <h3>现场图片</h3>
+          <image-preview :src="require('@/assets/images/alarm.png')" :width="580" :height="360"/>
+        </div>
+        <div class="transferBg video" v-else>
+          <h3>计划附件</h3>
+          <image-preview src="http://116.142.80.13:8081/group1/M00/00/2E/wKgKC2kNSGGACoyXAACpxjuIY5c521.png"
+                         :width="580" :height="360"
+          />
+        </div>
+        <div class="mid">
+          <div class="transferBg info" v-if="demoIdx != 1">
+            <h3>现场状况</h3>
+            <div class="xczk_div">
+              <div>事件当前伤亡：0人</div>
+              <div>事件预警影响：10人</div>
+              <div>预计解决时间：3天</div>
+              <div>当前处理人员：王鹤</div>
+              <div>处理人员电话：18130987651</div>
+            </div>
+          </div>
+          <div class="transferBg info_right" :class="demoIdx == 1 ? 'demoDeptStylesheet' : '' ">
+            <h3 v-show="demoIdx != 0">联动部门</h3>
+            <h4 v-show="demoIdx != 0" style="margin-top: 4%;"></h4>
+            <div v-show="demoIdx != 0" class="planItem"
+                 style="border-left: none; display: flex; align-items: center;"
+            >
+              <img src="@/assets/images/online-img2.png"
+                   style="width: 30px; height:30px; margin:0 5px 0 0 ;"
+              >
+              <div style="margin-top: 0 !important;">四平市</div>
+            </div>
+
+            <h3 v-show="demoIdx == 0">设备数据</h3>
+            <div v-show="demoIdx == 0" class="div_Option" ref="divOption"></div>
+          </div>
+          <div class="transferBg pics">
+            <h3>处置照片</h3>
+            <div class="otherPics">
+              <image-preview :src="require('@/assets/images/alarm_1.png')" :width="200" :height="137"/>
+            </div>
+            <!--    <router-link to="#" v-for="item, index in emergencyEventDetails.attachPath">
+                  <el-image :src="item"
+                      :preview-src-list="assetTypeAnImage(emergencyEventDetails.attachPath, index)"
+                      style="width:8rem; height:8rem;margin: 5px;">
+                  </el-image>
+                </router-link>
+              </div> -->
+          </div>
+        </div>
+        <div class="right transferBg">
+          <h3>事件日志</h3>
+          <div class="block le_ri">
+            <el-scrollbar style="height: 378px;" class="spsb_time">
+              <el-timeline  v-for="(item,idx) in eventLog">
+                <el-timeline-item placement="top">
+                  <span class="timeline-span">{{ item.createTime || '' }}</span>
+                  <el-card>
+                    <h4>{{ item.logContent || '' }}</h4>
+                    <p>{{ item.createName || '' }} 提交于 {{ item.createTime || '' }}</p>
+                  </el-card>
+                </el-timeline-item>
+              </el-timeline>
+            </el-scrollbar>
+            <div class="spsb_xx">
+              <textarea class="spsb_text" v-model="reviewDescription" placeholder=""> </textarea>
+              <div class="btn_option">
+                <el-button>签收</el-button>
+                <el-button>办结</el-button>
+                <el-button>驳回</el-button>
+                <el-button>归档</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// 其他组件改为动态导入，在components中定义
+import * as echarts from 'echarts'
+import { deviceMonitoringLineChart } from '@/api/tableInfo'
+import { getEventDetail } from '@/api/eventLifeLine'
+
+export default {
+  name: 'eventDetail',
+  data() {
+    return {
+      eventDialogVisible: false,
+      reviewDescription: '',
+      eventInfo: {},//事件详情
+      eventLog: [],//事件日志
+    }
+  },
+  methods: {
+    isImgUrl(value) {
+      const regex = /^(https?:\/\/)?([\w.-]+)(:[0-9]+)?(\/[\w./%-]*)*\.(jpg|jpeg|png|gif|bmp|webp|svg|tiff|ico)$/i
+      return regex.test(value)
+    },
+    isFileUrl(value) {
+      const regex = /^(https?:\/\/)?([\w.-]+)(:[0-9]+)?(\/[\w./%-]*)*\.(jpg|jpeg|png|gif|bmp|webp|svg|tiff|ico|doc|docx|xls|xlsx|ppt|pptx|txt|csv|pdf|zip|rar|7z|tar|gz|mp3|wav|mp4|avi|mov|mkv|flv|webm|json|xml|html|htm)$/i
+      return regex.test(value)
+    },
+    handleFileClick(url) {
+      if (url) {
+        window.open(url, '_blank')
+      }
+    },
+    // 打开事件详情弹窗
+    openEventDetail(eventId) {
+      getEventDetail({
+        eventId: eventId
+      }).then(res => {
+        this.eventInfo = res.data.detail
+        this.eventLog = res.data.eventLog
+        this.eventDialogVisible = true
+      })
+    },
+    openDetailEachart(deviceCode, date) {
+      this.divOptionDialog = true
+      deviceMonitoringLineChart({ deviceCode: deviceCode, ...(date ? { date: date } : {}) }).then(res => {
+        let resDataObj = res.data
+        let resData = {
+          'series': [
+            {
+              'data': resDataObj.series.oneWaterSupplyPressure.map(value => value === '-100.0' ? '0' : value),
+              'name': '一次网供水压力'
+            }, {
+              'data': resDataObj.series.oneBackwaterPressure.map(value => value === '-100.0' ? '0' : value),
+              'name': '一次网回水压力'
+            }, {
+              'data': resDataObj.series.oneBackwaterToa.map(value => value === '-100.0' ? '0' : value),
+              'name': '一次网回水温度'
+            }, {
+              'data': resDataObj.series.oneWaterSupplyToa.map(value => value === '-100.0' ? '0' : value),
+              'name': '一次网供水温度'
+            }, {
+              'data': resDataObj.series.flowRate.map(value => value === '-100.0' ? '0' : value),
+              'name': '流量'
+            }, {
+              'data': resDataObj.series.twoWaterSupplyPressure.map(value => value === '-100.0' ? '0' : value),
+              'name': '二次网供水压力'
+            }, {
+              'data': resDataObj.series.twoBackwaterPressure.map(value => value === '-100.0' ? '0' : value),
+              'name': '二次网回水压力'
+            }, {
+              'data': resDataObj.series.twoWaterSupplyToa.map(value => value === '-100.0' ? '0' : value),
+              'name': '二次网供水温度'
+            }, {
+              'data': resDataObj.series.twoBackwaterToa.map(value => value === '-100.0' ? '0' : value),
+              'name': '二次网回水温度'
+            }],
+          'categories': resDataObj.timeLabels
+        }
+
+        const chartDom = this.$refs.divOption
+        const myChart = echarts.init(chartDom)
+        var xData = resData.categories
+        var color = ['#fa704d', '#01babc', '#1a9bfc', '#99da69', '#e32f46', '#7049f0', '#fa704d', '#01babc', '#1a9bfc', '#99da69', '#7049f0', '#e32f46']
+
+        var name = []
+        var data = []
+        for (const datum of resData.series) {
+          name.push(datum.name)
+          data.push(datum.data)
+        }
+        var series = []
+        for (var i = 0; i < name.length; i++) {
+          series.push({
+            name: name[i],
+            type: 'line',
+            symbolSize: 3, //标记的大小，可以设置成诸如 10 这样单一的数字，也可以用数组分开表示宽和高，例如 [20, 10] 表示标记宽为20，高为10[ default: 4 ]
+            symbol: 'circle', //标记的图形。ECharts 提供的标记类型包括 'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
+            smooth: true, //是否平滑曲线显示
+            showSymbol: true, //是否显示 symbol, 如果 false 则只有在 tooltip hover 的时候显示
+            areaStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  0,
+                  0,
+                  1,
+                  [{
+                    offset: 0,
+                    color: color[i]
+                  },
+                    {
+                      offset: 0.8,
+                      color: 'rgba(255,255,255,0)'
+                    }
+                  ],
+                  false
+                ),
+                // shadowColor: 'rgba(255,255,255, 0.1)',
+                shadowBlur: 10,
+                opacity: 0.3
+              }
+            },
+            itemStyle: {
+              normal: {
+                color: color[i],
+                lineStyle: {
+                  width: 1,
+                  type: 'solid' //'dotted'虚线 'solid'实线
+                },
+                borderColor: color[i], //图形的描边颜色。支持的格式同 color
+                borderWidth: 8, //描边线宽。为 0 时无描边。[ default: 0 ]
+                barBorderRadius: 0,
+                label: {
+                  show: false
+                },
+                opacity: 0.5
+              }
+            },
+            yAxisIndex: name[i].includes('压力') ? 1 : 0,
+            data: data[i]
+          })
+        }
+        this.option = {
+          legend: {
+            top: 10,
+            itemGap: 5,
+            itemWidth: 5,
+            textStyle: {
+              color: '#fff',
+              fontSize: '10'
+            },
+            data: name
+          },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              // 坐标轴指示器，坐标轴触发有效
+              type: 'line', // 默认为直线，可选为：'line' | 'shadow'
+              lineStyle: {
+                color: '#57617B'
+              }
+            },
+            backgroundColor: 'rgba(0,60,120,0.8)', // 设置提示框背景为蓝色
+            padding: [8, 10], //内边距
+            extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影
+            formatter: function(params) {
+              let result = params[0].name + '<br/>'
+              params.forEach(param => {
+                switch (param.seriesName) {
+                  case '一次网供水压力':
+                    result += param.seriesName + ': ' + param.value + 'MPa<br/>'
+                    break
+                  case '一次网回水压力':
+                    result += param.seriesName + ': ' + param.value + 'MPa<br/>'
+                    break
+                  case '一次网供水温度':
+                    result += param.seriesName + ': ' + param.value + '℃<br/>'
+                    break
+                  case '一次网回水温度':
+                    result += param.seriesName + ': ' + param.value + '℃<br/>'
+                    break
+                  case '流量':
+                    result += param.seriesName + ': ' + param.value + 'm³/h<br/>'
+                    break
+                  case '二次网供水压力':
+                    result += param.seriesName + ': ' + param.value + 'MPa<br/>'
+                    break
+                  case '二次网回水压力':
+                    result += param.seriesName + ': ' + param.value + 'MPa<br/>'
+                    break
+                  case '二次网供水温度':
+                    result += param.seriesName + ': ' + param.value + '℃<br/>'
+                    break
+                  case '二次网回水温度':
+                    result += param.seriesName + ': ' + param.value + '℃<br/>'
+                    break
+                  default:
+                    break
+                }
+              })
+              return result
+            }
+          },
+          grid: {
+            borderWidth: 0,
+            top: 50,
+            bottom: 20,
+            textStyle: {
+              color: '#fff'
+            }
+          },
+          xAxis: [{
+            type: 'category',
+            axisLine: {
+              lineStyle: {
+                color: '#32346c'
+              }
+            },
+            boundaryGap: false, //坐标轴两边留白策略，类目轴和非类目轴的设置和表现不一样
+            axisTick: {
+              show: false
+            },
+            splitArea: {
+              show: false
+            },
+            axisLabel: {
+              inside: false,
+              textStyle: {
+                color: '#bac0c0',
+                fontWeight: 'normal',
+                fontSize: '12'
+              }
+            },
+            data: xData
+          }],
+          yAxis: [{
+            name: '℃',
+            type: 'value',
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: '#9bbdde'
+              }
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: '#32346c '
+              }
+            },
+            axisLabel: {
+              textStyle: {
+                color: '#bac0c0',
+                fontWeight: 'normal',
+                fontSize: '12'
+              }
+            }
+          },
+            {
+              name: 'MPa',
+              type: 'value',
+              axisTick: {
+                show: false
+              },
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: '#9bbdde'
+                }
+              },
+              splitLine: {
+                show: true,
+                lineStyle: {
+                  color: '#32346c '
+                }
+              },
+              axisLabel: {
+                textStyle: {
+                  color: '#bac0c0',
+                  fontWeight: 'normal',
+                  fontSize: '12'
+                }
+              }
+            }],
+          series: series
+        }
+        console.log('this.option', this.option)
+        console.log(this.option)
+        myChart.setOption(this.option, true)
+        window.addEventListener('resize', function() {
+          myChart.resize()
+        })
+      })
+    }
+  }
+
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+@import '@/assets/styles/base.scss';
+</style>
+
+<style lang="scss">
+/*.longValue{*/
+/*width: 100% !important;*/
+/*flex-direction: row!important;*/
+/*span{*/
+/*display: block;*/
+/*}*/
+/*}*/
+
+.dialog2 {
+  .tvDialog {
+    background: none;
+    margin-top: 10vh !important;
+    background: none;
+    border: 0px;
+    width: 40% !important;
+
+    padding-top: 0;
+
+    .container {
+      background: #041b32;
+    }
+
+    .tvDialog {
+      /*height: auto!important;*/
+    }
+
+    .tk_list {
+      width: 100%;
+      position: relative;
+    }
+
+    .TVWallCustomWidth {
+      height: 100% !important;
+    }
+
+    .TVWallCustomWidth .el-descriptions__body .el-descriptions-item__label {
+      width: 400px !important;
+    }
+
+    .tvPicHighlight {
+      border: 6px solid #B8741A;
+    }
+
+    .tvPicNotHighlight {
+      border: none;
+    }
+
+
+    .el-dialog__body {
+      height: 92%;
+      padding: 0;
+    }
+
+    .el-dialog__header {
+      background: #091225 url("../../assets/images/sp_dtitbg.png") no-repeat left;
+      text-align: left;
+      padding: 0px 0px 0px 45px !important;
+      line-height: 40px;
+
+      .el-dialog__title {
+        color: #fff;
+      }
+
+      .el-dialog__headerbtn {
+        top: 11px !important;
+        background: url("../../assets/images/sp_close.png") no-repeat center;
+        width: 17px;
+
+        i {
+
+          color: #0e3585;
+
+        }
+
+        i::before {
+          display: none;
+        }
+      }
+    }
+
+    .tvPicHighlight {
+      border: 6px solid #B8741A;
+    }
+
+    .tvPicNotHighlight {
+      border: none;
+    }
+
+    .container {
+      height: 100%;
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex;
+      background-size: 100% 100%;
+      background: rgb(4 18 50 / 84%) url(../../assets/images/sp_dneibg.png) no-repeat top;
+      background-size: contain;
+      border: 6px solid;
+      border-image-source: linear-gradient(to bottom, #19273d, #344e6d);
+      border-image-slice: 1;
+
+      .leftContain {
+        width: 100%;
+
+        .deviceInfo {
+          height: 71%;
+          overflow-x: scroll;
+          white-space: nowrap;
+
+          > div {
+            text-indent: 42px;
+            height: 10%;
+            font-size: 15px;
+            color: #A4A4A4;
+            font-weight: 700;
+          }
+
+          > div:nth-child(1) {
+            margin-top: 7%;
+          }
+        }
+
+        .deviceInfo::-webkit-scrollbar {
+          display: block !important;
+          background-color: #101823;
+          // border: 1px solid #fff;
+          height: 10px !important;
+        }
+
+        .deviceInfo::-webkit-scrollbar-thumb {
+          background-color: #183974;
+        }
+
+        .deviceIcon {
+          width: 30%;
+          margin: 7% 0 0 35%;
+          cursor: pointer;
+        }
+      }
+
+    }
+
+    .leader-info-container {
+      .el-descriptions-item__label {
+        width: 77px !important;
+      }
+    }
+
+
+    .tk_list_con {
+      float: left;
+      width: 75%;
+      height: 296px;
+      overflow-y: scroll;
+    }
+
+    .imgzw {
+      width: 170px;
+      height: 300px;
+      display: block;
+      margin: 0px 10px 0px 0px;
+      border-radius: 5px;
+      border: 1px dashed #0b3974;
+      float: left;
+      background: url("../../assets/images/sp_iconbtn2.png") no-repeat center;
+      // border: solid 1px #2c4362;
+      img {
+        display: block;
+        width: 100%;
+        height: auto;
+        margin: 10px 0;
+      }
+    }
+
+    .tk_list_div {
+      width: 100%;
+      margin-bottom: 5px;
+
+      span {
+        display: inline-block;
+        color: #fff;
+        line-height: 30px;
+      }
+    }
+
+    .tk_list_div span:nth-child(1) {
+      text-align: right;
+      background: rgb(28 46 76 / 47%);
+      color: #fff;
+      padding: 0px 5px;
+      min-width: 80px;
+      margin-right: 5px;
+      vertical-align: top;
+    }
+
+    .tk_list_left {
+      width: 64%;
+      float: left;
+
+    }
+
+    .tk_list_right {
+      span {
+        display: block;
+        width: 100%;
+      }
+
+      img {
+        margin: 10px 5px;
+        border: 1px solid #0f1e3c;
+        width: 180px;
+        height: 160px;
+      }
+    }
+
+    .div_Option {
+      width: 100%;
+      height: 22vh;
+    }
+
+    .shexiangTou {
+      position: absolute;
+      right: 4px;
+      bottom: 6px;
+      opacity: 0.5;
+    }
+
+  }
+}
+
+.TVWallCustomWidth {
+  height: 100% !important;
+}
+
+.TVWallCustomWidth .el-descriptions__body .el-descriptions-item__label {
+  width: 400px !important;
+}
+
+.tvPicHighlight {
+  border: 6px solid #B8741A;
+}
+
+.tvPicNotHighlight {
+  border: none;
+}
+
+.leader-info-container {
+  .el-descriptions-item__label {
+    width: 77px !important;
+  }
+}
+
+
+</style>

src/components/DetailDialog/paishui.vue

@@ -83,7 +83,7 @@ export default{
       detailInfo:[],
       detailInfoVisible:false,
       divOptionDialog:false,
-      hasPositionLabels: ['管线管理', '窨井管理','易涝点管理','堤防管理','下穿立交管理','泵站管理','雨量站管理','污水处理厂管理','调蓄设施管理','企业管理','用户管理','设备管理','城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件'],
+      hasPositionLabels: ['管线管理', '窨井管理','易涝点管理','堤防管理','下穿立交管理','泵站管理','雨量站管理','污水处理厂管理','调蓄设施管理','企业管理','用户管理','设备管理','城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件'],
       currentType:'',
     }
   },

src/components/DetailDialog/qiaoliang.vue

@@ -83,7 +83,7 @@ export default{
       divOptionDialog:false,
       hasPositionLabels: [
         '桥梁管理', '桥梁养护', '用户管理',
-        '城市体检','维护监管', '基础事件', '设备预警', '催办事件', '督办事件',
+        '城市体检','日常监管', '基础事件', '设备预警', '催办事件', '督办事件',
         '物资管理', '设备管理',
       ],
       currentType:'',

src/components/DetailDialog/water.vue

@@ -81,7 +81,7 @@ export default{
       detailInfo:[],
       detailInfoVisible:false,
       divOptionDialog:false,
-      hasPositionLabels: ['管线管理', '窨井管理', '城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件', '设备管理','用户管理','泵站管理'],//有定位功能的列表类型
+      hasPositionLabels: ['管线管理', '窨井管理', '城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件', '设备管理','用户管理','泵站管理'],//有定位功能的列表类型
       currentType:'',
     }
   },

src/views/CockpitLifeLine.vue

@@ -544,12 +544,12 @@
 					</div>
 				</div>
 			</div>
-			<!--事件列表-->
+			<!--预警列表-->
 			<div class="right-content">
 				<div class="title-bar">
 					<el-popover placement="left-start" width="400" trigger="click" popper-class="sj-pop-con">
 						<div class="title-bar-pop">
-							<span>事件列表</span>
+							<span>预警列表</span>
 						</div>
 						<el-select v-model="valueSJ1" placeholder="请选择" class="sj-select-50" popper-class="sj-s-pop">
 							<el-option v-for="item in optionsSJ1" :key="item.value" :label="item.label"
@@ -602,7 +602,7 @@
 							</li>
 						</ul>
 
-						<div slot="reference" style="cursor: pointer;">事件统计</div>
+						<div slot="reference" style="cursor: pointer;">预警统计</div>
 					</el-popover>
 				</div>
 				<div class="content-box h-185">

src/views/Operation.vue

@@ -221,7 +221,7 @@
           </div>
         </div>
 			</div>
-			<!--事件列表-->
+			<!--预警列表-->
 			<div class="right-content">
 				<div class="title-bar">
 					<span>维护报告</span>

src/views/Regulatory.vue

@@ -59,7 +59,7 @@
 			<div class="left-content">
 				<div class="title-bar">
 					<div class="title-bar-pop">
-						<span>事件统计</span>
+						<span>预警统计</span>
 					</div>
 					</el-popover>
 				</div>
@@ -176,33 +176,33 @@
 					</div>
 				</div>
 			</div>
-			<!--事件列表-->
+			<!--预警列表-->
 			<div class="right-content">
 				<div class="title-bar m-t-3">
-					<span>事件列表</span>
+					<span>预警列表</span>
 					<div class="num">
 						20个
 					</div>
 				</div>
 				<div class="content-box h-530 p-15" style="height: 460px !important">
 					<div class="box-row flex-c" style="justify-content: flex-start;">
-						<el-select v-model="value4" placeholder="请选择" class="sj-select-100" popper-class="sj-s-pop">
-							<el-option v-for="item in options4" :key="item.value" :label="item.label"
+						<el-select v-model="industry" placeholder="请选择" clearable class="sj-select-100" popper-class="sj-s-pop">
+							<el-option v-for="item in industryList" :key="item.value" :label="item.label"
 								:value="item.value">
 							</el-option>
 						</el-select>
-						<el-input placeholder="请输入内容" suffix-icon="el-icon-search" v-model="input2"
+						<el-input placeholder="请输入内容" suffix-icon="el-icon-search" v-model="eventName"
 							class="sj-input-style">
 						</el-input>
 						<div class="list-ul-style-tit list-ul-100-tit">
-							<span style="width: 40px;">序号</span>
-							<span style="width: 60%;">事件名称</span>
+              <span style="width: 60%;">事件名称</span>
+              <span style="width: 70px;">催办情况</span>
 							<span style="width: 65px;">处理情况</span>
 						</div>
 						<ul class="list-ul-style list-ul-100" style="height: 63.5% !important;">
-							<li v-for="item in eventList" :key="item.id">
-								<span style="width: 40px;">{{ item.id}}</span>
-								<span style="width: 60%;">{{ item.eventLabel }}</span>
+							<li v-for="item in eventList" :key="item.id"  @click="openEventDetail(item)">
+                <span style="width: 60%;">{{ item.eventTitle }}</span>
+                <span style="width: 70px;">{{ item.expediteStatusLabel}}</span>
 								<span style="width: 65px;"
 									:class=" item.eventStatusLabel == '已完成' ? 'green-txt' : 'blue-txt' ">{{ item.eventStatusLabel }}</span>
 							</li>
@@ -636,7 +636,7 @@
 						<el-table-column prop="endTime" label="巡查结束时间">
 						</el-table-column>
 					</el-table>
-          <el-pagination @current-change="taskList" :current-page="pagerCount" :page-size="pageSize"
+          <el-pagination @current-change="selectPatrolInspectionDataList" :current-page="pagerCount" :page-size="pageSize"
                          layout="total, prev, pager, next" :total="taskTotal">
           </el-pagination>
 				</div>
@@ -662,11 +662,12 @@
 
 	import * as echarts from 'echarts'
   import { queryVectorTilesMapList } from '@/api/components/supermap'
-  import {annualPlanCount, closedPatrolTaskCount, patrolTaskCount, patrolTrackDistance ,
+  import {annualPlanCount, closedPatrolTaskCount, patrolTaskCount, patrolTrackDistance,
 	administrativeCountEventStatus,  	//事件统计:事件
 	industryCount,  					//事件统计:行业
   } from "@/api/Regulatory";
-  import {selectPatrolInspectionDataList} from "@/api/tableInfo";
+  import { selectPatrolInspectionDataList, selectThresholdList } from '@/api/tableInfo'
+  import { getEventDetail, selectEventList } from '@/api/eventLifeLine'
 
 	export default {
 		components: {
@@ -701,11 +702,9 @@
 			}, 1000);
 			this.ndChart();
 			this.xcChart();
+      this.selectEventList();
 		},
 		computed: {
-			eventList() {
-				return this.lists[this.selectedDiv] || []; // 如果selectedDiv不存在于lists中，返回空数组以避免错误。
-			},
 
 		},
 		data() {
@@ -1238,23 +1237,27 @@
 					label: '双辽市'
 				}],
 				value3: '',
-				options4: [{
-					value: '选项1',
-					label: '铁东区'
-				}, {
-					value: '选项2',
-					label: '铁西区'
-				}, {
-					value: '选项3',
-					label: '梨树县'
-				}, {
-					value: '选项4',
-					label: '伊通县'
-				}, {
-					value: '选项5',
-					label: '双辽市'
-				}],
-				value4: '',
+        industryList: [
+          {
+            value: '1',
+            label: '热力'
+          }, {
+            value: '2',
+            label: '排水'
+          }, {
+            value: '3',
+            label: '桥梁'
+          }, {
+            value: '4',
+            label: '管廊'
+          }, {
+            value: '5',
+            label: '燃气'
+          }, {
+            value: '6',
+            label: '供水'
+          }],
+				industry: '',
 				options5: [{
 					value: '选项1',
 					label: '铁东区'
@@ -1308,7 +1311,7 @@
         ],
 				value7: '',
 				input1: '',
-				input2: '',
+				eventName: '',
 				dialogVisibleSj: false,
 				currentTab: 0,
 				currentClass: 0,
@@ -1654,173 +1657,7 @@
 
 				],
 				selectedDiv: 1, // 当前选中的div的编号
-				lists: {
-					1: [{
-							id: 1,
-							eventLabel: '紫气大街66号3号管道改造',
-							eventStatusLabel: '进行中'
-						},
-						{
-							id: 2,
-							eventLabel: '解放路32号支线维修工程',
-							eventStatusLabel: '进行中'
-						},
-						{
-							id: 3,
-							eventLabel: '站前街68号2号燃气管道改造',
-							eventStatusLabel: '进行中'
-						},
-						{
-							id: 4,
-							eventLabel: '迎宾大街30号排水系统升级',
-							eventStatusLabel: '已完成'
-						},
-						{
-							id: 5,
-							eventLabel: '东环路25号1号供热主管道抢修',
-							eventStatusLabel: '进行中'
-						},
-						{
-							id: 6,
-							eventLabel: '胜利南街3号管网检修',
-							eventStatusLabel: '待处理'
-						}
-					],
-					2: [{
-							id: 1,
-							eventLabel: '文化路15号老旧管线改造',
-							eventStatusLabel: '进行中'
-						},
-						{
-							id: 2,
-							eventLabel: '和平街48号地下管廊巡检',
-							eventStatusLabel: '已完成'
-						},
-						{
-							id: 3,
-							eventLabel: '新华大街88号自来水管更新',
-							eventStatusLabel: '待处理'
-						},
-						{
-							id: 4,
-							eventLabel: '中央西路22号热力分支改造',
-							eventStatusLabel: '待处理'
-						},
-						{
-							id: 5,
-							eventLabel: '建设南路19号排污管更换',
-							eventStatusLabel: '进行中'
-						},
-						{
-							id: 6,
-							eventLabel: '友谊街56号燃气阀门更换',
-							eventStatusLabel: '已完成'
-						},
-						{
-							id: 7,
-							eventLabel: '铁西一路9号供水管网检测',
-							eventStatusLabel: '进行中'
-						},
-						{
-							id: 8,
-							eventLabel: '英雄大街120号通信井整修',
-							eventStatusLabel: '进行中'
-						},
-						{
-							id: 9,
-							eventLabel: '平西路10号道路附属管线改造',
-							eventStatusLabel: '已完成'
-						},
-						{
-							id: 10,
-							eventLabel: '长征街77号地下热力管检修',
-							eventStatusLabel: '进行中'
-						},
-					]
-				},
-				event2List: [
-          {
-						eventLabel: '紫气大街66号3号管道改造',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '解放路32号支线维修工程',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '站前街68号2号燃气管道改造',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '迎宾大街30号排水系统升级',
-						eventStatusLabel: '已完成'
-					},
-					{
-						eventLabel: '东环路25号1号供热主管道抢修',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '胜利南街3号管网检修',
-						eventStatusLabel: '待处理'
-					},
-					{
-						eventLabel: '文化路15号老旧管线改造',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '和平街48号地下管廊巡检',
-						eventStatusLabel: '已完成'
-					},
-					{
-						eventLabel: '新华大街88号自来水管更新',
-						eventStatusLabel: '待处理'
-					},
-					{
-						eventLabel: '中央西路22号热力分支改造',
-						eventStatusLabel: '待处理'
-					},
-					{
-						eventLabel: '建设南路19号排污管更换',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '友谊街56号燃气阀门更换',
-						eventStatusLabel: '已完成'
-					},
-					{
-						eventLabel: '铁西一路9号供水管网检测',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '英雄大街120号通信井整修',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '平西路10号道路附属管线改造',
-						eventStatusLabel: '已完成'
-					},
-					{
-						eventLabel: '长征街77号地下热力管检修',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '中兴路45号2号排水井修复',
-						eventStatusLabel: '待处理'
-					},
-					{
-						eventLabel: '四平路36号3号供气支线维护',
-						eventStatusLabel: '进行中'
-					},
-					{
-						eventLabel: '康宁街20号老旧管道改造',
-						eventStatusLabel: '待处理'
-					},
-					{
-						eventLabel: '建设北路100号雨污分流改造',
-						eventStatusLabel: '已完成'
-					},
-				],
-				eventStatusOption:[],     // 事件统计-事件 状态
+        eventList:[],
 			}
 		},
 		methods: {
@@ -2473,7 +2310,7 @@
 				this.$nextTick(() => {
 					this.xcrwChart();
 					this.xcgjChart();
-					this.taskList();
+					this.selectPatrolInspectionDataList();
 
 				})
 			},
@@ -2715,7 +2552,24 @@
           })
         })
 			},
-      taskList(pageSize){
+      /**
+       * 预警列表
+       */
+      selectEventList() {
+        selectEventList({industry: this.industry,eventTitle: this.eventName}).then(res => {
+          this.eventList = res.rows
+        })
+      },
+      // 打开事件详情弹窗
+      openEventDetail(obj) {
+        getEventDetail({
+          eventId: obj.eventId
+        }).then(res => {
+          this.eventInfo = res.data
+          this.eventDialogVisible = true
+        })
+      },
+      selectPatrolInspectionDataList(pageSize){
         selectPatrolInspectionDataList({
           pageNum: pageSize || 1,
           pageSize: 10,
@@ -3024,8 +2878,11 @@
       },
 		},
 		watch: {
-			input2(newVal) {
-				this.eventList = this.event2List.filter(e => e.eventLabel.includes(newVal))
+			eventName(newVal) {
+				this.selectEventList()
+			},
+      industry(newVal) {
+        this.selectEventList()
 			}
 		}
 	}

src/views/industry/FengxianQd.vue

@@ -148,7 +148,7 @@
 					</div>
 				</div>
 			</div>
-			<!--事件列表-->
+			<!--预警列表-->
 			<div class="right-content contfl">
 
 				<div class="title-bar">

src/views/industry/GangweiZx.vue

@@ -157,7 +157,7 @@
 				</div>
 
 			</el-dialog>
-			<!--事件列表-->
+			<!--预警列表-->
 			<div class="right-content">
 
 				<div class="title-bar">
@@ -4388,9 +4388,9 @@
   .sj-select-50 {
   	width: 49% ;
   	margin-top: 5px !important;
-  
+
   	.el-input {}
-  
+
   	.el-input__inner {
   		height: 30px;
   		line-height: 30px;
@@ -4398,11 +4398,11 @@
   		border: 1px solid #326e96;
   		color: #0fc0ee;
   	}
-  
+
   	.el-input__icon {
   		line-height: 30px;
   	}
-  
+
   	.el-select .el-input .el-select__caret {
   		color: #6996c6;
   	}

src/views/industry/ThermalPower.vue

@@ -549,7 +549,7 @@
                             :clearable="true" style="width: 40%;"></el-date-picker>
           </div>
           <!-- 隐患管理筛查项 -->
-          <div v-else-if="type=='城市体检'||type=='维护监管'||type=='基础事件'||type=='设备预警'">
+          <div v-else-if="type=='城市体检'||type=='日常监管'||type=='基础事件'||type=='设备预警'">
             <el-input v-model="searchValue" placeholder="事件名称" clearable class="input-width">
               <template #append></template>
             </el-input>
@@ -915,7 +915,7 @@
 <script>
 import DetailDialog from '@/components/DetailDialog/ThermalPower.vue';
 import {
-  getEnterpriseList, getEventDetail,getHeatingPipeByDataSetAndSmId,
+  getEnterpriseList,getHeatingPipeByDataSetAndSmId,
   getHeatingList,
   getHeatingPipeList, getHeatingPipeListByDataSetAndSmId,
   getManholeList,
@@ -928,7 +928,7 @@ import {
   selectFocusList,
   selectTaskList, selectThresholdList, selectTypeAndAasCompanylist, systemNoticeList
 } from "@/api/tableInfo";
-import { heatingViewEventList,selectDeviceNoPage } from '@/api/lookall'
+import { selectDeviceNoPage } from '@/api/lookall'
 import { getWeather } from '@/api/data'
 import {
   gasViewGetGasPipeList,
@@ -950,6 +950,7 @@ import {getUserProfile} from "@/api/system/user";
 import {queryVectorTilesMapList} from "@/api/components/supermap";
 import Cookies from "js-cookie";
 import {brandPageList, selectFmList} from "@/api/sentinel";
+import { selectEventList,getEventDetail } from '@/api/eventLifeLine'
 let echarts = require('echarts')
 export default {
   dicts: ['gas_pipeline_category','pressure_level','construction_tasks_status','lifeline_industry',
@@ -1006,7 +1007,7 @@ export default {
             title: '事件管理',
             chicken: [
               {title: '城市体检'},
-              {title: '维护监管'},
+              {title: '日常监管'},
               {title: '基础事件'},
               {title: '设备预警'},
               {title: '催办事件'},
@@ -1084,7 +1085,7 @@ export default {
       lonKey: 'longitude',
       hasPositionLabels: [
         '管线管理', '窨井管理','场站管理','企业管理',
-        '城市体检','维护监管', '基础事件', '设备预警', '催办事件', '督办事件',
+        '城市体检','日常监管', '基础事件', '设备预警', '催办事件', '督办事件',
         '物资管理', '设备管理','哨兵设备','智慧阀门'
       ],
       eventDialogVisible:false,
@@ -1331,7 +1332,7 @@ export default {
     this.initw_chart3()
     this.assessmentChart()
     this.selectTaskList();
-    this.heatingViewEventList();
+    this.selectEventList();
     this.getHeatingList();
     this.getWeather();
     this.selectFocusList();
@@ -1580,9 +1581,6 @@ export default {
     },
     openDetail(e,tile){
       if(tile == '预警列表') {
-        this.demoIdx = e.demoIdx
-        this.eventInfo = e
-        this.eventDialogVisible = true;
         this.openEventDetail(e);
       }else if(tile == '任务列表') {
         let obj = {
@@ -2069,285 +2067,26 @@ export default {
       }
         /****************************************************************设备管理end*******************************************************/
       /****************************************************************监管平台start*******************************************************/
-      else if(type == '城市体检'){
+      else if (type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警') {
         this.tableListVisible = true
-        selectEventExpediteList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
-          eventTypeCode: '1,2,3,4,20,21,22,23',
+          industry : 5,
+          eventTypeDl: type == '城市体检' ? 100 : type == '日常监管' ? 200 : type == '基础事件' ? 300 : type == '设备预警' ? 400 : null,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
-              prop: `eventTitle`,
-              label: '事件名称'
-            },
-            {
-              prop: `eventDescription`,
-              label: '事件描述',
-              hidden: true
-            },
-            {
-              prop: `createTime`,
-              label: '上报时间'
-            },
-            {
-              prop: `createBy`,
-              label: '创建人id',
-              hidden: true
-            },
-            {
-              prop: `createName`,
-              label: '创建人姓名',
-              hidden: true
-            },
-            {
-              prop: `eventTypeId`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `longitude`,
-              label: '经度',
-              hidden: true
-            },
-            {
-              prop: `latitude`,
-              label: '纬度',
-              hidden: true
-            },
-            {
-              prop: `eventStatus`,
-              label: '事件状态'
-            },
-            {
-              prop: `eventSource`,
-              label: '事件来源',
-              hidden: true
-            },
-            {
-              prop: `eventTypeName`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `expediteStatus`,
-              label: '催办状态',
-              hidden: true
-            },
-          ]
-          this.tableList = res.rows
-          this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
-          // 地图绑定落点
-          this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
-          if (res.rows) {
-            this.dataText = "暂无数据"
-          }
-        })
-      }
-      else if(type == '维护监管'){
-        this.tableListVisible = true
-        selectEventExpediteList({
-          pageNum: pageNum || 1,
-          pageSize: 10,
-          eventTypeCode: '1,2,3,4,20,21,22,23',
-          ...(this.searchTime ? {
-            createTime: this.searchTime
-          } : {}),
-          ...(this.searchValue ? {
-            eventTitle: this.searchValue
-          } : {})
-        }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
-              prop: `eventTitle`,
-              label: '事件名称'
-            },
-            {
-              prop: `eventDescription`,
-              label: '事件描述',
-              hidden: true
-            },
-            {
-              prop: `createTime`,
-              label: '上报时间'
-            },
-            {
-              prop: `createBy`,
-              label: '创建人id',
-              hidden: true
-            },
-            {
-              prop: `createName`,
-              label: '创建人姓名',
-              hidden: true
-            },
-            {
-              prop: `eventTypeId`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `longitude`,
-              label: '经度',
-              hidden: true
-            },
-            {
-              prop: `latitude`,
-              label: '纬度',
-              hidden: true
-            },
-            {
-              prop: `eventStatus`,
-              label: '事件状态'
-            },
-            {
-              prop: `eventSource`,
-              label: '事件来源',
-              hidden: true
-            },
-            {
-              prop: `eventTypeName`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `expediteStatus`,
-              label: '催办状态',
-              hidden: true
-            },
-          ]
-          this.tableList = res.rows
-          this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
-          // 地图绑定落点
-          this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
-          if (res.rows) {
-            this.dataText = "暂无数据"
-          }
-        })
-      }
-      else if(type == '基础事件'){
-        this.tableListVisible = true
-        selectEventExpediteList({
-          pageNum: pageNum || 1,
-          pageSize: 10,
-          eventTypeCode: '1,2,3,4,20,21,22,23',
-          ...(this.searchTime ? {
-            createTime: this.searchTime
-          } : {}),
-          ...(this.searchValue ? {
-            eventTitle: this.searchValue
-          } : {})
-        }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
-              prop: `eventTitle`,
-              label: '事件名称'
-            },
-            {
-              prop: `eventDescription`,
-              label: '事件描述',
-              hidden: true
-            },
-            {
-              prop: `createTime`,
-              label: '上报时间'
-            },
-            {
-              prop: `createBy`,
-              label: '创建人id',
-              hidden: true
-            },
-            {
-              prop: `createName`,
-              label: '创建人姓名',
-              hidden: true
-            },
-            {
-              prop: `eventTypeId`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `longitude`,
-              label: '经度',
-              hidden: true
-            },
-            {
-              prop: `latitude`,
-              label: '纬度',
-              hidden: true
-            },
-            {
-              prop: `eventStatus`,
-              label: '事件状态'
-            },
-            {
-              prop: `eventSource`,
-              label: '事件来源',
-              hidden: true
-            },
-            {
-              prop: `eventTypeName`,
-              label: '事件类型',
-              hidden: true
-            },
+          this.tablePropAndLabel = [
             {
-              prop: `expediteStatus`,
-              label: '催办状态',
+              prop: `eventId`,
+              label: '事件唯一标识',
               hidden: true
             },
-          ]
-          this.tableList = res.rows
-          this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
-          // 地图绑定落点
-          this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
-          if (res.rows) {
-            this.dataText = "暂无数据"
-          }
-        })
-      }
-      else if(type == '设备预警'){
-        this.tableListVisible = true
-        selectEventExpediteList({
-          pageNum: pageNum || 1,
-          pageSize: 10,
-          eventTypeCode: '1,2,3,4,20,21,22,23',
-          ...(this.searchTime ? {
-            createTime: this.searchTime
-          } : {}),
-          ...(this.searchValue ? {
-            eventTitle: this.searchValue
-          } : {})
-        }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
             {
               prop: `eventTitle`,
               label: '事件名称'
@@ -2387,7 +2126,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2401,15 +2140,13 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
           ]
           this.tableList = res.rows
           this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
           // 地图绑定落点
           this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
           if (res.rows) {
@@ -2417,21 +2154,22 @@ export default {
           }
         })
       }
-      else if(type == '催办事件'){
+      else if (type == '催办事件') {
         this.tableListVisible = true
-        selectEventExpediteList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
+          industry : 5,
           expediteStatus: 1,
-          eventTypeCode: '1,2,3,4,20,21,22,23',
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
+          this.tablePropAndLabel = [
+            {
             prop: `eventId`,
             label: '事件唯一标识',
             hidden: true
@@ -2475,7 +2213,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2489,15 +2227,13 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
           ]
           this.tableList = res.rows
           this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
           // 地图绑定落点
           this.setMakersHandler(type, 'longitude', 'latitude', res.rows, 'event')
           if (res.rows) {
@@ -2505,20 +2241,22 @@ export default {
           }
         })
       }
-      else if(type == '督办事件'){
+      else if (type == '督办事件') {
         this.tableListVisible = true
-        selectEventSuperviseList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
-          eventTypeCode: '1,2,3,4,20,21,22,23',
+          industry : 5,
+          superviseStatus: 1,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
+          this.tablePropAndLabel = [
+            {
             prop: `eventId`,
             label: '事件唯一标识',
             hidden: true
@@ -2562,7 +2300,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2576,15 +2314,13 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
           ]
           this.tableList = res.rows
           this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
           // 地图绑定落点
           this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
           if (res.rows) {
@@ -2605,7 +2341,8 @@ export default {
             taskName: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
+          this.tablePropAndLabel = [
+            {
             prop: 'id',
             label: '主键',
             hidden: true
@@ -3165,7 +2902,7 @@ export default {
             markersMap.icon = "cuiban";
             break;
           case '城市体检':
-          case '维护监管':
+          case '日常监管':
           case '基础事件':
           case '设备预警':
             markersMap.icon = "yujing";
@@ -3445,30 +3182,10 @@ export default {
       }
         /****************************************************************设备管理end*******************************************************/
       /****************************************************************监管平台start*******************************************************/
-      else if(type == '城市体检'){
+      else if(type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警'||type == "催办事件"||type == "督办事件"){
         this.openEventDetail(row);
         return
       }
-      else if(type == '维护监管'){
-        this.openEventDetail(row);
-        return
-      }
-      else if(type == '基础事件'){
-        this.openEventDetail(row);
-        return
-      }
-      else if(type == '设备预警'){
-        this.openEventDetail(row);
-        return;
-      }
-      else if(type == "催办事件"){
-        this.openEventDetail(row);
-        return;
-      }
-      else if(type == "督办事件"){
-        this.openEventDetail(row);
-        return;
-      }
       else if(type == '巡检巡查任务管理'){
         let obj = {
           "巡检任务名称": row.taskName,
@@ -3580,7 +3297,10 @@ export default {
     },
     // 打开事件详情弹窗
     openEventDetail(obj) {
-      getEventDetail(obj.eventId).then(res => {
+      getEventDetail({
+        eventId: obj.eventId
+      }).then(res => {
+        this.demoIdx = obj.demoIdx
         this.eventInfo = res.data
         this.eventDialogVisible = true
       })
@@ -3729,11 +3449,13 @@ export default {
       })
     },
     /**
-     * 事件列表
+     * 预警列表
      */
-    heatingViewEventList(){
-      heatingViewEventList({eventTypeCode:'1,2,3,4,20,21,22,23'}).then(res => {
-        this.eventList = res.rows;
+    selectEventList(){
+      selectEventList({
+        industry: '5'
+      }).then(res => {
+        this.eventList = res.rows
       })
     },
     /**

src/views/industry/UtilityTunnel.vue

@@ -2,7 +2,7 @@
 <template>
 	<div class="ut">
     <!-- 地图 -->
-    <supermap ref="supermap" style="width: 100%;height: 100vh;position: relative;" @getPipeByDataSetAndSmId="getPipeByDataSetAndSmId" @getHeatingPipeByDataSetAndSmId="getHeatingPipeByDataSetAndSmId"  @previewPointDetail="previewPointDetail" :showLayer="true">
+    <supermap ref="supermap" style="width: 100%;height: 100vh;position: relative;" @getPipeByDataSetAndSmId="getPipeByDataSetAndSmId"  @previewPointDetail="previewPointDetail" :showLayer="true">
     </supermap>
 		<div class="ut_header">
 			<div class="left_head">
@@ -155,7 +155,7 @@
                     content="Right Center 提示文字" placement="right">
           <div slot="content">
             <p @click="TableInfoHandler('城市体检', deptId, null)">城市体检</p>
-            <p @click="TableInfoHandler('维护监管', deptId, null)">维护监管</p>
+            <p @click="TableInfoHandler('日常监管', deptId, null)">日常监管</p>
             <p @click="TableInfoHandler('基础事件', deptId, null)">基础事件</p>
             <p @click="TableInfoHandler('设备预警', deptId, null)">设备预警</p>
             <p @click="TableInfoHandler('催办事件', deptId, null)">催办事件</p>
@@ -553,7 +553,7 @@
           </el-select>
         </div>
         <!-- 城市体检筛查项 -->
-        <div v-else-if="currentType=='城市体检'||currentType=='维护监管'||currentType=='基础事件'||currentType=='设备预警'">
+        <div v-else-if="currentType=='城市体检'||currentType=='日常监管'||currentType=='基础事件'||currentType=='设备预警'">
           <el-input v-model="searchValue" placeholder="事件名称" clearable>
             <template #append></template>
           </el-input>
@@ -730,7 +730,6 @@ import DetailDialog from "@/components/DetailDialog/UtilityTunnel.vue";
 import PipeLineDetail from '@/components/PipeLineDetail/index.vue'
 	let echarts = require('echarts')
 import { iconList, queryVectorTilesMapList } from '@/api/components/supermap'
-import { heatingViewEventList } from '@/api/lookall'
 import {getUserProfile} from "@/api/system/user";
 import Cookies from "js-cookie";
 import { getWeather } from '@/api/data'
@@ -760,6 +759,9 @@ import {
   getUtilityTunnelByDataSetAndSmId,
   getDeviceTypeCount, utilityTunnelHiddenDangerList,                           // 管廊-按照类型统计设备数量
 } from '@/api/UtillityTunnel'
+
+import { getEventDetail, selectEventList } from '@/api/eventLifeLine'
+
 	export default {
     dicts: ['heating_device_type','heating_pipeline_category','construction_tasks_status','lifeline_industry','sys_notice_status','sys_notice_type','sys_normal_disable','sys_user_sex','lifeline_enterprise','task_issuing_dept','heating_device_type','utilityTunnel_body_type','utilityTunnel_repair_properties','utilityTunnel_fult_type'],
     components: {
@@ -786,7 +788,7 @@ import {
         total: 0,
         latKey: '',
         lonKey: '',
-        hasPositionLabels: ['管廊管理', '窨井管理', '城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件', '设备管理','用户管理'],//有定位功能的列表类型
+        hasPositionLabels: ['管廊管理', '窨井管理', '城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件', '设备管理','用户管理'],//有定位功能的列表类型
         dataText:'',
         taskListTotal:0,
         taskList:[],
@@ -879,7 +881,7 @@ import {
       this.getDeviceTypeCount()
       setTimeout(() => {
         this.selectTaskList();
-        this.heatingViewEventList();
+        this.selectEventList();
         this.getHeatingList();
         this.initPipeLineChart()
         this.assessmentChart()
@@ -950,10 +952,10 @@ import {
         })
       },
       /**
-       * 事件列表
+       * 预警列表
        */
-      heatingViewEventList() {
-        heatingViewEventList({eventTypeCode: 4}).then(res => {
+      selectEventList() {
+        selectEventList({industry: '4'}).then(res => {
           this.eventList = res.rows
           this.eventListTotal = res.total
         })
@@ -1545,25 +1547,26 @@ import {
             }
           })
         }
-        else if (type == '城市体检'||type == '维护监管'||type == '基础事件'||type == '设备预警') {
+        else if (type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警') {
           this.tableListVisible = true
-          selectEventExpediteList({
+          selectEventList({
             pageNum: pageNum || 1,
             pageSize: 10,
-            expediteStatus: 1,
-            eventTypeCode: '4',
+            industry : 4,
+            eventTypeDl: type == '城市体检' ? 100 : type == '日常监管' ? 200 : type == '基础事件' ? 300 : type == '设备预警' ? 400 : null,
             ...(this.searchTime ? {
-              createTime: this.searchTime
+              selectDay: this.searchTime
             } : {}),
             ...(this.searchValue ? {
               eventTitle: this.searchValue
             } : {})
           }).then(res => {
-            this.tablePropAndLabel = [{
-              prop: `eventId`,
-              label: '事件唯一标识',
-              hidden: true
-            },
+            this.tablePropAndLabel = [
+              {
+                prop: `eventId`,
+                label: '事件唯一标识',
+                hidden: true
+              },
               {
                 prop: `eventTitle`,
                 label: '事件名称'
@@ -1603,7 +1606,7 @@ import {
                 hidden: true
               },
               {
-                prop: `eventStatus`,
+                prop: `eventStatusLabel`,
                 label: '事件状态'
               },
               {
@@ -1617,7 +1620,7 @@ import {
                 hidden: true
               },
               {
-                prop: `expediteStatus`,
+                prop: `expediteStatusLabel`,
                 label: '催办状态',
                 hidden: true
               },
@@ -1633,23 +1636,24 @@ import {
         }
         else if (type == '催办事件') {
           this.tableListVisible = true
-          selectEventExpediteList({
+          selectEventList({
             pageNum: pageNum || 1,
             pageSize: 10,
+            industry : 4,
             expediteStatus: 1,
-            eventTypeCode: '4',
             ...(this.searchTime ? {
-              createTime: this.searchTime
+              selectDay: this.searchTime
             } : {}),
             ...(this.searchValue ? {
               eventTitle: this.searchValue
             } : {})
           }).then(res => {
-            this.tablePropAndLabel = [{
-              prop: `eventId`,
-              label: '事件唯一标识',
-              hidden: true
-            },
+            this.tablePropAndLabel = [
+              {
+                prop: `eventId`,
+                label: '事件唯一标识',
+                hidden: true
+              },
               {
                 prop: `eventTitle`,
                 label: '事件名称'
@@ -1689,7 +1693,7 @@ import {
                 hidden: true
               },
               {
-                prop: `eventStatus`,
+                prop: `eventStatusLabel`,
                 label: '事件状态'
               },
               {
@@ -1703,7 +1707,7 @@ import {
                 hidden: true
               },
               {
-                prop: `expediteStatus`,
+                prop: `expediteStatusLabel`,
                 label: '催办状态',
                 hidden: true
               },
@@ -1719,22 +1723,24 @@ import {
         }
         else if (type == '督办事件') {
           this.tableListVisible = true
-          selectEventSuperviseList({
+          selectEventList({
             pageNum: pageNum || 1,
             pageSize: 10,
-            eventTypeCode: '4',
+            industry : 4,
+            superviseStatus: 1,
             ...(this.searchTime ? {
-              createTime: this.searchTime
+              selectDay: this.searchTime
             } : {}),
             ...(this.searchValue ? {
               eventTitle: this.searchValue
             } : {})
           }).then(res => {
-            this.tablePropAndLabel = [{
-              prop: `eventId`,
-              label: '事件唯一标识',
-              hidden: true
-            },
+            this.tablePropAndLabel = [
+              {
+                prop: `eventId`,
+                label: '事件唯一标识',
+                hidden: true
+              },
               {
                 prop: `eventTitle`,
                 label: '事件名称'
@@ -1774,7 +1780,7 @@ import {
                 hidden: true
               },
               {
-                prop: `eventStatus`,
+                prop: `eventStatusLabel`,
                 label: '事件状态'
               },
               {
@@ -1788,7 +1794,7 @@ import {
                 hidden: true
               },
               {
-                prop: `expediteStatus`,
+                prop: `expediteStatusLabel`,
                 label: '催办状态',
                 hidden: true
               },
@@ -2004,7 +2010,7 @@ import {
           selectMaterialsList({
             pageNum: pageNum || 1,
             pageSize: 10,
-            industry: 5,
+            industry: 4,
             ...(this.searchCode ? {
               type: this.searchCode
             } : {}),
@@ -2753,57 +2759,9 @@ import {
           this.$refs.detailDialog.openDetail(type,obj);
           return;
         }
-        else if (type == "城市体检"||type == "维护监管"||type == "基础事件"||type == "设备预警") {
-          let obj = {
-            "事件名称": row.eventTitle,
-            "上报时间": row.createTime,
-            "上报人姓名": row.createName,
-            "事件类型": row.eventTypeName,
-            "经度": row.longitude,
-            "纬度": row.latitude,
-            "事件状态": row.eventStatus,
-            "事件来源": row.eventSource,
-            "催办状态": row.expediteStatus,
-            "事件描述": row.eventDescription,
-            // "部门名称": row.deptName,
-          };
-          this.openEventDetail(row);
-          return;
-        }
-        else if (type == "催办事件") {
-          let obj = {
-            "事件名称": row.eventTitle,
-            "上报时间": row.createTime,
-            "上报人姓名": row.createName,
-            "事件类型": row.eventTypeName,
-            "经度": row.longitude,
-            "纬度": row.latitude,
-            "事件状态": row.eventStatus,
-            "事件来源": row.eventSource,
-            "催办状态": row.expediteStatus,
-            "事件描述": row.eventDescription,
-            // "部门名称": row.deptName,
-          };
-          this.openEventDetail(row);
-          return;
-        }
-        else if (type == "督办事件") {
-          let obj = {
-            "事件名称": row.eventTitle,
-            "上报时间": row.createTime,
-            "上报人姓名": row.createName,
-            "事件类型": row.eventTypeName,
-            "经度": row.longitude,
-            "纬度": row.latitude,
-            "事件状态": row.eventStatus,
-            "事件来源": row.eventSource,
-            "事件类型": row.eventTypeName,
-            "催办状态": row.expediteStatus,
-            "事件描述": row.eventDescription,
-            // "部门名称": row.deptName,
-          };
+        else if(type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警'||type == "催办事件"||type == "督办事件"||type == "预警列表"){
           this.openEventDetail(row);
-          return;
+          return
         }
         else if (type == "值班管理") {
           let obj = {
@@ -3073,7 +3031,7 @@ import {
               markersMap.icon = "cuiban";
               break;
             case '城市体检':
-            case '维护监管':
+            case '日常监管':
             case '基础事件':
             case '设备预警':
               markersMap.icon = "yujing";
@@ -3094,6 +3052,15 @@ import {
         }, 2000)
 
       },
+      // 打开事件详情弹窗
+      openEventDetail(obj) {
+        getEventDetail({
+          eventId: obj.eventId
+        }).then(res => {
+          this.eventInfo = res.data
+          this.eventDialogVisible = true
+        })
+      },
       flyTo(currentType, longitude, latitude) {
         this.$refs.supermap.dropLocation(latitude * 1, longitude * 1);
         if (currentType == '管廊管理') {

src/views/industry/jgpt.vue

@@ -432,16 +432,16 @@
 					</div>
 				</div>
 			</div>
-			<!--事件列表-->
+			<!--预警列表-->
 			<div class="right-content">
 				<div class="title-bar" style="cursor: pointer;" @click="toSbList">
 					<!--<el-popover placement="left-start" width="400" trigger="click" popper-class="sj-pop-con">-->
 						<!--<div class="title-bar-pop">-->
-							<!--<span>事件列表</span>-->
+							<!--<span>预警列表</span>-->
 						<!--</div>-->
-						<!--<div slot="reference" style="cursor: pointer;">事件统计</div>-->
+						<!--<div slot="reference" style="cursor: pointer;">预警统计</div>-->
 					<!--</el-popover>-->
-						<span>事件统计</span>
+						<span>预警统计</span>
 				</div>
 				<div class="content-box sjtj" >
 					<el-tabs v-model="activeName1" class="sj-top-tab">
@@ -765,7 +765,7 @@
 		industryDataCompleteness,
 		inspectionAndHiddenDanger,                     	// 巡检及隐患
 		eventContingencyPlan,                     		// 应急预案
-		eventStatistics,								// 事件统计
+		eventStatistics,								// 预警统计
 		warningManagement,								// 预警管理
 		expediteOrSuperviseCount,						// 事件统计:催办/督办
 	} from "@/api/jgpt";
@@ -4182,7 +4182,7 @@
 	}
 }
 
-/*事件统计*/
+/*预警统计*/
 	.sjtj{
 		margin-bottom: 15px!important;
 		height: 150px!important;

src/views/industry/lookall.vue

@@ -73,7 +73,7 @@
 						content="Right Center 提示文字" placement="right">
 						<div slot="content">
 							<p :class="{ 'active': activeSubItem === '城市体检'}" @click="showInfoDialog('城市体检')">城市体检</p>
-							<p :class="{ 'active': activeSubItem === '维护监管'}" @click="showInfoDialog('维护监管')">维护监管</p>
+							<p :class="{ 'active': activeSubItem === '日常监管'}" @click="showInfoDialog('日常监管')">日常监管</p>
 							<p :class="{ 'active': activeSubItem === '基础事件'}" @click="showInfoDialog('基础事件')">基础事件</p>
 							<p :class="{ 'active': activeSubItem === '设备预警'}" @click="showInfoDialog('设备预警')">设备预警</p>
 							<p :class="{ 'active': activeSubItem === '催办事件'}" @click="showInfoDialog('催办事件')">催办事件</p>
@@ -237,10 +237,10 @@
 					<!-- 预警列表 -->
 					<div class="event search_contain">
 						<div class="titleBar" data-text="预警列表"></div>
-						<el-select v-model="currentEventType" @change="heatingViewEventList" placeholder="请选择事件类型"
+						<el-select v-model="currentEventType" @change="selectEventList" placeholder="请选择事件类型"
 							clearable style="position: absolute;right: 3.3%;top: 33%;" popper-class="rl-pop">
 							<el-option label="城市体检" value="1" />
-							<el-option label="维护监管" value="2" />
+							<el-option label="日常监管" value="2" />
 							<el-option label="基础事件" value="3" />
 							<el-option label="设备预警" value="4" />
 						</el-select>
@@ -248,13 +248,13 @@
 							<div v-for="(e,idx) in eventList" :key="idx" class="event-item"
 								@click="openDetail(e,'预警列表',idx)">
 								<div>{{ e.createTime }}</div>
-								<div class="line">——————————{{ idx%2 == 0 ? '紧急事件' : '基础事件' }}</div>
+								<div class="line">——————————{{ e.eventTypeDlLabel }}</div>
 								<div class="content">
 									<div
 										:class="e.eventStatusLabel != '办结' ? 'event-item-unprocessed' : 'event-item-completed'">
 									</div>
 									<div class="content-text" :title="e.eventTitle">
-										{{ idx == 1 ? '【日常监管】年度计划超期未完成,告警时间：2025-10-24 10:02:21;' : e.eventTitle }}
+										{{  e.eventTitle }}
 									</div>
 								</div>
 							</div>
@@ -795,129 +795,8 @@
 		<TableInfo ref="tableInfo" />
 		<DetailDialog ref="detailDialog" />
 		<!-- 事件详情弹窗 -->
-		<el-dialog title="事件详情" :visible.sync="eventDialogVisible" custom-class="eventDialog"
-			style="margin-top: 5vh !important;">
-			<div class="transferBg d1">
-				<h3>事件基本信息</h3>
-				<div class="eventInfo_contain">
-					<div style="width: 100%;" class="sj_tit">事件名称：{{ eventInfo['事件名称'] || '' }}</div>
-					<div>事件类型：{{ eventInfo['事件类型'] || '' }}</div>
-					<div>上报时间：{{ eventInfo['上报时间'] || '' }}</div>
-					<div>事件状态：{{ eventInfo['事件状态'] || '' }}</div>
-					<div>经度：{{ eventInfo['经度'] || '' }}</div>
-					<div>纬度：{{ eventInfo['纬度'] || '' }}</div>
-					<div class="videoLinkage"></div>
-				</div>
-			</div>
-			<div class="transferBg d2">
-				<h3>事件处理流程</h3>
-				<div class="progress_contain">
-					<div class="line"></div>
-					<div class="e1">
-						<img src="@/assets/images/eventLogo2.png">
-						<div>事件发起</div>
-						<div class="z-lc-time">
-							2025/11/05 07:45:11
-						</div>
-						<el-tooltip class="item" v-if="true" placement="top" popper-class="sj-tooltip">
-							<div slot="content" class="info-list">
-								<span>处置人：张远</span>
-							</div>
-							<div class="z-clyj">
-								<img src="@/assets/index_img/clyj-icon.png" />
-							</div>
-						</el-tooltip>
-					</div>
-					<div class="e2">
-						<img src="@/assets/images/eventLogo2.png">
-						<div>事件签收</div>
-					</div>
-					<div class="e3">
-						<img src="@/assets/images/eventLogo2.png">
-						<div>事件处理</div>
-					</div>
-					<div class="e4">
-						<img src="@/assets/images/eventLogo2.png">
-						<div>事件办结</div>
-					</div>
-				</div>
-			</div>
-			<div class="d3">
-				<div class="transferBg video" v-if="demoIdx != 1">
-					<h3>现场图片</h3>
-					<image-preview :src="require('@/assets/images/alarm.png')" :width="580" :height="360" />
-				</div>
-				<div class="transferBg video" v-else>
-					<h3>计划附件</h3>
-					<image-preview src="http://116.142.80.13:8081/group1/M00/00/2E/wKgKC2kNSGGACoyXAACpxjuIY5c521.png"
-						:width="580" :height="360" />
-				</div>
-				<div class="mid">
-					<div class="transferBg info" v-if="demoIdx != 1">
-						<h3>现场状况</h3>
-						<div class="xczk_div">
-							<div>事件当前伤亡：0人</div>
-							<div>事件预警影响：10人</div>
-							<div>预计解决时间：3天</div>
-							<div>当前处理人员：王鹤</div>
-							<div>处理人员电话：18130987651</div>
-						</div>
-					</div>
-					<div class="transferBg info_right" :class="demoIdx == 1 ? 'demoDeptStylesheet' : '' ">
-						<h3 v-show="demoIdx != 0">联动部门</h3>
-						<h4 v-show="demoIdx != 0" style="margin-top: 4%;"></h4>
-						<div v-show="demoIdx != 0" class="planItem"
-							style="border-left: none; display: flex; align-items: center;">
-							<img src="@/assets/images/online-img2.png"
-								style="width: 30px; height:30px; margin:0 5px 0 0 ;">
-							<div style="margin-top: 0 !important;">四平市</div>
-						</div>
-
-						<h3 v-show="demoIdx == 0">设备数据</h3>
-						<div v-show="demoIdx == 0" class="div_Option" ref="divOption"></div>
-					</div>
-					<div class="transferBg pics">
-						<h3>处置照片</h3>
-						<div class="otherPics">
-							<image-preview :src="require('@/assets/images/alarm_1.png')" :width="200" :height="137" />
-						</div>
-						<!--    <router-link to="#" v-for="item, index in emergencyEventDetails.attachPath">
-                  <el-image :src="item"
-                      :preview-src-list="assetTypeAnImage(emergencyEventDetails.attachPath, index)"
-                      style="width:8rem; height:8rem;margin: 5px;">
-                  </el-image>
-                </router-link>
-              </div> -->
-					</div>
-				</div>
-				<div class="right transferBg">
-					<h3>事件日志</h3>
-					<div class="block le_ri">
-						<el-scrollbar style="height: 378px;" class="spsb_time">
-							<el-timeline>
-								<el-timeline-item placement="top">
-									<span class="timeline-span">{{ eventInfo['上报时间'] || '' }}</span>
-									<el-card>
-										<h4>{{ eventInfo['事件描述'] || '' }}</h4>
-										<p>{{ eventInfo['上报时间'] || '' }} 提交于 {{ eventInfo['上报时间'] || '' }}</p>
-									</el-card>
-								</el-timeline-item>
-							</el-timeline>
-						</el-scrollbar>
-						<div class="spsb_xx">
-							<textarea class="spsb_text" v-model="reviewDescription" placeholder=""> </textarea>
-							<div class="btn_option">
-								<el-button>签收</el-button>
-								<el-button>办结</el-button>
-								<el-button>驳回</el-button>
-								<el-button>归档</el-button>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</el-dialog>
-	</div>
+    <EventDetail ref="eventDetail" />
+  </div>
 
 </template>
 
@@ -932,6 +811,7 @@
 		getWeather
 	} from '@/api/data'
 	import DetailDialog from "@/components/DetailDialog/lookall.vue";
+	import EventDetail from "@/components/DetailDialog/eventDetail.vue";
 
 	let echarts = require('echarts')
 	import Cookies from 'js-cookie'
@@ -941,7 +821,6 @@
 	} from '@/api/components/supermap'
 	import {
 		categoryStats,
-		heatingViewEventList,
 		inspectionMileageAnalysis,
 		selectDeviceNoPage,
 		selectHeatStationNoPage,
@@ -949,6 +828,7 @@
 		heatingViewPipeLengthStats,
 		heatingViewGetDeviceTypeCount
 	} from '@/api/lookall'
+
 	import {
 		getHeatingPipeListByDataSetAndSmId,
 		getHeatingList,
@@ -961,6 +841,11 @@
 		heatingUserList,
 		getReportList
 	} from '@/api/tableInfo'
+
+  import {
+    getEventDetail,
+    selectEventList
+  } from '@/api/eventLifeLine'
 	import modal from '@/plugins/modal'
 
 	export default {
@@ -973,6 +858,7 @@
 			TableInfo,
 			supermap,
 			DetailDialog,
+      EventDetail
 		},
 		data() {
 			return {
@@ -1296,8 +1182,6 @@
             ]
           }
         ],
-				eventDialogVisible: false,
-				eventInfo: {},
 				isOnDutyVisible: false,
 				searchValue: '',
 				searchCode: '',
@@ -1331,7 +1215,7 @@
 			this.getSuperMapUrl();
 			this.selectTaskList();
 			this.selectFocusList();
-			this.heatingViewEventList();
+			this.selectEventList();
 			this.categoryStats();
 			this.inspectionMileageAnalysis();
 			this.getHeatingList();
@@ -2163,16 +2047,16 @@
 				this.activeSubItem = ''
         this.type = '';
 			},
-			openDetail(e, tile, demoIdx) {
-				if (tile == '重点关注') {
+			openDetail(e, type, demoIdx) {
+				if (type == '重点关注') {
 					let obj = {
 						"标题": e.followName,
 						"附件": e.followUrl,
 						"创建时间": e.createTime,
 						"详情": e.followRemark,
 					}
-					this.$refs.detailDialog.openDetail(tile, obj);
-				} else if (tile == '隐患列表') {
+					this.$refs.detailDialog.openDetail(type, obj);
+				} else if (type == '隐患列表') {
 					let obj = {
 						"隐患标题": e.title,
 						"管线名称": e.pipeName,
@@ -2188,8 +2072,8 @@
 						"整改前图片": 'http://116.142.80.13:8081/group1/M00/00/2D/wKgKC2kAcBeAUz2IAAb_TSnIT-c466.png',
 						"整改后图片": e.rectificationUrl
 					}
-					this.$refs.detailDialog.openDetail(tile, obj);
-				} else if (tile == '任务列表') {
+					this.$refs.detailDialog.openDetail(type, obj);
+				} else if (type == '任务列表') {
 					let obj = {
 						"任务标题": e.title,
 						"任务状态": this.dict.type.construction_tasks_status.find(item => item.value == e.status).label,
@@ -2199,29 +2083,11 @@
 						"任务详情": e.content,
 						"附件": e.reportUrl,
 					}
-					this.$refs.detailDialog.openDetail(tile, obj);
-				} else if (tile == '预警列表') {
-					let obj = {
-						"事件名称": demoIdx == 1 ? '【日常监管】年度计划超期未完成,告警时间：2025-10-24 10:02:21;' : e.eventTitle,
-						"上报时间": demoIdx == 1 ? '2025-10-24 10:02:21;' : e.createTime,
-						"上报人姓名": e.createName,
-						"事件类型": demoIdx == 1 ? '日常监管' : e.eventTypeName,
-						"经度": e.longitude,
-						"纬度": e.latitude,
-						"事件状态": demoIdx == 1 ? '年度计划超期未完成' : e.eventStatusLabel,
-						"事件来源": e.eventSource,
-						"催办状态": e.expediteStatus,
-						"事件描述": demoIdx == 1 ? '【日常监管】年度计划超期未完成,告警时间：2025-10-24 10:02:21;' : e.eventDescription,
-					}
-					this.demoIdx = demoIdx
-					this.eventInfo = obj
-					this.eventDialogVisible = true
-					if (this.demoIdx == 0) {
-						setTimeout(() => {
-							this.initDemoChart()
-						})
-					}
-				} else if (tile == "值班管理") {
+					this.$refs.detailDialog.openDetail(type, obj);
+				} else if(type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警'||type == "催办事件"||type == "督办事件"||type == "预警列表"){
+          this.openEventDetail(e);
+          return
+        } else if (type == "值班管理") {
 					let obj = {
 						"企业名称": e.companyName,
 						"所属行业": this.dict.type.lifeline_industry.find(item => item.value == e.industry)?.label,
@@ -2233,7 +2099,7 @@
 						// "备注": e.remark,
 					};
 					return;
-				} else if (tile == "通知通告") {
+				} else if (type == "通知通告") {
 					let obj = {
 						"公告标题": e.noticeTitle,
 						"公告类型": this.dict.type.sys_notice_type.find(item => item.value == e.noticeType)?.label,
@@ -2248,9 +2114,9 @@
 						// "发布状态": e.release,
 						"备注": e.remark,
 					};
-					this.$refs.detailDialog.openDetail(tile, obj);
+					this.$refs.detailDialog.openDetail(type, obj);
 					return;
-				} else if (tile == "人员管理") {
+				} else if (type == "人员管理") {
 					let obj = {
 						// "部门ID": e.deptId,
 						"用户账号": e.userName,
@@ -2264,19 +2130,23 @@
 						"最后登录时间": e.loginDate,
 						"备注": e.remark,
 					};
-					this.$refs.detailDialog.openDetail(tile, obj);
+					this.$refs.detailDialog.openDetail(type, obj);
 					return;
-				} else if (tile == "维护报告") {
+				} else if (type == "维护报告") {
 					let obj = {
 						"标题": e.reportName,
 						"企业": this.dict.type.lifeline_enterprise.find(item => item.value == e.enterprise)?.label,
 						"行业": this.dict.type.lifeline_industry.find(item => item.value == e.industry)?.label,
 						"描述": e.reportRemark,
 					};
-					this.$refs.detailDialog.openDetail(tile, obj);
+					this.$refs.detailDialog.openDetail(type, obj);
 					return;
 				}
 			},
+      // 打开事件详情弹窗
+      openEventDetail(obj) {
+        this.$refs.eventDetail.openEventDetail(obj.eventId)
+      },
 			resetActiveSubItem() {
 				this.activeSubItem = ''
 			},
@@ -3113,9 +2983,9 @@
 						}))
 						window.open('/tableInfoHandler', '_blank')
 						break
-					case '维护监管':
+					case '日常监管':
 						sessionStorage.setItem('tableInfoParams', JSON.stringify({
-							type: '维护监管',
+							type: '日常监管',
 
 						}))
 						window.open('/tableInfoHandler', '_blank')
@@ -3387,11 +3257,11 @@
 				})
 			},
 			/**
-			 * 事件列表
+			 * 预警列表
 			 */
-			heatingViewEventList(val) {
-				heatingViewEventList({
-					eventTypeCode: '5'
+			selectEventList(val) {
+				selectEventList({
+          industry: '1'
 				}).then(res => {
 					this.eventList = res.rows
 				})

src/views/industry/paishui.vue

@@ -332,7 +332,7 @@
           </el-select>
         </div>
         <!-- 隐患管理筛查项 -->
-        <div v-else-if="type=='城市体检'||type=='维护监管'||type=='基础事件'||type=='设备预警'">
+        <div v-else-if="type=='城市体检'||type=='日常监管'||type=='基础事件'||type=='设备预警'">
           <el-input v-model="searchValue" placeholder="事件名称" clearable class="sj-in">
             <template #append></template>
           </el-input>
@@ -498,16 +498,16 @@
 			</div>
 			<div class="fldx-cont">
 				<dl class="shijian-list">
-					<dd v-for="(e,idx) in eventList" :key="idx" @click="openDetail(e,'预警列表',idx)">
+					<dd v-for="(item,idx) in eventList" :key="idx" @click="openDetail(e,'预警列表',idx)">
 						<div class="sjtop">
 							<i></i>
-							<span>{{ e.createTime || '' }}</span>
+							<span>{{ item.createTime || '' }}</span>
 							<hr class="borcb" />
-							<em class="cuiban">{{ e.eventStatus || '' }}</em>
+							<em class="cuiban">{{ item.eventStatusLabel || '' }}</em>
 						</div>
 						<div class="sjname">
-							<em class="weiBj">{{ e.expediteStatus }}</em>
-							<span :title="e.eventTitle">{{ e.eventTitle }}</span>
+							<em class="weiBj">{{ item.expediteStatusLabel }}</em>
+							<span :title="item.eventTitle">{{ item.eventTitle }}</span>
 						</div>
 					</dd>
 				</dl>
@@ -603,7 +603,7 @@
                           content="Right Center 提示文字" placement="right">
                 <div slot="content">
                   <span @click="getDataBaseList('城市体检')">城市体检</span><br>
-                  <span @click="getDataBaseList('维护监管')">维护监管</span><br>
+                  <span @click="getDataBaseList('日常监管')">日常监管</span><br>
                   <span @click="getDataBaseList('基础事件')">基础事件</span><br>
                   <span @click="getDataBaseList('设备预警')">设备预警</span><br>
                   <span @click="getDataBaseList('催办事件')">催办事件</span><br>
@@ -628,7 +628,7 @@
                 <span><img src="~@/assets/images/paishui/sj-icon-half.png" />综合管理</span>
               </el-tooltip>
 <!--							<span><img src="~@/assets/images/paishui/sj-icon-half.png" />城市体检</span>-->
-<!--							<span><img src="~@/assets/images/paishui/sj-icon-half.png" />维护监管</span>-->
+<!--							<span><img src="~@/assets/images/paishui/sj-icon-half.png" />日常监管</span>-->
 <!--							<span><img src="~@/assets/images/paishui/sj-icon-half.png" />基础事件</span>-->
 <!--							<span><img src="~@/assets/images/paishui/sj-icon-half.png" />设备预警</span>-->
 <!--							<span><img src="~@/assets/images/paishui/sj-icon-half.png" />催办事件</span>-->
@@ -956,7 +956,6 @@
     getReportList,
     heatingUserList,
     selectDutyVisualizationList,
-    selectEventExpediteList,
     selectEventSuperviseList,
     selectTaskList,
     selectThresholdList,
@@ -967,6 +966,7 @@
   } from '@/api/tableInfo'
 	import { iconList, queryVectorTilesMapList } from '@/api/components/supermap'
   import { getWeather } from '@/api/data'
+  import { getEventDetail, selectEventList } from '@/api/eventLifeLine'
 	export default {
 		dicts: [, 'sys_user_sex', 'sys_normal_disable',
 			'lifeline_enterprise', 'lifeline_industry', 'resident_type', 'construction_tasks_status',
@@ -982,7 +982,7 @@
           label: 'name',
           children: 'children'
         },
-        hasPositionLabels: ['管线管理', '窨井管理','易涝点管理','堤防管理','下穿立交管理','泵站管理','雨量站管理','污水处理厂管理','调蓄设施管理','企业管理','用户管理','设备管理','城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件'],
+        hasPositionLabels: ['管线管理', '窨井管理','易涝点管理','堤防管理','下穿立交管理','泵站管理','雨量站管理','污水处理厂管理','调蓄设施管理','企业管理','用户管理','设备管理','城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件'],
         type:"",
         weather:"",
         weatherinformationWeather:"",
@@ -1142,48 +1142,7 @@
 						status: '已完成',
 					},
 				],
-				eventList: [{
-						label: '测试事件1测试事件1测试事件1测试事件1测试事件1测试事件1测试事件1测试事件1测试事件1测试事件1测试事件1',
-						time: '2025-02-20 08:54',
-						status: '未办结',
-					},
-					{
-						label: '测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2测试事件2',
-						time: '2025-02-20 08:54',
-						status: '已办结',
-					},
-					{
-						label: '测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3测试事件3',
-						time: '2025-02-20 08:54',
-						status: '未办结',
-					}
-				],
-				riskList: [{
-						label: '风险/隐患名称1风险/隐患名称1风险/隐患名称1风险/隐患名称1风险/隐患名称1',
-						time: '2025-02-20 08:54',
-						status: '已整改',
-					},
-					{
-						label: '风险/隐患名称2风险/隐患名称2风险/隐患名称2风险/隐患名称2风险/隐患名称2',
-						time: '2025-02-20 08:54',
-						status: '未整改',
-					},
-					{
-						label: '风险/隐患名称3风险/隐患名称3风险/隐患名称3风险/隐患名称3风险/隐患名称3',
-						time: '2025-02-20 08:54',
-						status: '整改中',
-					},
-					{
-						label: '风险/隐患名称156风险/隐患名称156风险/隐患名称156风险/隐患名称156风险/隐患名称156',
-						time: '2025-02-20 08:54',
-						status: '无需整改',
-					},
-					{
-						label: '风险/隐患名称14风险/隐患名称14风险/隐患名称14风险/隐患名称14风险/隐患名称14',
-						time: '2025-02-20 08:54',
-						status: '已整改',
-					},
-				],
+				eventList: [],
 				gasTimePeriod: 'week', // 当前用气量分析选择时间段 默认为“周”
 				inspectionTimePeriod: 'week', // 巡检里程分析选择时间段 默认为“周”
 				layerVisible: false,
@@ -1348,7 +1307,7 @@
 				// this.initGasChart()
 				// this.pieChart()
 				this.selectTaskList();
-				this.selectEventExpediteList()
+				this.selectEventList()
         this.queryVectorTilesMapList()
 			},2000)
 		},
@@ -1419,11 +1378,16 @@
 			goToHomePage() {
 				window.location.href = '/homePage';
 			},
-			selectEventExpediteList(){
-				selectEventExpediteList({pageNum:1,pageSize:10,eventTypeCode: 6,...(this.searchTime ? { createTime: this.searchTime } : {}),...(this.searchValue ? { eventTitle: this.searchValue } : {})}).then(res => {
-					this.eventList = res.rows
-				})
-			},
+      /**
+       * 预警列表
+       */
+      selectEventList(){
+        selectEventList({
+          industry: '2'
+        }).then(res => {
+          this.eventList = res.rows
+        })
+      },
 			/**
 			 * 任务列表
 			 */
@@ -2495,20 +2459,8 @@
 						this.$refs.detailDialog.openDetail(type,obj18);
 						break;
 					// 监管平台
-					case "城市体检" || "维护监管" || "基础事件"|| "设备预警":
-						let obj19 = {
-							"事件名称": e.eventTitle,
-							"上报时间": e.createTime,
-							"上报人姓名": e.createName,
-							"事件类型": e.eventTypeName,
-							"经度": e.longitude,
-							"纬度": e.latitude,
-							"事件状态": e.eventStatus,
-							"事件来源": e.eventSource,
-							"催办状态": e.expediteStatus,
-							"事件描述": e.eventDescription,
-						}
-						this.$refs.detailDialog.openDetail(type,obj19);
+					case "城市体检" || "日常监管" || "基础事件"|| "设备预警"|| "催办事件"|| "督办事件":
+            this.openEventDetail(e);
 						break;
           case '巡检巡查任务管理':
             let obj20 = {
@@ -2601,21 +2553,7 @@
 					}
 					this.$refs.detailDialog.openDetail(tile,obj);
 				} else if(tile == '预警列表') {
-					let obj = {
-					"事件名称": demoIdx == 1 ? '【日常监管】年度计划超期未完成,告警时间：2025-10-24 10:02:21;' : e.eventTitle,
-					"上报时间": demoIdx == 1 ? '2025-10-24 10:02:21;' : e.createTime,
-					"上报人姓名": e.createName,
-					"事件类型": demoIdx == 1 ?  '日常监管' : e.eventTypeName,
-					"经度": e.longitude,
-					"纬度": e.latitude,
-					"事件状态": demoIdx == 1 ? '年度计划超期未完成' : e.eventStatusLabel,
-					"事件来源": e.eventSource,
-					"催办状态": e.expediteStatus,
-					"事件描述": demoIdx == 1 ? '【日常监管】年度计划超期未完成,告警时间：2025-10-24 10:02:21;' : e.eventDescription,
-					}
-					this.demoIdx = demoIdx
-					this.eventInfo = obj
-					this.eventDialogVisible = true
+          this.openEventDetail(e);
 					if(this.demoIdx == 0){
 					setTimeout(() => {
 						this.initDemoChart()
@@ -3302,7 +3240,7 @@
 						selectRiskRegisterlist({
 							pageNum: pageNum || 1,
 							pageSize: 10,
-							industry: 1,
+							industry: 2,
 							...(this.searchCode ? {
 								hiddenDangerLevel: this.searchCode
 							} : {}),
@@ -3337,94 +3275,267 @@
 						})
 						break;
 					// 监管平台
-					case '城市体检' || '维护监管' || '基础事件' || '设备预警' || '催办事件' || '督办事件' :
-						selectEventExpediteList({
-							pageNum: pageNum || 1,
-							pageSize: 10,
-							expediteStatus: 1,
-							eventTypeCode: '6',
-							...(this.searchTime ? {
-							createTime: this.searchTime
-							} : {}),
-							...(this.searchValue ? {
-							eventTitle: this.searchValue
-							} : {})
-						}).then(res => {
-							this.tablePropAndLabel = [{
-							prop: `eventId`,
-							label: '事件唯一标识',
-							hidden: true
-							},
-							{
-								prop: `eventTitle`,
-								label: '事件名称'
-							},
-							{
-								prop: `eventDescription`,
-								label: '事件描述',
-								hidden: true
-							},
-							{
-								prop: `createTime`,
-								label: '上报时间'
-							},
-							{
-								prop: `createBy`,
-								label: '创建人id',
-								hidden: true
-							},
-							{
-								prop: `createName`,
-								label: '创建人姓名',
-								hidden: true
-							},
-							{
-								prop: `eventTypeId`,
-								label: '事件类型',
-								hidden: true
-							},
-							{
-								prop: `longitude`,
-								label: '经度',
-								hidden: true
-							},
-							{
-								prop: `latitude`,
-								label: '纬度',
-								hidden: true
-							},
-							{
-								prop: `eventStatus`,
-								label: '事件状态',
-								hidden: true
-							},
-							{
-								prop: `eventSource`,
-								label: '事件来源',
-								hidden: true
-							},
-							{
-								prop: `eventTypeName`,
-								label: '事件类型',
-								hidden: true
-							},
-							{
-								prop: `expediteStatus`,
-								label: '催办状态',
-								hidden: true
-							},
-							]
-							setTimeout(() => {
-								this.tableList = res.rows
-								this.total = res.total
-								if (res.rows) {
-									this.dataText = "暂无数据"
-								}
-							})
-							// 地图绑定落点
-							this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
-						})
+					case '城市体检' || '日常监管' || '基础事件' || '设备预警' || '催办事件' || '督办事件' :
+            this.tableListVisible = true
+            selectEventList({
+              pageNum: pageNum || 1,
+              pageSize: 10,
+              industry : 2,
+              eventTypeDl: type == '城市体检' ? 100 : type == '日常监管' ? 200 : type == '基础事件' ? 300 : type == '设备预警' ? 400 : null,
+              ...(this.searchTime ? {
+                selectDay: this.searchTime
+              } : {}),
+              ...(this.searchValue ? {
+                eventTitle: this.searchValue
+              } : {})
+            }).then(res => {
+              this.tablePropAndLabel = [
+                {
+                  prop: `eventId`,
+                  label: '事件唯一标识',
+                  hidden: true
+                },
+                {
+                  prop: `eventTitle`,
+                  label: '事件名称'
+                },
+                {
+                  prop: `eventDescription`,
+                  label: '事件描述',
+                  hidden: true
+                },
+                {
+                  prop: `createTime`,
+                  label: '上报时间'
+                },
+                {
+                  prop: `createBy`,
+                  label: '创建人id',
+                  hidden: true
+                },
+                {
+                  prop: `createName`,
+                  label: '创建人姓名',
+                  hidden: true
+                },
+                {
+                  prop: `eventTypeId`,
+                  label: '事件类型',
+                  hidden: true
+                },
+                {
+                  prop: `longitude`,
+                  label: '经度',
+                  hidden: true
+                },
+                {
+                  prop: `latitude`,
+                  label: '纬度',
+                  hidden: true
+                },
+                {
+                  prop: `eventStatusLabel`,
+                  label: '事件状态'
+                },
+                {
+                  prop: `eventSource`,
+                  label: '事件来源',
+                  hidden: true
+                },
+                {
+                  prop: `eventTypeName`,
+                  label: '事件类型',
+                  hidden: true
+                },
+                {
+                  prop: `expediteStatusLabel`,
+                  label: '催办状态',
+                  hidden: true
+                },
+              ]
+              this.tableList = res.rows
+              this.total = res.total
+              // 地图绑定落点
+              this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
+              if (res.rows) {
+                this.dataText = "暂无数据"
+              }
+            })
 						break;
+          case  '催办事件' :
+            this.tableListVisible = true
+            selectEventList({
+              pageNum: pageNum || 1,
+              pageSize: 10,
+              industry : 2,
+              expediteStatus: 1,
+              ...(this.searchTime ? {
+                selectDay: this.searchTime
+              } : {}),
+              ...(this.searchValue ? {
+                eventTitle: this.searchValue
+              } : {})
+            }).then(res => {
+              this.tablePropAndLabel = [
+                {
+                  prop: `eventId`,
+                  label: '事件唯一标识',
+                  hidden: true
+                },
+                {
+                  prop: `eventTitle`,
+                  label: '事件名称'
+                },
+                {
+                  prop: `eventDescription`,
+                  label: '事件描述',
+                  hidden: true
+                },
+                {
+                  prop: `createTime`,
+                  label: '上报时间'
+                },
+                {
+                  prop: `createBy`,
+                  label: '创建人id',
+                  hidden: true
+                },
+                {
+                  prop: `createName`,
+                  label: '创建人姓名',
+                  hidden: true
+                },
+                {
+                  prop: `eventTypeId`,
+                  label: '事件类型',
+                  hidden: true
+                },
+                {
+                  prop: `longitude`,
+                  label: '经度',
+                  hidden: true
+                },
+                {
+                  prop: `latitude`,
+                  label: '纬度',
+                  hidden: true
+                },
+                {
+                  prop: `eventStatusLabel`,
+                  label: '事件状态'
+                },
+                {
+                  prop: `eventSource`,
+                  label: '事件来源',
+                  hidden: true
+                },
+                {
+                  prop: `eventTypeName`,
+                  label: '事件类型',
+                  hidden: true
+                },
+                {
+                  prop: `expediteStatusLabel`,
+                  label: '催办状态',
+                  hidden: true
+                },
+              ]
+              this.tableList = res.rows
+              this.total = res.total
+              // 地图绑定落点
+              this.setMakersHandler(type, 'longitude', 'latitude', res.rows, 'event')
+              if (res.rows) {
+                this.dataText = "暂无数据"
+              }
+            })
+            break;
+          case '督办事件' :
+            this.tableListVisible = true
+            selectEventList({
+              pageNum: pageNum || 1,
+              pageSize: 10,
+              industry : 2,
+              superviseStatus: 1,
+              ...(this.searchTime ? {
+                selectDay: this.searchTime
+              } : {}),
+              ...(this.searchValue ? {
+                eventTitle: this.searchValue
+              } : {})
+            }).then(res => {
+              this.tablePropAndLabel = [
+                {
+                  prop: `eventId`,
+                  label: '事件唯一标识',
+                  hidden: true
+                },
+                {
+                  prop: `eventTitle`,
+                  label: '事件名称'
+                },
+                {
+                  prop: `eventDescription`,
+                  label: '事件描述',
+                  hidden: true
+                },
+                {
+                  prop: `createTime`,
+                  label: '上报时间'
+                },
+                {
+                  prop: `createBy`,
+                  label: '创建人id',
+                  hidden: true
+                },
+                {
+                  prop: `createName`,
+                  label: '创建人姓名',
+                  hidden: true
+                },
+                {
+                  prop: `eventTypeId`,
+                  label: '事件类型',
+                  hidden: true
+                },
+                {
+                  prop: `longitude`,
+                  label: '经度',
+                  hidden: true
+                },
+                {
+                  prop: `latitude`,
+                  label: '纬度',
+                  hidden: true
+                },
+                {
+                  prop: `eventStatusLabel`,
+                  label: '事件状态'
+                },
+                {
+                  prop: `eventSource`,
+                  label: '事件来源',
+                  hidden: true
+                },
+                {
+                  prop: `eventTypeName`,
+                  label: '事件类型',
+                  hidden: true
+                },
+                {
+                  prop: `expediteStatusLabel`,
+                  label: '催办状态',
+                  hidden: true
+                },
+              ]
+              this.tableList = res.rows
+              this.total = res.total
+              // 地图绑定落点
+              this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
+              if (res.rows) {
+                this.dataText = "暂无数据"
+              }
+            })
+            break;
 					// 运管体系
           case '巡检巡查任务管理':
             this.tableListVisible = true
@@ -3625,7 +3736,7 @@
             selectMaterialsList({
               pageNum: pageNum || 1,
               pageSize: 10,
-              industry: 5,
+              industry: 2,
               ...(this.searchCode ? {
                 type: this.searchCode
               } : {}),
@@ -4008,7 +4119,7 @@
 							markersMap.icon = "reyuanchang";
 						break;
 						case '城市体检':
-						case '维护监管':
+						case '日常监管':
 						case '基础事件':
 						case '设备预警':
 							markersMap.icon = "yujing";
@@ -4029,6 +4140,16 @@
 				}, 2000)
 
 			},
+      // 打开事件详情弹窗
+      openEventDetail(obj) {
+        getEventDetail({
+          eventId: obj.eventId
+        }).then(res => {
+          this.demoIdx = obj.demoIdx
+          this.eventInfo = res.data
+          this.eventDialogVisible = true
+        })
+      },
 			previewPointDetail(params) {
 				this.previewDetail(params.params,params.type)
 			},

src/views/industry/qiaoliang.vue

@@ -140,7 +140,7 @@
                             :clearable="true" style="width: 40%;"></el-date-picker>
           </div>
           <!-- 隐患管理筛查项 -->
-          <div v-else-if="type=='城市体检'||type=='维护监管'||type=='基础事件'||type=='设备预警'" class="sousuo">
+          <div v-else-if="type=='城市体检'||type=='日常监管'||type=='基础事件'||type=='设备预警'" class="sousuo">
             <el-input v-model="searchValue" placeholder="事件名称" clearable class="input-width">
               <template #append></template>
             </el-input>
@@ -577,7 +577,7 @@
                 <em class="cuiban">{{item.eventStatusLabel}}</em>
               </div>
               <div class="sjname">
-                <em class="weiBj">{{item.expediteStatus}}</em>
+                <em class="weiBj">{{item.expediteStatusLabel}}</em>
                 <span>{{item.eventTitle}}</span>
               </div>
             </dd>
@@ -830,10 +830,6 @@ import {
   getUserProfile
 } from "@/api/system/user";
 import {
-  heatingViewEventList
-} from "@/api/lookall";
-import {
-  getEventDetail,
   getHeatingList,
   getReportList,
   heatingUserList,
@@ -865,6 +861,7 @@ import {
 import {
   getWeather
 } from '@/api/data'
+import { getEventDetail, selectEventList } from '@/api/eventLifeLine'
 export default {
   dicts: ['gas_pipeline_category', 'pressure_level', 'construction_tasks_status', 'lifeline_industry',
     'sys_notice_status', 'sys_notice_type', 'sys_normal_disable', 'sys_user_sex', 'lifeline_enterprise',
@@ -974,7 +971,7 @@ export default {
               title: '事件管理',
               chicken: [
                 {title: '城市体检'},
-                {title: '维护监管'},
+                {title: '日常监管'},
                 {title: '基础事件'},
                 {title: '设备预警'},
                 {title: '催办事件'},
@@ -1034,7 +1031,7 @@ export default {
       lonKey: 'longitude',
       hasPositionLabels: [
         '桥梁管理', '桥梁养护', '用户管理',
-        '城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件',
+        '城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件',
         '物资管理', '设备管理',
       ],
       eventDialogVisible: false,
@@ -1102,7 +1099,7 @@ export default {
     this.getSuperMapUrl();
     this.queryVectorTilesMapList();
     this.selectTaskList();
-    this.heatingViewEventList();
+    this.selectEventList();
     this.getHeatingList();
     this.time();
     this.selectFocusList()
@@ -1967,111 +1964,27 @@ export default {
       }
         /****************************************************************设备管理end*******************************************************/
       /****************************************************************监管平台start*******************************************************/
-      else if (type == '城市体检') {
+      else if (type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警') {
         this.tableListVisible = true
-        selectEventExpediteList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
-          eventTypeCode: '？？？',
+          industry : 3,
+          eventTypeDl: type == '城市体检' ? 100 : type == '日常监管' ? 200 : type == '基础事件' ? 300 : type == '设备预警' ? 400 : null,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
-              prop: `eventTitle`,
-              label: '事件名称'
-            },
-            {
-              prop: `eventDescription`,
-              label: '事件描述',
-              hidden: true
-            },
-            {
-              prop: `createTime`,
-              label: '上报时间'
-            },
-            {
-              prop: `createBy`,
-              label: '创建人id',
-              hidden: true
-            },
-            {
-              prop: `createName`,
-              label: '创建人姓名',
-              hidden: true
-            },
-            {
-              prop: `eventTypeId`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `longitude`,
-              label: '经度',
-              hidden: true
-            },
-            {
-              prop: `latitude`,
-              label: '纬度',
-              hidden: true
-            },
+          this.tablePropAndLabel = [
             {
-              prop: `eventStatus`,
-              label: '事件状态'
-            },
-            {
-              prop: `eventSource`,
-              label: '事件来源',
+              prop: `eventId`,
+              label: '事件唯一标识',
               hidden: true
             },
             {
-              prop: `eventTypeName`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `expediteStatus`,
-              label: '催办状态',
-              hidden: true
-            },
-          ]
-          this.tableList = res.rows
-          this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
-          // 地图绑定落点
-          this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
-          if (res.rows) {
-            this.dataText = "暂无数据"
-          }
-        })
-      } else if (type == '维护监管') {
-        this.tableListVisible = true
-        selectEventExpediteList({
-          pageNum: pageNum || 1,
-          pageSize: 10,
-          eventTypeCode: '？？？',
-          ...(this.searchTime ? {
-            createTime: this.searchTime
-          } : {}),
-          ...(this.searchValue ? {
-            eventTitle: this.searchValue
-          } : {})
-        }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
               prop: `eventTitle`,
               label: '事件名称'
             },
@@ -2110,7 +2023,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2124,126 +2037,41 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
           ]
           this.tableList = res.rows
           this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
           // 地图绑定落点
           this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
           if (res.rows) {
             this.dataText = "暂无数据"
           }
         })
-      } else if (type == '基础事件') {
+      }
+      else if (type == '催办事件') {
         this.tableListVisible = true
-        selectEventExpediteList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
-          eventTypeCode: '？？？',
+          industry : 3,
+          expediteStatus: 1,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
-              prop: `eventTitle`,
-              label: '事件名称'
-            },
-            {
-              prop: `eventDescription`,
-              label: '事件描述',
-              hidden: true
-            },
-            {
-              prop: `createTime`,
-              label: '上报时间'
-            },
-            {
-              prop: `createBy`,
-              label: '创建人id',
-              hidden: true
-            },
-            {
-              prop: `createName`,
-              label: '创建人姓名',
-              hidden: true
-            },
-            {
-              prop: `eventTypeId`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `longitude`,
-              label: '经度',
-              hidden: true
-            },
-            {
-              prop: `latitude`,
-              label: '纬度',
-              hidden: true
-            },
-            {
-              prop: `eventStatus`,
-              label: '事件状态'
-            },
-            {
-              prop: `eventSource`,
-              label: '事件来源',
-              hidden: true
-            },
+          this.tablePropAndLabel = [
             {
-              prop: `eventTypeName`,
-              label: '事件类型',
+              prop: `eventId`,
+              label: '事件唯一标识',
               hidden: true
             },
             {
-              prop: `expediteStatus`,
-              label: '催办状态',
-              hidden: true
-            },
-          ]
-          this.tableList = res.rows
-          this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
-          // 地图绑定落点
-          this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
-          if (res.rows) {
-            this.dataText = "暂无数据"
-          }
-        })
-      } else if (type == '设备预警') {
-        this.tableListVisible = true
-        selectEventExpediteList({
-          pageNum: pageNum || 1,
-          pageSize: 10,
-          eventTypeCode: '？？？',
-          ...(this.searchTime ? {
-            createTime: this.searchTime
-          } : {}),
-          ...(this.searchValue ? {
-            eventTitle: this.searchValue
-          } : {})
-        }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
               prop: `eventTitle`,
               label: '事件名称'
             },
@@ -2282,7 +2110,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2296,127 +2124,41 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
           ]
           this.tableList = res.rows
           this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
           // 地图绑定落点
-          this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
+          this.setMakersHandler(type, 'longitude', 'latitude', res.rows, 'event')
           if (res.rows) {
             this.dataText = "暂无数据"
           }
         })
-      } else if (type == '催办事件') {
+      }
+      else if (type == '督办事件') {
         this.tableListVisible = true
-        selectEventExpediteList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
-          expediteStatus: 1,
-          eventTypeCode: '？？？',
+          industry : 3,
+          superviseStatus: 1,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
-              prop: `eventTitle`,
-              label: '事件名称'
-            },
+          this.tablePropAndLabel = [
             {
-              prop: `eventDescription`,
-              label: '事件描述',
-              hidden: true
-            },
-            {
-              prop: `createTime`,
-              label: '上报时间'
-            },
-            {
-              prop: `createBy`,
-              label: '创建人id',
-              hidden: true
-            },
-            {
-              prop: `createName`,
-              label: '创建人姓名',
-              hidden: true
-            },
-            {
-              prop: `eventTypeId`,
-              label: '事件类型',
+              prop: `eventId`,
+              label: '事件唯一标识',
               hidden: true
             },
             {
-              prop: `longitude`,
-              label: '经度',
-              hidden: true
-            },
-            {
-              prop: `latitude`,
-              label: '纬度',
-              hidden: true
-            },
-            {
-              prop: `eventStatus`,
-              label: '事件状态'
-            },
-            {
-              prop: `eventSource`,
-              label: '事件来源',
-              hidden: true
-            },
-            {
-              prop: `eventTypeName`,
-              label: '事件类型',
-              hidden: true
-            },
-            {
-              prop: `expediteStatus`,
-              label: '催办状态',
-              hidden: true
-            },
-          ]
-          this.tableList = res.rows
-          this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
-          // 地图绑定落点
-          this.setMakersHandler(type, 'longitude', 'latitude', res.rows, 'event')
-          if (res.rows) {
-            this.dataText = "暂无数据"
-          }
-        })
-      } else if (type == '督办事件') {
-        this.tableListVisible = true
-        selectEventSuperviseList({
-          pageNum: pageNum || 1,
-          pageSize: 10,
-          eventTypeCode: '？？？',
-          ...(this.searchTime ? {
-            createTime: this.searchTime
-          } : {}),
-          ...(this.searchValue ? {
-            eventTitle: this.searchValue
-          } : {})
-        }).then(res => {
-          this.tablePropAndLabel = [{
-            prop: `eventId`,
-            label: '事件唯一标识',
-            hidden: true
-          },
-            {
               prop: `eventTitle`,
               label: '事件名称'
             },
@@ -2455,7 +2197,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2469,22 +2211,21 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
           ]
           this.tableList = res.rows
           this.total = res.total
-          this.latKey = 'latitude'
-          this.lonKey = 'longitude'
           // 地图绑定落点
           this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
           if (res.rows) {
             this.dataText = "暂无数据"
           }
         })
-      } else if (type == '巡检巡查任务管理') {
+      }
+      else if (type == '巡检巡查任务管理') {
         this.tableListVisible = true
         selectInspectionPatrolTaskList({
           pageNum: pageNum || 1,
@@ -3050,7 +2791,7 @@ export default {
             markersMap.icon = "cuiban";
             break;
           case '城市体检':
-          case '维护监管':
+          case '日常监管':
           case '基础事件':
           case '设备预警':
             markersMap.icon = "yujing";
@@ -3207,24 +2948,9 @@ export default {
       }
         /****************************************************************设备管理end*******************************************************/
       /****************************************************************监管平台start*******************************************************/
-      else if (type == '城市体检') {
-        this.openEventDetail(row);
-        return
-      } else if (type == '维护监管') {
+      else if(type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警'||type == "催办事件"||type == "督办事件"){
         this.openEventDetail(row);
         return
-      } else if (type == '基础事件') {
-        this.openEventDetail(row);
-        return
-      } else if (type == '设备预警') {
-        this.openEventDetail(row);
-        return;
-      } else if (type == "催办事件") {
-        this.openEventDetail(row);
-        return;
-      } else if (type == "督办事件") {
-        this.openEventDetail(row);
-        return;
       } else if (type == '巡检巡查任务管理') {
         let obj = {
           "巡检任务名称": row.taskName,
@@ -3327,7 +3053,9 @@ export default {
     },
     // 打开事件详情弹窗
     openEventDetail(obj) {
-      getEventDetail(obj.eventId).then(res => {
+      getEventDetail({
+        eventId: obj.eventId
+      }).then(res => {
         this.eventInfo = res.data
         this.eventDialogVisible = true
       })
@@ -3489,13 +3217,13 @@ export default {
       })
     },
     /**
-     * 事件列表
+     * 预警列表
      */
-    heatingViewEventList() {
-      heatingViewEventList({
-        eventTypeCode: '？？？'
+    selectEventList(){
+      selectEventList({
+        industry: '3'
       }).then(res => {
-        this.eventList = res.rows;
+        this.eventList = res.rows
       })
     },
     /**

src/views/industry/tableInfoHandler.vue

@@ -140,7 +140,7 @@
                           :clearable="true" style="width: 60%;"></el-date-picker>
         </div>
         <!-- 隐患管理筛查项 -->
-        <div v-else-if="currentType=='城市体检'||currentType=='维护监管'||currentType=='基础事件'||currentType=='设备预警'">
+        <div v-else-if="currentType=='城市体检'||currentType=='日常监管'||currentType=='基础事件'||currentType=='设备预警'">
           <el-input v-model="searchValue" placeholder="事件名称" clearable>
             <template #append></template>
           </el-input>
@@ -804,7 +804,6 @@ import {
   selectRiskRegisterlist,
   getEnterpriseList,
   getHeatingList,
-  selectEventExpediteList,
   selectEventSuperviseList,
   selectInspectionPatrolTaskList,
   selectPatrolInspectionDataList,
@@ -820,10 +819,11 @@ import {
   heatingUserList,
   getReportList,
   getHeatingPipeListByDataSetAndSmId,
-  getEventDetail, getDeviceOnlineOfflineByDept
+  getDeviceOnlineOfflineByDept
 } from '@/api/tableInfo'
 import DetailDialog from "@/components/DetailDialog/tableInfoHandler.vue";
 import {getWeather} from "@/api/data";
+import { selectEventList,getEventDetail } from '@/api/eventLifeLine'
 
 export default {
   name: 'lookall',
@@ -982,7 +982,7 @@ export default {
       searchValue: '',
       searchCode: '',
       searchTime: '',
-      hasPositionLabels: ['热力管线', '窨井管理', '热源厂信息', '换热站信息', '场站管理', '小区管理', '隐患管理', '城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件',
+      hasPositionLabels: ['热力管线', '窨井管理', '热源厂信息', '换热站信息', '场站管理', '小区管理', '隐患管理', '城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件',
         '物资管理', '设备管理','用户管理'
       ],
       latKey: '',
@@ -2277,25 +2277,26 @@ export default {
           }
         })
       }
-      else if (type == '城市体检'||type == '维护监管'||type == '基础事件'||type == '设备预警') {
+      else if (type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警') {
         this.tableListVisible = true
-        selectEventExpediteList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
-          expediteStatus: 1,
-          eventTypeCode: '5',
+          industry : 1,
+          eventTypeDl: type == '城市体检' ? 100 : type == '日常监管' ? 200 : type == '基础事件' ? 300 : type == '设备预警' ? 400 : null,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
+          this.tablePropAndLabel = [
+            {
             prop: `eventId`,
             label: '事件唯一标识',
             hidden: true
-          },
+            },
             {
               prop: `eventTitle`,
               label: '事件名称'
@@ -2335,7 +2336,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2349,7 +2350,7 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
@@ -2365,13 +2366,13 @@ export default {
       }
       else if (type == '催办事件') {
         this.tableListVisible = true
-        selectEventExpediteList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
+          industry : 1,
           expediteStatus: 1,
-          eventTypeCode: '5',
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
@@ -2421,7 +2422,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2435,7 +2436,7 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
@@ -2451,12 +2452,13 @@ export default {
       }
       else if (type == '督办事件') {
         this.tableListVisible = true
-        selectEventSuperviseList({
+        selectEventList({
           pageNum: pageNum || 1,
           pageSize: 10,
-          eventTypeCode: '5',
+          industry : 1,
+          superviseStatus: 1,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
@@ -2506,7 +2508,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2520,7 +2522,7 @@ export default {
               hidden: true
             },
             {
-              prop: `expediteStatus`,
+              prop: `expediteStatusLabel`,
               label: '催办状态',
               hidden: true
             },
@@ -2983,7 +2985,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态',
               hidden: true
             },
@@ -3737,7 +3739,7 @@ export default {
             this.dataText = "暂无数据"
           }
         })
-      } 
+      }
       else if (type == '挖掘手续') {
         this.tableListVisible = true
         this.tablePropAndLabel = [
@@ -3795,7 +3797,7 @@ export default {
               hidden: true
             },
             {
-              prop: `miningTime`,  
+              prop: `miningTime`,
               label: '挖掘期限',
               hidden: true
             },
@@ -3907,7 +3909,7 @@ export default {
               remark:'无',
               longitude:124.352627,
               latitude:43.14842,
-            } 
+            }
           ]
           this.total = 1
           // 地图绑定落点
@@ -4099,7 +4101,7 @@ export default {
             warningSignsDescription: "施工区域设置围挡75米，夜间布置警示灯12个、警告牌6块，并在东西两端放置‘前方施工·车辆绕行’指示牌。",
             longitude:124.352627,
             latitude:43.14842,
-          } 
+          }
         ]
         this.total = 1
         // 地图绑定落点
@@ -4144,7 +4146,7 @@ export default {
             markersMap.icon = "cuiban";
             break;
           case '城市体检':
-          case '维护监管':
+          case '日常监管':
           case '基础事件':
           case '设备预警':
             markersMap.icon = "yujing";
@@ -4183,7 +4185,9 @@ export default {
     },
     // 打开事件详情弹窗
     openEventDetail(obj) {
-      getEventDetail(obj.eventId).then(res => {
+      getEventDetail({
+        eventId: obj.eventId
+      }).then(res => {
         this.eventInfo = res.data
         this.eventDialogVisible = true
       })
@@ -4352,55 +4356,7 @@ export default {
         this.$refs.detailDialog.openDetail(type,obj);
         return;
       }
-      else if (type == "城市体检"||type == "维护监管"||type == "基础事件"||type == "设备预警") {
-        let obj = {
-          "事件名称": row.eventTitle,
-          "上报时间": row.createTime,
-          "上报人姓名": row.createName,
-          "事件类型": row.eventTypeName,
-          "经度": row.longitude,
-          "纬度": row.latitude,
-          "事件状态": row.eventStatus,
-          "事件来源": row.eventSource,
-          "催办状态": row.expediteStatus,
-          "事件描述": row.eventDescription,
-          // "部门名称": row.deptName,
-        };
-        this.openEventDetail(row);
-        return;
-      }
-      else if (type == "催办事件") {
-        let obj = {
-          "事件名称": row.eventTitle,
-          "上报时间": row.createTime,
-          "上报人姓名": row.createName,
-          "事件类型": row.eventTypeName,
-          "经度": row.longitude,
-          "纬度": row.latitude,
-          "事件状态": row.eventStatus,
-          "事件来源": row.eventSource,
-          "催办状态": row.expediteStatus,
-          "事件描述": row.eventDescription,
-          // "部门名称": row.deptName,
-        };
-        this.openEventDetail(row);
-        return;
-      }
-      else if (type == "督办事件") {
-        let obj = {
-          "事件名称": row.eventTitle,
-          "上报时间": row.createTime,
-          "上报人姓名": row.createName,
-          "事件类型": row.eventTypeName,
-          "经度": row.longitude,
-          "纬度": row.latitude,
-          "事件状态": row.eventStatus,
-          "事件来源": row.eventSource,
-          "事件类型": row.eventTypeName,
-          "催办状态": row.expediteStatus,
-          "事件描述": row.eventDescription,
-          // "部门名称": row.deptName,
-        };
+      else if (type == "城市体检"||type == "日常监管"||type == "基础事件"||type == "设备预警"||type == "催办事件"||type == "督办事件") {
         this.openEventDetail(row);
         return;
       }

src/views/industry/water.vue

@@ -153,7 +153,7 @@
                       content="Right Center 提示文字" placement="right">
             <div slot="content">
               <p @click="TableInfoHandler('城市体检', deptId, null)">城市体检</p>
-              <p @click="TableInfoHandler('维护监管', deptId, null)">维护监管</p>
+              <p @click="TableInfoHandler('日常监管', deptId, null)">日常监管</p>
               <p @click="TableInfoHandler('基础事件', deptId, null)">基础事件</p>
               <p @click="TableInfoHandler('设备预警', deptId, null)">设备预警</p>
               <p @click="TableInfoHandler('催办事件', deptId, null)">催办事件</p>
@@ -178,7 +178,7 @@
             <el-dropdown-item><i></i>综合管理</el-dropdown-item>
           </el-tooltip>
 <!--					<el-dropdown-item @click.native="TableInfoHandler('城市体检', deptId, null)">城市体检</el-dropdown-item>-->
-<!--					<el-dropdown-item @click.native="TableInfoHandler('维护监管', deptId, null)">维护监管</el-dropdown-item>-->
+<!--					<el-dropdown-item @click.native="TableInfoHandler('日常监管', deptId, null)">日常监管</el-dropdown-item>-->
 <!--					<el-dropdown-item @click.native="TableInfoHandler('基础事件', deptId, null)">基础事件</el-dropdown-item>-->
 <!--					<el-dropdown-item @click.native="TableInfoHandler('设备预警', deptId, null)">设备预警</el-dropdown-item>-->
 <!--					<el-dropdown-item @click.native="TableInfoHandler('催办事件', deptId, null)">催办事件</el-dropdown-item>-->
@@ -534,23 +534,7 @@
             </el-select>
           </div>
           <!-- 城市体检筛查项 -->
-          <div v-else-if="currentType=='城市体检'||currentType=='维护监管'||currentType=='基础事件'||currentType=='设备预警'" class="inp_row">
-            <el-input v-model="searchValue" placeholder="事件名称" clearable>
-              <template #append></template>
-            </el-input>
-            <el-date-picker type="date" value-format="yyyy-MM-dd" placeholder="上报时间" v-model="searchTime"
-                            :clearable="true" style="width: 40%;"></el-date-picker>
-          </div>
-          <!-- 催办事件筛查项 -->
-          <div v-else-if="currentType=='催办事件'" class="inp_row">
-            <el-input v-model="searchValue" placeholder="事件名称" clearable>
-              <template #append></template>
-            </el-input>
-            <el-date-picker type="date" value-format="yyyy-MM-dd" placeholder="上报时间" v-model="searchTime"
-                            :clearable="true" style="width: 40%;"></el-date-picker>
-          </div>
-          <!-- 督办事件筛查项 -->
-          <div v-else-if="currentType=='督办事件'" class="inp_row">
+          <div v-else-if="currentType=='城市体检'||currentType=='日常监管'||currentType=='基础事件'||currentType=='设备预警'||currentType=='催办事件'||currentType=='督办事件'" class="inp_row">
             <el-input v-model="searchValue" placeholder="事件名称" clearable>
               <template #append></template>
             </el-input>
@@ -708,7 +692,6 @@
   import supermap from '@/components/supermap-2.5d' //超图
   import DetailDialog from "@/components/DetailDialog/water.vue";
   import { iconList, queryVectorTilesMapList } from '@/api/components/supermap'
-  import { heatingViewEventList } from '@/api/lookall'
   import {
     getHeatingList,
     getHeatingPipeListByDataSetAndSmId,
@@ -740,6 +723,7 @@
     getWaterSupplyDOOByDept, getWaterPipeBySmId
   } from '@/api/water'
   import { getWeather } from '@/api/data'
+  import { getEventDetail, selectEventList } from '@/api/eventLifeLine'
 	export default {
     dicts: [, 'sys_user_sex', 'sys_normal_disable',
       'lifeline_enterprise', 'lifeline_industry', 'resident_type', 'construction_tasks_status',
@@ -882,7 +866,7 @@
         total: 0,
         latKey: '',
         lonKey: '',
-        hasPositionLabels: ['管线管理', '窨井管理', '城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件', '设备管理','用户管理','泵站管理'],//有定位功能的列表类型
+        hasPositionLabels: ['管线管理', '窨井管理', '城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件', '设备管理','用户管理','泵站管理'],//有定位功能的列表类型
         dataText:'',
         addVectorTilesMapList: [],
         checkedBaseDOptions: [],
@@ -913,7 +897,7 @@
       this.selectFocusList()
 			setTimeout(() => {
         this.selectTaskList();
-        this.heatingViewEventList();
+        this.selectEventList();
         this.getHeatingList();
 				this.getDeviceTypeCount()
 				this.initPipeLineChart()
@@ -1421,25 +1405,26 @@
             }
           })
         }
-        else if (type == '城市体检'||type == '维护监管'||type == '基础事件'||type == '设备预警') {
+        else if (type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警') {
           this.tableListVisible = true
-          selectEventExpediteList({
+          selectEventList({
             pageNum: pageNum || 1,
             pageSize: 10,
-            expediteStatus: 1,
-            eventTypeCode: '6',
+            industry : 6,
+            eventTypeDl: type == '城市体检' ? 100 : type == '日常监管' ? 200 : type == '基础事件' ? 300 : type == '设备预警' ? 400 : null,
             ...(this.searchTime ? {
-              createTime: this.searchTime
+              selectDay: this.searchTime
             } : {}),
             ...(this.searchValue ? {
               eventTitle: this.searchValue
             } : {})
           }).then(res => {
-            this.tablePropAndLabel = [{
-              prop: `eventId`,
-              label: '事件唯一标识',
-              hidden: true
-            },
+            this.tablePropAndLabel = [
+              {
+                prop: `eventId`,
+                label: '事件唯一标识',
+                hidden: true
+              },
               {
                 prop: `eventTitle`,
                 label: '事件名称'
@@ -1479,7 +1464,7 @@
                 hidden: true
               },
               {
-                prop: `eventStatus`,
+                prop: `eventStatusLabel`,
                 label: '事件状态'
               },
               {
@@ -1493,7 +1478,7 @@
                 hidden: true
               },
               {
-                prop: `expediteStatus`,
+                prop: `expediteStatusLabel`,
                 label: '催办状态',
                 hidden: true
               },
@@ -1509,23 +1494,24 @@
         }
         else if (type == '催办事件') {
           this.tableListVisible = true
-          selectEventExpediteList({
+          selectEventList({
             pageNum: pageNum || 1,
             pageSize: 10,
+            industry : 6,
             expediteStatus: 1,
-            eventTypeCode: '6',
             ...(this.searchTime ? {
-              createTime: this.searchTime
+              selectDay: this.searchTime
             } : {}),
             ...(this.searchValue ? {
               eventTitle: this.searchValue
             } : {})
           }).then(res => {
-            this.tablePropAndLabel = [{
-              prop: `eventId`,
-              label: '事件唯一标识',
-              hidden: true
-            },
+            this.tablePropAndLabel = [
+              {
+                prop: `eventId`,
+                label: '事件唯一标识',
+                hidden: true
+              },
               {
                 prop: `eventTitle`,
                 label: '事件名称'
@@ -1565,7 +1551,7 @@
                 hidden: true
               },
               {
-                prop: `eventStatus`,
+                prop: `eventStatusLabel`,
                 label: '事件状态'
               },
               {
@@ -1579,7 +1565,7 @@
                 hidden: true
               },
               {
-                prop: `expediteStatus`,
+                prop: `expediteStatusLabel`,
                 label: '催办状态',
                 hidden: true
               },
@@ -1595,22 +1581,24 @@
         }
         else if (type == '督办事件') {
           this.tableListVisible = true
-          selectEventSuperviseList({
+          selectEventList({
             pageNum: pageNum || 1,
             pageSize: 10,
-            eventTypeCode: '6',
+            industry : 6,
+            superviseStatus: 1,
             ...(this.searchTime ? {
-              createTime: this.searchTime
+              selectDay: this.searchTime
             } : {}),
             ...(this.searchValue ? {
               eventTitle: this.searchValue
             } : {})
           }).then(res => {
-            this.tablePropAndLabel = [{
-              prop: `eventId`,
-              label: '事件唯一标识',
-              hidden: true
-            },
+            this.tablePropAndLabel = [
+              {
+                prop: `eventId`,
+                label: '事件唯一标识',
+                hidden: true
+              },
               {
                 prop: `eventTitle`,
                 label: '事件名称'
@@ -1650,7 +1638,7 @@
                 hidden: true
               },
               {
-                prop: `eventStatus`,
+                prop: `eventStatusLabel`,
                 label: '事件状态'
               },
               {
@@ -1664,7 +1652,7 @@
                 hidden: true
               },
               {
-                prop: `expediteStatus`,
+                prop: `expediteStatusLabel`,
                 label: '催办状态',
                 hidden: true
               },
@@ -1880,7 +1868,7 @@
           selectMaterialsList({
             pageNum: pageNum || 1,
             pageSize: 10,
-            industry: 5,
+            industry: 6,
             ...(this.searchCode ? {
               type: this.searchCode
             } : {}),
@@ -2635,57 +2623,9 @@
           this.$refs.detailDialog.openDetail(type,obj);
           return;
         }
-        else if (type == "城市体检"||type == "维护监管"||type == "基础事件"||type == "设备预警") {
-          let obj = {
-            "事件名称": row.eventTitle,
-            "上报时间": row.createTime,
-            "上报人姓名": row.createName,
-            "事件类型": row.eventTypeName,
-            "经度": row.longitude,
-            "纬度": row.latitude,
-            "事件状态": row.eventStatus,
-            "事件来源": row.eventSource,
-            "催办状态": row.expediteStatus,
-            "事件描述": row.eventDescription,
-            // "部门名称": row.deptName,
-          };
-          this.openEventDetail(row);
-          return;
-        }
-        else if (type == "催办事件") {
-          let obj = {
-            "事件名称": row.eventTitle,
-            "上报时间": row.createTime,
-            "上报人姓名": row.createName,
-            "事件类型": row.eventTypeName,
-            "经度": row.longitude,
-            "纬度": row.latitude,
-            "事件状态": row.eventStatus,
-            "事件来源": row.eventSource,
-            "催办状态": row.expediteStatus,
-            "事件描述": row.eventDescription,
-            // "部门名称": row.deptName,
-          };
+        else if(type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警'||type == "催办事件"||type == "督办事件"||type == "预警列表"){
           this.openEventDetail(row);
-          return;
-        }
-        else if (type == "督办事件") {
-          let obj = {
-            "事件名称": row.eventTitle,
-            "上报时间": row.createTime,
-            "上报人姓名": row.createName,
-            "事件类型": row.eventTypeName,
-            "经度": row.longitude,
-            "纬度": row.latitude,
-            "事件状态": row.eventStatus,
-            "事件来源": row.eventSource,
-            "事件类型": row.eventTypeName,
-            "催办状态": row.expediteStatus,
-            "事件描述": row.eventDescription,
-            // "部门名称": row.deptName,
-          };
-          this.openEventDetail(row);
-          return;
+          return
         }
         else if(type == '巡检巡查任务管理'){
           let obj = {
@@ -2972,6 +2912,15 @@
           return;
         }
       },
+      // 打开事件详情弹窗
+      openEventDetail(obj) {
+        getEventDetail({
+          eventId: obj.eventId
+        }).then(res => {
+          this.eventInfo = res.data
+          this.eventDialogVisible = true
+        })
+      },
       openDetail(e,tile){
 				if(tile == '重点关注'){
 					let obj = {
@@ -3019,7 +2968,7 @@
               markersMap.icon = "cuiban";
               break;
             case '城市体检':
-            case '维护监管':
+            case '日常监管':
             case '基础事件':
             case '设备预警':
               markersMap.icon = "yujing";
@@ -3086,10 +3035,10 @@
         })
       },
       /**
-       * 事件列表
+       * 预警列表
        */
-      heatingViewEventList() {
-        heatingViewEventList({eventTypeCode: 6}).then(res => {
+      selectEventList() {
+        selectEventList({industry: 6}).then(res => {
           this.eventList = res.rows
           this.eventListTotal = res.total
         })