Add - 排水 事件列表接口对接

src/views/industry/ThermalPower.vue

@@ -2075,7 +2075,7 @@ export default {
           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
@@ -2162,13 +2162,14 @@ export default {
           industry : 5,
           expediteStatus: 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
@@ -2248,13 +2249,14 @@ export default {
           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
@@ -2339,7 +2341,8 @@ export default {
             taskName: this.searchValue
           } : {})
         }).then(res => {
-          this.tablePropAndLabel = [{
+          this.tablePropAndLabel = [
+            {
             prop: 'id',
             label: '主键',
             hidden: true

src/views/industry/paishui.vue

@@ -503,10 +503,10 @@
 							<i></i>
 							<span>{{ e.createTime || '' }}</span>
 							<hr class="borcb" />
-							<em class="cuiban">{{ e.eventStatus || '' }}</em>
+							<em class="cuiban">{{ e.eventStatusLabel || '' }}</em>
 						</div>
 						<div class="sjname">
-							<em class="weiBj">{{ e.expediteStatus }}</em>
+							<em class="weiBj">{{ e.expediteStatusLabel }}</em>
 							<span :title="e.eventTitle">{{ e.eventTitle }}</span>
 						</div>
 					</dd>
@@ -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',
@@ -1348,7 +1348,7 @@
 				// this.initGasChart()
 				// this.pieChart()
 				this.selectTaskList();
-				this.selectEventExpediteList()
+				this.selectEventList()
         this.queryVectorTilesMapList()
 			},2000)
 		},
@@ -1419,11 +1419,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 +2500,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 +2594,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 +3281,7 @@
 						selectRiskRegisterlist({
 							pageNum: pageNum || 1,
 							pageSize: 10,
-							industry: 1,
+							industry: 2,
 							...(this.searchCode ? {
 								hiddenDangerLevel: this.searchCode
 							} : {}),
@@ -3338,93 +3317,266 @@
 						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)
-						})
+            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 +3777,7 @@
             selectMaterialsList({
               pageNum: pageNum || 1,
               pageSize: 10,
-              industry: 5,
+              industry: 2,
               ...(this.searchCode ? {
                 type: this.searchCode
               } : {}),
@@ -4029,6 +4181,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/tableInfoHandler.vue

@@ -2285,7 +2285,7 @@ export default {
           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
@@ -2372,7 +2372,7 @@ export default {
           industry : 1,
           expediteStatus: 1,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue
@@ -2458,7 +2458,7 @@ export default {
           industry : 1,
           superviseStatus: 1,
           ...(this.searchTime ? {
-            createTime: this.searchTime
+            selectDay: this.searchTime
           } : {}),
           ...(this.searchValue ? {
             eventTitle: this.searchValue