|
|
@@ -192,23 +192,23 @@
|
|
|
</div>
|
|
|
<div class="content-box h-530 p-15" style="height: 460px !important">
|
|
|
<div class="box-row flex-c" style="justify-content: flex-start;">
|
|
|
- <el-select v-model="value4" placeholder="请选择" class="sj-select-100" popper-class="sj-s-pop">
|
|
|
- <el-option v-for="item in options4" :key="item.value" :label="item.label"
|
|
|
+ <el-select v-model="industry" placeholder="请选择" clearable class="sj-select-100" popper-class="sj-s-pop">
|
|
|
+ <el-option v-for="item in industryList" :key="item.value" :label="item.label"
|
|
|
:value="item.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-input placeholder="请输入内容" suffix-icon="el-icon-search" v-model="input2"
|
|
|
+ <el-input placeholder="请输入内容" suffix-icon="el-icon-search" v-model="eventName"
|
|
|
class="sj-input-style">
|
|
|
</el-input>
|
|
|
<div class="list-ul-style-tit list-ul-100-tit">
|
|
|
- <span style="width: 40px;">序号</span>
|
|
|
- <span style="width: 60%;">事件名称</span>
|
|
|
+ <span style="width: 60%;">事件名称</span>
|
|
|
+ <span style="width: 70px;">催办情况</span>
|
|
|
<span style="width: 65px;">处理情况</span>
|
|
|
</div>
|
|
|
<ul class="list-ul-style list-ul-100" style="height: 63.5% !important;">
|
|
|
- <li v-for="item in eventList" :key="item.id">
|
|
|
- <span style="width: 40px;">{{ item.id}}</span>
|
|
|
- <span style="width: 60%;">{{ item.eventLabel }}</span>
|
|
|
+ <li v-for="item in eventList" :key="item.id" @click="openEventDetail(item)">
|
|
|
+ <span style="width: 60%;">{{ item.eventTitle }}</span>
|
|
|
+ <span style="width: 70px;">{{ item.expediteStatusLabel}}</span>
|
|
|
<span style="width: 65px;"
|
|
|
:class=" item.eventStatusLabel == '已完成' ? 'green-txt' : 'blue-txt' ">{{ item.eventStatusLabel }}</span>
|
|
|
</li>
|
|
|
@@ -642,7 +642,7 @@
|
|
|
<el-table-column prop="endTime" label="巡查结束时间">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <el-pagination @current-change="taskList" :current-page="pagerCount" :page-size="pageSize"
|
|
|
+ <el-pagination @current-change="selectPatrolInspectionDataList" :current-page="pagerCount" :page-size="pageSize"
|
|
|
layout="total, prev, pager, next" :total="taskTotal">
|
|
|
</el-pagination>
|
|
|
</div>
|
|
|
@@ -669,7 +669,8 @@
|
|
|
import * as echarts from 'echarts'
|
|
|
import { queryVectorTilesMapList } from '@/api/components/supermap'
|
|
|
import {annualPlanCount, closedPatrolTaskCount, patrolTaskCount, patrolTrackDistance} from "@/api/Regulatory";
|
|
|
- import {selectPatrolInspectionDataList} from "@/api/tableInfo";
|
|
|
+ import { selectPatrolInspectionDataList, selectThresholdList } from '@/api/tableInfo'
|
|
|
+ import { getEventDetail, selectEventList } from '@/api/eventLifeLine'
|
|
|
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -704,15 +705,9 @@
|
|
|
this.hyChart();
|
|
|
this.ndChart();
|
|
|
this.xcChart();
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ this.selectEventList();
|
|
|
},
|
|
|
computed: {
|
|
|
- eventList() {
|
|
|
- return this.lists[this.selectedDiv] || []; // 如果selectedDiv不存在于lists中,返回空数组以避免错误。
|
|
|
- },
|
|
|
|
|
|
},
|
|
|
data() {
|
|
|
@@ -1253,23 +1248,27 @@
|
|
|
label: '双辽市'
|
|
|
}],
|
|
|
value3: '',
|
|
|
- options4: [{
|
|
|
- value: '选项1',
|
|
|
- label: '铁东区'
|
|
|
- }, {
|
|
|
- value: '选项2',
|
|
|
- label: '铁西区'
|
|
|
- }, {
|
|
|
- value: '选项3',
|
|
|
- label: '梨树县'
|
|
|
- }, {
|
|
|
- value: '选项4',
|
|
|
- label: '伊通县'
|
|
|
- }, {
|
|
|
- value: '选项5',
|
|
|
- label: '双辽市'
|
|
|
- }],
|
|
|
- value4: '',
|
|
|
+ industryList: [
|
|
|
+ {
|
|
|
+ value: '1',
|
|
|
+ label: '热力'
|
|
|
+ }, {
|
|
|
+ value: '2',
|
|
|
+ label: '排水'
|
|
|
+ }, {
|
|
|
+ value: '3',
|
|
|
+ label: '桥梁'
|
|
|
+ }, {
|
|
|
+ value: '4',
|
|
|
+ label: '管廊'
|
|
|
+ }, {
|
|
|
+ value: '5',
|
|
|
+ label: '燃气'
|
|
|
+ }, {
|
|
|
+ value: '6',
|
|
|
+ label: '供水'
|
|
|
+ }],
|
|
|
+ industry: '',
|
|
|
options5: [{
|
|
|
value: '选项1',
|
|
|
label: '铁东区'
|
|
|
@@ -1323,7 +1322,7 @@
|
|
|
],
|
|
|
value7: '',
|
|
|
input1: '',
|
|
|
- input2: '',
|
|
|
+ eventName: '',
|
|
|
dialogVisibleSj: false,
|
|
|
currentTab: 0,
|
|
|
currentClass: 0,
|
|
|
@@ -1669,172 +1668,7 @@
|
|
|
|
|
|
],
|
|
|
selectedDiv: 1, // 当前选中的div的编号
|
|
|
- lists: {
|
|
|
- 1: [{
|
|
|
- id: 1,
|
|
|
- eventLabel: '紫气大街66号3号管道改造',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 2,
|
|
|
- eventLabel: '解放路32号支线维修工程',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 3,
|
|
|
- eventLabel: '站前街68号2号燃气管道改造',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 4,
|
|
|
- eventLabel: '迎宾大街30号排水系统升级',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 5,
|
|
|
- eventLabel: '东环路25号1号供热主管道抢修',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 6,
|
|
|
- eventLabel: '胜利南街3号管网检修',
|
|
|
- eventStatusLabel: '待处理'
|
|
|
- }
|
|
|
- ],
|
|
|
- 2: [{
|
|
|
- id: 1,
|
|
|
- eventLabel: '文化路15号老旧管线改造',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 2,
|
|
|
- eventLabel: '和平街48号地下管廊巡检',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 3,
|
|
|
- eventLabel: '新华大街88号自来水管更新',
|
|
|
- eventStatusLabel: '待处理'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 4,
|
|
|
- eventLabel: '中央西路22号热力分支改造',
|
|
|
- eventStatusLabel: '待处理'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 5,
|
|
|
- eventLabel: '建设南路19号排污管更换',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 6,
|
|
|
- eventLabel: '友谊街56号燃气阀门更换',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 7,
|
|
|
- eventLabel: '铁西一路9号供水管网检测',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 8,
|
|
|
- eventLabel: '英雄大街120号通信井整修',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 9,
|
|
|
- eventLabel: '平西路10号道路附属管线改造',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- {
|
|
|
- id: 10,
|
|
|
- eventLabel: '长征街77号地下热力管检修',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- ]
|
|
|
- },
|
|
|
- event2List: [
|
|
|
- {
|
|
|
- eventLabel: '紫气大街66号3号管道改造',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '解放路32号支线维修工程',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '站前街68号2号燃气管道改造',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '迎宾大街30号排水系统升级',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '东环路25号1号供热主管道抢修',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '胜利南街3号管网检修',
|
|
|
- eventStatusLabel: '待处理'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '文化路15号老旧管线改造',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '和平街48号地下管廊巡检',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '新华大街88号自来水管更新',
|
|
|
- eventStatusLabel: '待处理'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '中央西路22号热力分支改造',
|
|
|
- eventStatusLabel: '待处理'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '建设南路19号排污管更换',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '友谊街56号燃气阀门更换',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '铁西一路9号供水管网检测',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '英雄大街120号通信井整修',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '平西路10号道路附属管线改造',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '长征街77号地下热力管检修',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '中兴路45号2号排水井修复',
|
|
|
- eventStatusLabel: '待处理'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '四平路36号3号供气支线维护',
|
|
|
- eventStatusLabel: '进行中'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '康宁街20号老旧管道改造',
|
|
|
- eventStatusLabel: '待处理'
|
|
|
- },
|
|
|
- {
|
|
|
- eventLabel: '建设北路100号雨污分流改造',
|
|
|
- eventStatusLabel: '已完成'
|
|
|
- },
|
|
|
- ],
|
|
|
+ eventList:[],
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -2496,7 +2330,7 @@
|
|
|
this.$nextTick(() => {
|
|
|
this.xcrwChart();
|
|
|
this.xcgjChart();
|
|
|
- this.taskList();
|
|
|
+ this.selectPatrolInspectionDataList();
|
|
|
|
|
|
})
|
|
|
},
|
|
|
@@ -2738,7 +2572,24 @@
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
- taskList(pageSize){
|
|
|
+ /**
|
|
|
+ * 预警列表
|
|
|
+ */
|
|
|
+ selectEventList() {
|
|
|
+ selectEventList({industry: this.industry,eventTitle: this.eventName}).then(res => {
|
|
|
+ this.eventList = res.rows
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 打开事件详情弹窗
|
|
|
+ openEventDetail(obj) {
|
|
|
+ getEventDetail({
|
|
|
+ eventId: obj.eventId
|
|
|
+ }).then(res => {
|
|
|
+ this.eventInfo = res.data
|
|
|
+ this.eventDialogVisible = true
|
|
|
+ })
|
|
|
+ },
|
|
|
+ selectPatrolInspectionDataList(pageSize){
|
|
|
selectPatrolInspectionDataList({
|
|
|
pageNum: pageSize || 1,
|
|
|
pageSize: 10,
|
|
|
@@ -3047,8 +2898,11 @@
|
|
|
},
|
|
|
},
|
|
|
watch: {
|
|
|
- input2(newVal) {
|
|
|
- this.eventList = this.event2List.filter(e => e.eventLabel.includes(newVal))
|
|
|
+ eventName(newVal) {
|
|
|
+ this.selectEventList()
|
|
|
+ },
|
|
|
+ industry(newVal) {
|
|
|
+ this.selectEventList()
|
|
|
}
|
|
|
}
|
|
|
}
|