From 464a74cd5c745b97c54f54ecc4971d737d4c5575 Mon Sep 17 00:00:00 2001 From: geting <13585118195@163.com> Date: Mon, 23 Dec 2024 13:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A6=96=E8=A7=A6=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E7=A0=81=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/lang/common/zh-cn/alarm.ts | 1 + .../src/views/backend/alarms/index.vue | 137 +++++++++++------- ui/dasadmin/src/views/backend/alarms/type.ts | 1 + .../src/views/backend/report/SingleReport.vue | 129 ++++++++++------- .../backend/statAnalysis/trendAnalysis.vue | 2 +- .../backend/statAnalysis/trendComparison.vue | 2 +- 6 files changed, 165 insertions(+), 107 deletions(-) diff --git a/ui/dasadmin/src/lang/common/zh-cn/alarm.ts b/ui/dasadmin/src/lang/common/zh-cn/alarm.ts index dcca6c6f..f892d876 100644 --- a/ui/dasadmin/src/lang/common/zh-cn/alarm.ts +++ b/ui/dasadmin/src/lang/common/zh-cn/alarm.ts @@ -1,6 +1,7 @@ export default { select: '请选择', selectDate: '选择日期时间', + firstTriggeredCode: '首触故障码', type: '类别', alarmTime: '告警时间', } diff --git a/ui/dasadmin/src/views/backend/alarms/index.vue b/ui/dasadmin/src/views/backend/alarms/index.vue index d3025b19..12865d49 100644 --- a/ui/dasadmin/src/views/backend/alarms/index.vue +++ b/ui/dasadmin/src/views/backend/alarms/index.vue @@ -22,10 +22,22 @@ :placeholder="t('alarm.select') + t('airBlower.airBlowerNumber')" class="alarmSelect" clearable + @change="handleairBlowerChange" >
+
{{ t('alarm.firstTriggeredCode') }}
+ + + +
{{ t('alarm.type') }}
@@ -156,7 +168,7 @@ const getFormattedDate = (offset: number) => { // 风机编号 const airBlowerNumberValue = ref('') -const airBlowerList = ref([{ label: '', value: '' }]) +const airBlowerList = ref([{ label: '', value: '', model: '', madeinFactory: '' }]) // 类别 const alarmTypeValue = ref(2) const alarmTypes = ref([ @@ -164,6 +176,8 @@ const alarmTypes = ref([ { label: '告警', value: 1 }, { label: '提示', value: 0 }, ]) +const firstTriggeredCode = ref('') +const firstTriggeredCodes: any = ref([]) const isLoading = ref(false) const searchOperate = () => { isLoading.value = true @@ -189,6 +203,7 @@ const searchalarms = (): GetAlarmsTableParam => { deviceCode: deviceCode, pageNum: paginationOptions.current, pageSize: paginationOptions.pageSize, + firstTriggeredCode: firstTriggeredCode.value, } } @@ -207,28 +222,27 @@ const getcurrentPage = () => { const getalarmsList = async () => { const transparams = searchalarms() - console.log('🚀 ~ getalarmsList ~ transparams:', transparams) - getAlarmListReq(transparams).then((res: any) => { - isLoading.value = false - if (res.code == 200) { - paginationOptions.total = res.total - alarmsTableData.value = res.rows.map((item: any) => { - console.log('🚀 ~ alarmsTableData.value=res.rows.map ~ item:', item) - const descriptions = descriptionMap.value[`${item.madeinFactory}_${item.model}`] || {} - return { - ...item, - eventTimeFormate: timestampToTime(item.eventTime), - codeDescriptions: descriptions[item.firstTriggeredCode] || item.firstTriggeredCode, - } - }) - } else { - ElMessage.error(res.msg ?? '查询失败') - } - }) - // .catch((err) => { - // isLoading.value = false - // ElMessage.error(err ?? '查询失败') - // }) + getAlarmListReq(transparams) + .then((res: any) => { + isLoading.value = false + if (res.code == 200) { + paginationOptions.total = res.total + alarmsTableData.value = res.rows.map((item: any) => { + const descriptions = descriptionMap.value[`${item.madeinFactory}_${item.model}`] || {} + return { + ...item, + eventTimeFormate: timestampToTime(item.eventTime), + codeDescriptions: descriptions[item.firstTriggeredCode] || item.firstTriggeredCode, + } + }) + } else { + ElMessage.error(res.msg ?? '查询失败') + } + }) + .catch((err) => { + isLoading.value = false + ElMessage.error(err ?? '查询失败') + }) } const descriptionMap = computed(() => { @@ -239,8 +253,6 @@ const descriptionMap = computed(() => { return acc }, {}) }) - console.log('🚀 ~ map[item.key]=item.value.reduce ~ map:', map) - return map }) @@ -322,54 +334,64 @@ const getDateRange = (type: 'week' | 'month') => { } } +const handleairBlowerChange = (value: any) => { + if (value) { + const selectObj: any = airBlowerList.value.find((item) => { + return item.value == value + }) + firstTriggeredCode.value = '' + firstTriggeredCodes.value = faultCodeMap[`${selectObj.madeinFactory}_${selectObj.model}`] + } else { + firstTriggeredCode.value = '' + firstTriggeredCodes.value = faultCodeMap[`${airBlowerList.value[0].madeinFactory}_${airBlowerList.value[0].model}`] + } +} + const faultCodeMap: any = {} -onMounted(() => { - equipList({ - // orgId: adminInfo.orgid, - objectType: 10002, - }).then((res) => { + +onMounted(async () => { + try { + const res = await equipList({ + objectType: 10002, + }) if (res.code == 200) { airBlowerList.value = res.data.map((item: any) => { return { label: item.name, value: item.code, + madeinFactory: item.madeinFactory, + model: item.model, } }) - getalarmsList() - } - }) - theoreticalpowerCurveList() - .then((res: any) => { - if (res.code == 200) { - paginationOptions.total = res.total - res.rows.forEach((item: any, index: number) => { - getfaultCodeDict(item) - }) + const theoreticalRes = await theoreticalpowerCurveList() + if (theoreticalRes.code == 200) { + await getfaultCodeDict(theoreticalRes.rows) + firstTriggeredCodes.value = faultCodeMap[`${airBlowerList.value[0].madeinFactory}_${airBlowerList.value[0].model}`] + console.log(firstTriggeredCodes.value) } else { - ElMessage.error(res.msg ?? '查询失败') + ElMessage.error(theoreticalRes.msg ?? '查询失败') } - }) - .catch((err) => { - ElMessage.error(err?.response?.data?.msg ?? '查询失败') - }) + } + } catch (err) { + ElMessage.error(err ?? '查询失败') + } }) -const getfaultCodeDict = (data: any) => { - queryfaultCodeDict({ madeinfactory: data.madeinfactory, model: data.model }).then((res: any) => { +const getfaultCodeDict = async (data: any) => { + const promises = data.map(async (item: any) => { + const res = await queryfaultCodeDict({ madeinfactory: item.madeinfactory, model: item.model }) if (res.code == 200) { - const deflautList: any = [] - res.data.forEach((item: any) => { - deflautList.push({ - code: item.code, - description: item.description, - }) - }) - faultCodeMap[`${data.madeinfactory}_${data.model}`] = deflautList + const deflautList = res.data.map((faultItem: any) => ({ + code: faultItem.code, + description: faultItem.description, + })) + faultCodeMap[`${item.madeinfactory}_${item.model}`] = deflautList } else { ElMessage.warning('查询失败') } }) + await Promise.all(promises) } const openDefalt = (row: any) => { @@ -414,11 +436,14 @@ $paginationHeight: 32px; align-items: center; // width: 320px; .alarmSelect { - width: 200px; + width: 150px; :deep(.el-select__wrapper) { height: 40px; } } + .firstTriggeredCodeSelect { + width: 220px; + } } } .mainMain { diff --git a/ui/dasadmin/src/views/backend/alarms/type.ts b/ui/dasadmin/src/views/backend/alarms/type.ts index 0978d111..20f262d3 100644 --- a/ui/dasadmin/src/views/backend/alarms/type.ts +++ b/ui/dasadmin/src/views/backend/alarms/type.ts @@ -26,6 +26,7 @@ export type GetAlarmsTableParam = { eventLevel?: string | number | null pageNum?: Number pageSize?: Number + firstTriggeredCode: string | number | null } export enum AlarmsFieldsEnums { diff --git a/ui/dasadmin/src/views/backend/report/SingleReport.vue b/ui/dasadmin/src/views/backend/report/SingleReport.vue index 982d1f92..8c141e59 100644 --- a/ui/dasadmin/src/views/backend/report/SingleReport.vue +++ b/ui/dasadmin/src/views/backend/report/SingleReport.vue @@ -8,7 +8,7 @@ v-model="windBlowerValue" @change="selectWindBlower" :placeholder="'请选择' + t('statAnalysis.deviceId')" - class="windBlowerSelect commonSelect" + class="commonSelect" > @@ -29,11 +29,16 @@ +
+
{{ t('statAnalysis.calFunction') }}
+ + +
模板
- +