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

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";
@@ -3088,8 +3037,8 @@
       /**
        * 事件列表
        */
-      heatingViewEventList() {
-        heatingViewEventList({eventTypeCode: 6}).then(res => {
+      selectEventList() {
+        selectEventList({industry: 6}).then(res => {
           this.eventList = res.rows
           this.eventListTotal = res.total
         })