Add - 管廊 事件列表接口对接

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()
@@ -952,8 +954,8 @@ 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 == '管廊管理') {