|
@@ -140,7 +140,7 @@
|
|
|
:clearable="true" style="width: 60%;"></el-date-picker>
|
|
:clearable="true" style="width: 60%;"></el-date-picker>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- 隐患管理筛查项 -->
|
|
<!-- 隐患管理筛查项 -->
|
|
|
- <div v-else-if="currentType=='城市体检'||currentType=='维护监管'||currentType=='基础事件'||currentType=='设备预警'">
|
|
|
|
|
|
|
+ <div v-else-if="currentType=='城市体检'||currentType=='日常监管'||currentType=='基础事件'||currentType=='设备预警'">
|
|
|
<el-input v-model="searchValue" placeholder="事件名称" clearable>
|
|
<el-input v-model="searchValue" placeholder="事件名称" clearable>
|
|
|
<template #append></template>
|
|
<template #append></template>
|
|
|
</el-input>
|
|
</el-input>
|
|
@@ -804,7 +804,6 @@ import {
|
|
|
selectRiskRegisterlist,
|
|
selectRiskRegisterlist,
|
|
|
getEnterpriseList,
|
|
getEnterpriseList,
|
|
|
getHeatingList,
|
|
getHeatingList,
|
|
|
- selectEventExpediteList,
|
|
|
|
|
selectEventSuperviseList,
|
|
selectEventSuperviseList,
|
|
|
selectInspectionPatrolTaskList,
|
|
selectInspectionPatrolTaskList,
|
|
|
selectPatrolInspectionDataList,
|
|
selectPatrolInspectionDataList,
|
|
@@ -820,10 +819,11 @@ import {
|
|
|
heatingUserList,
|
|
heatingUserList,
|
|
|
getReportList,
|
|
getReportList,
|
|
|
getHeatingPipeListByDataSetAndSmId,
|
|
getHeatingPipeListByDataSetAndSmId,
|
|
|
- getEventDetail, getDeviceOnlineOfflineByDept
|
|
|
|
|
|
|
+ getDeviceOnlineOfflineByDept
|
|
|
} from '@/api/tableInfo'
|
|
} from '@/api/tableInfo'
|
|
|
import DetailDialog from "@/components/DetailDialog/tableInfoHandler.vue";
|
|
import DetailDialog from "@/components/DetailDialog/tableInfoHandler.vue";
|
|
|
import {getWeather} from "@/api/data";
|
|
import {getWeather} from "@/api/data";
|
|
|
|
|
+import { selectEventList,getEventDetail } from '@/api/eventLifeLine'
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
name: 'lookall',
|
|
name: 'lookall',
|
|
@@ -982,7 +982,7 @@ export default {
|
|
|
searchValue: '',
|
|
searchValue: '',
|
|
|
searchCode: '',
|
|
searchCode: '',
|
|
|
searchTime: '',
|
|
searchTime: '',
|
|
|
- hasPositionLabels: ['热力管线', '窨井管理', '热源厂信息', '换热站信息', '场站管理', '小区管理', '隐患管理', '城市体检', '维护监管', '基础事件', '设备预警', '催办事件', '督办事件',
|
|
|
|
|
|
|
+ hasPositionLabels: ['热力管线', '窨井管理', '热源厂信息', '换热站信息', '场站管理', '小区管理', '隐患管理', '城市体检', '日常监管', '基础事件', '设备预警', '催办事件', '督办事件',
|
|
|
'物资管理', '设备管理','用户管理'
|
|
'物资管理', '设备管理','用户管理'
|
|
|
],
|
|
],
|
|
|
latKey: '',
|
|
latKey: '',
|
|
@@ -2277,13 +2277,13 @@ export default {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
- else if (type == '城市体检'||type == '维护监管'||type == '基础事件'||type == '设备预警') {
|
|
|
|
|
|
|
+ else if (type == '城市体检'||type == '日常监管'||type == '基础事件'||type == '设备预警') {
|
|
|
this.tableListVisible = true
|
|
this.tableListVisible = true
|
|
|
- selectEventExpediteList({
|
|
|
|
|
|
|
+ selectEventList({
|
|
|
pageNum: pageNum || 1,
|
|
pageNum: pageNum || 1,
|
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
|
- expediteStatus: 1,
|
|
|
|
|
- eventTypeCode: '5',
|
|
|
|
|
|
|
+ industry : 1,
|
|
|
|
|
+ eventTypeDl: type == '城市体检' ? 100 : type == '日常监管' ? 200 : type == '基础事件' ? 300 : type == '设备预警' ? 400 : null,
|
|
|
...(this.searchTime ? {
|
|
...(this.searchTime ? {
|
|
|
createTime: this.searchTime
|
|
createTime: this.searchTime
|
|
|
} : {}),
|
|
} : {}),
|
|
@@ -2291,11 +2291,12 @@ export default {
|
|
|
eventTitle: this.searchValue
|
|
eventTitle: this.searchValue
|
|
|
} : {})
|
|
} : {})
|
|
|
}).then(res => {
|
|
}).then(res => {
|
|
|
- this.tablePropAndLabel = [{
|
|
|
|
|
|
|
+ this.tablePropAndLabel = [
|
|
|
|
|
+ {
|
|
|
prop: `eventId`,
|
|
prop: `eventId`,
|
|
|
label: '事件唯一标识',
|
|
label: '事件唯一标识',
|
|
|
hidden: true
|
|
hidden: true
|
|
|
- },
|
|
|
|
|
|
|
+ },
|
|
|
{
|
|
{
|
|
|
prop: `eventTitle`,
|
|
prop: `eventTitle`,
|
|
|
label: '事件名称'
|
|
label: '事件名称'
|
|
@@ -2335,7 +2336,7 @@ export default {
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: `eventStatus`,
|
|
|
|
|
|
|
+ prop: `eventStatusLabel`,
|
|
|
label: '事件状态'
|
|
label: '事件状态'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
@@ -2349,7 +2350,7 @@ export default {
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: `expediteStatus`,
|
|
|
|
|
|
|
+ prop: `expediteStatusLabel`,
|
|
|
label: '催办状态',
|
|
label: '催办状态',
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
@@ -2365,11 +2366,11 @@ export default {
|
|
|
}
|
|
}
|
|
|
else if (type == '催办事件') {
|
|
else if (type == '催办事件') {
|
|
|
this.tableListVisible = true
|
|
this.tableListVisible = true
|
|
|
- selectEventExpediteList({
|
|
|
|
|
|
|
+ selectEventList({
|
|
|
pageNum: pageNum || 1,
|
|
pageNum: pageNum || 1,
|
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
|
|
|
+ industry : 1,
|
|
|
expediteStatus: 1,
|
|
expediteStatus: 1,
|
|
|
- eventTypeCode: '5',
|
|
|
|
|
...(this.searchTime ? {
|
|
...(this.searchTime ? {
|
|
|
createTime: this.searchTime
|
|
createTime: this.searchTime
|
|
|
} : {}),
|
|
} : {}),
|
|
@@ -2421,7 +2422,7 @@ export default {
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: `eventStatus`,
|
|
|
|
|
|
|
+ prop: `eventStatusLabel`,
|
|
|
label: '事件状态'
|
|
label: '事件状态'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
@@ -2435,7 +2436,7 @@ export default {
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: `expediteStatus`,
|
|
|
|
|
|
|
+ prop: `expediteStatusLabel`,
|
|
|
label: '催办状态',
|
|
label: '催办状态',
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
@@ -2451,10 +2452,11 @@ export default {
|
|
|
}
|
|
}
|
|
|
else if (type == '督办事件') {
|
|
else if (type == '督办事件') {
|
|
|
this.tableListVisible = true
|
|
this.tableListVisible = true
|
|
|
- selectEventSuperviseList({
|
|
|
|
|
|
|
+ selectEventList({
|
|
|
pageNum: pageNum || 1,
|
|
pageNum: pageNum || 1,
|
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
|
- eventTypeCode: '5',
|
|
|
|
|
|
|
+ industry : 1,
|
|
|
|
|
+ superviseStatus: 1,
|
|
|
...(this.searchTime ? {
|
|
...(this.searchTime ? {
|
|
|
createTime: this.searchTime
|
|
createTime: this.searchTime
|
|
|
} : {}),
|
|
} : {}),
|
|
@@ -2506,7 +2508,7 @@ export default {
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: `eventStatus`,
|
|
|
|
|
|
|
+ prop: `eventStatusLabel`,
|
|
|
label: '事件状态'
|
|
label: '事件状态'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
@@ -2520,7 +2522,7 @@ export default {
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: `expediteStatus`,
|
|
|
|
|
|
|
+ prop: `expediteStatusLabel`,
|
|
|
label: '催办状态',
|
|
label: '催办状态',
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
@@ -2983,7 +2985,7 @@ export default {
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: `eventStatus`,
|
|
|
|
|
|
|
+ prop: `eventStatusLabel`,
|
|
|
label: '事件状态',
|
|
label: '事件状态',
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
@@ -3737,7 +3739,7 @@ export default {
|
|
|
this.dataText = "暂无数据"
|
|
this.dataText = "暂无数据"
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
else if (type == '挖掘手续') {
|
|
else if (type == '挖掘手续') {
|
|
|
this.tableListVisible = true
|
|
this.tableListVisible = true
|
|
|
this.tablePropAndLabel = [
|
|
this.tablePropAndLabel = [
|
|
@@ -3795,7 +3797,7 @@ export default {
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: `miningTime`,
|
|
|
|
|
|
|
+ prop: `miningTime`,
|
|
|
label: '挖掘期限',
|
|
label: '挖掘期限',
|
|
|
hidden: true
|
|
hidden: true
|
|
|
},
|
|
},
|
|
@@ -3907,7 +3909,7 @@ export default {
|
|
|
remark:'无',
|
|
remark:'无',
|
|
|
longitude:124.352627,
|
|
longitude:124.352627,
|
|
|
latitude:43.14842,
|
|
latitude:43.14842,
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
]
|
|
]
|
|
|
this.total = 1
|
|
this.total = 1
|
|
|
// 地图绑定落点
|
|
// 地图绑定落点
|
|
@@ -4099,7 +4101,7 @@ export default {
|
|
|
warningSignsDescription: "施工区域设置围挡75米,夜间布置警示灯12个、警告牌6块,并在东西两端放置‘前方施工·车辆绕行’指示牌。",
|
|
warningSignsDescription: "施工区域设置围挡75米,夜间布置警示灯12个、警告牌6块,并在东西两端放置‘前方施工·车辆绕行’指示牌。",
|
|
|
longitude:124.352627,
|
|
longitude:124.352627,
|
|
|
latitude:43.14842,
|
|
latitude:43.14842,
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
]
|
|
]
|
|
|
this.total = 1
|
|
this.total = 1
|
|
|
// 地图绑定落点
|
|
// 地图绑定落点
|
|
@@ -4144,7 +4146,7 @@ export default {
|
|
|
markersMap.icon = "cuiban";
|
|
markersMap.icon = "cuiban";
|
|
|
break;
|
|
break;
|
|
|
case '城市体检':
|
|
case '城市体检':
|
|
|
- case '维护监管':
|
|
|
|
|
|
|
+ case '日常监管':
|
|
|
case '基础事件':
|
|
case '基础事件':
|
|
|
case '设备预警':
|
|
case '设备预警':
|
|
|
markersMap.icon = "yujing";
|
|
markersMap.icon = "yujing";
|
|
@@ -4183,7 +4185,9 @@ export default {
|
|
|
},
|
|
},
|
|
|
// 打开事件详情弹窗
|
|
// 打开事件详情弹窗
|
|
|
openEventDetail(obj) {
|
|
openEventDetail(obj) {
|
|
|
- getEventDetail(obj.eventId).then(res => {
|
|
|
|
|
|
|
+ getEventDetail({
|
|
|
|
|
+ eventId: obj.eventId
|
|
|
|
|
+ }).then(res => {
|
|
|
this.eventInfo = res.data
|
|
this.eventInfo = res.data
|
|
|
this.eventDialogVisible = true
|
|
this.eventDialogVisible = true
|
|
|
})
|
|
})
|
|
@@ -4352,55 +4356,7 @@ export default {
|
|
|
this.$refs.detailDialog.openDetail(type,obj);
|
|
this.$refs.detailDialog.openDetail(type,obj);
|
|
|
return;
|
|
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);
|
|
this.openEventDetail(row);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|