diff --git a/src/api/alarm/policyConfig/edgeDevice.ts b/src/api/alarm/policyConfig/edgeDevice.ts index bd7e0cc..82ba198 100644 --- a/src/api/alarm/policyConfig/edgeDevice.ts +++ b/src/api/alarm/policyConfig/edgeDevice.ts @@ -6,7 +6,7 @@ // 获取列表 export function getEdgeDeviceList(data: any) { return request({ - url: 'device/box/list', + url: 'device/box/listPage', method: 'get', params: data, }) diff --git a/src/api/alarm/policyConfig/edgeDevice.ts b/src/api/alarm/policyConfig/edgeDevice.ts index bd7e0cc..82ba198 100644 --- a/src/api/alarm/policyConfig/edgeDevice.ts +++ b/src/api/alarm/policyConfig/edgeDevice.ts @@ -6,7 +6,7 @@ // 获取列表 export function getEdgeDeviceList(data: any) { return request({ - url: 'device/box/list', + url: 'device/box/listPage', method: 'get', params: data, }) diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue index 0d491c1..fca5e5a 100644 --- a/src/views/alarm/dangerAssessment/assessment/list.vue +++ b/src/views/alarm/dangerAssessment/assessment/list.vue @@ -5,13 +5,44 @@ import LineChart from '@/components/Echart/LineChart.vue' import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue' import type { lineDataI } from '@/components/Echart/echart-interface' -import { areaDev, areaDevOnline, dayDev, getTotal } from '@/api/monitor/statistics' +import { areaDev, areaDevOnline, dayDev } from '@/api/monitor/statistics' import PieChart from '@/components/Echart/PieChart.vue' -import sbzxs from '@/assets/images/monitor/设备在线数.png' -import sbzs from '@/assets/images/monitor/设备总数.png' -import sblxl from '@/assets/images/monitor/设备离线率.png' -import BarChartVertical from '@/components/Echart/BarChartVertical.vue' - +import pointImage from '@/assets/bigScreen/point.png' +import resourceImage from '@/assets/bigScreen/resource.png' +import chemistryImage from '@/assets/bigScreen/chemistry.png' +import workImage from '@/assets/bigScreen/work.png' +import progressImage from '@/assets/bigScreen/progress.png' +import { getDangerCategory } from '@/api/bs' +const urlMap: any = { + 危险点: pointImage, + 重大危险源: resourceImage, + 危险化学品场所: chemistryImage, + 危险作业: workImage, + 危险作业工序: progressImage, +} +const list: any = ref([ + { + value: '--', + name: '危险点', + }, + { + value: '--', + name: '危险源', + }, + { + value: '--', + name: '危险化学品场所', + }, + { + value: '--', + name: '危险作业', + }, + { + value: '--', + name: '危险作业工序', + imageUrl: '@/assets/bigScreen/work.png', + }, +]) // 每个展示块高度 const blockHeight = ref(300) const blockWidth = ref(400) @@ -21,11 +52,7 @@ const areaPieLoading = ref(false) // 区域隐患分析 const safeCatogeryByDeptLoading = ref(false) // 单位安全隐患分类 const alarmLineLoading = ref(false) -const list = ref({ - devTotal: '****', - onlineNum: '****', - onlineRate: '****', -}) + const lastMonthAlarmXData: Ref = ref([]) const safeCatogeryXData: Ref = ref([]) const lastMonthAlarmData: Ref = ref([]) @@ -150,6 +177,37 @@ }) } +// 获取重大危险源、危险点、危险化学品场所、危险作业、危险作业工序 +const fetchDangerCategory = () => { + getDangerCategory().then((res) => { + if (res && res.data) { + list.value = [ + { + value: Number(res.data.dangerPoint), + name: '危险点', + }, + { + value: Number(res.data.dangerSource), + name: '重大危险源', + }, + { + value: Number(res.data.chemistryPlace), + name: '危险化学品场所', + }, + { + value: Number(res.data.work), + name: '危险作业', + }, + { + value: Number(res.data.workProcesses), + name: '危险作业工序', + }, + ] + } + }).catch(() => { + }) +} + function calcBlockSize() { // 计算工作台区域高度 - 顶部-面包屑-边距 const bodyHeight = document.body.clientHeight - 60 - 50 - 20 @@ -166,18 +224,7 @@ calcBlockSize() }) onMounted(() => { - getTotal().then((res) => { - if (res.code === 200) { - list.value = res.data - if (list.value.onlineNum === '' || list.value.onlineNum === null || list.value.onlineNum === undefined) { - list.value.onlineNum = '0' - } - // list.value.rate = (Number(list.value.onlineNum) / Number(list.value.devTotal) * 100).toFixed(2) - // if (Number.isNaN(list.value.rate)) { - // list.value.rate = '****' - // } - } - }) + fetchDangerCategory() getLastMonthAlarm() getSafeCatogery() // 获取安全隐患类别 getAlarmLine() // 单位报警时间曲线 @@ -189,58 +236,16 @@