浏览代码

Add - 热力 事件列表接口对接

彭宇 3 天之前
父节点
当前提交
edf03ce456
共有 3 个文件被更改,包括 115 次插入88 次删除
  1. 67 0
      src/api/eventLifeLine.js
  2. 16 12
      src/views/industry/lookall.vue
  3. 32 76
      src/views/industry/tableInfoHandler.vue

文件差异内容过多而无法显示
+ 67 - 0
src/api/eventLifeLine.js


+ 16 - 12
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>
@@ -941,7 +941,6 @@
 	} from '@/api/components/supermap'
 	import {
 		categoryStats,
-		heatingViewEventList,
 		inspectionMileageAnalysis,
 		selectDeviceNoPage,
 		selectHeatStationNoPage,
@@ -949,6 +948,7 @@
 		heatingViewPipeLengthStats,
 		heatingViewGetDeviceTypeCount
 	} from '@/api/lookall'
+
 	import {
 		getHeatingPipeListByDataSetAndSmId,
 		getHeatingList,
@@ -961,6 +961,10 @@
 		heatingUserList,
 		getReportList
 	} from '@/api/tableInfo'
+
+  import {
+    selectEventList
+  } from '@/api/eventLifeLine'
 	import modal from '@/plugins/modal'
 
 	export default {
@@ -1331,7 +1335,7 @@
 			this.getSuperMapUrl();
 			this.selectTaskList();
 			this.selectFocusList();
-			this.heatingViewEventList();
+			this.selectEventList();
 			this.categoryStats();
 			this.inspectionMileageAnalysis();
 			this.getHeatingList();
@@ -3113,9 +3117,9 @@
 						}))
 						window.open('/tableInfoHandler', '_blank')
 						break
-					case '维护监管':
+					case '日常监管':
 						sessionStorage.setItem('tableInfoParams', JSON.stringify({
-							type: '维护监管',
+							type: '日常监管',
 
 						}))
 						window.open('/tableInfoHandler', '_blank')
@@ -3389,9 +3393,9 @@
 			/**
 			 * 事件列表
 			 */
-			heatingViewEventList(val) {
-				heatingViewEventList({
-					eventTypeCode: '5'
+			selectEventList(val) {
+				selectEventList({
+          industry: '1'
 				}).then(res => {
 					this.eventList = res.rows
 				})

+ 32 - 76
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,13 +2277,13 @@ 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
           } : {}),
@@ -2291,11 +2291,12 @@ export default {
             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,11 +2366,11 @@ 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
           } : {}),
@@ -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,10 +2452,11 @@ 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
           } : {}),
@@ -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;
       }