Add - 燃气 事件列表接口对接

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,12 +2067,13 @@ 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
           } : {}),
@@ -2082,273 +2081,13 @@ export default {
             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
-            },
+          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: '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,13 +2154,13 @@ 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
           } : {}),
@@ -2475,7 +2212,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2489,15 +2226,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,12 +2240,13 @@ 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
           } : {}),
@@ -2562,7 +2298,7 @@ export default {
               hidden: true
             },
             {
-              prop: `eventStatus`,
+              prop: `eventStatusLabel`,
               label: '事件状态'
             },
             {
@@ -2576,15 +2312,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) {
@@ -3165,7 +2899,7 @@ export default {
             markersMap.icon = "cuiban";
             break;
           case '城市体检':
-          case '维护监管':
+          case '日常监管':
           case '基础事件':
           case '设备预警':
             markersMap.icon = "yujing";
@@ -3445,30 +3179,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 +3294,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
       })
@@ -3731,9 +3448,11 @@ 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
       })
     },
     /**