From 6c6f6eef43d3aba5e67d1056e53377860c282251 Mon Sep 17 00:00:00 2001 From: geting <13585118195@163.com> Date: Thu, 5 Dec 2024 16:27:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue b/ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue index 354b45ed..e7953bee 100644 --- a/ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue +++ b/ui/dasadmin/src/views/backend/theoreticalpowerCurve/index.vue @@ -613,6 +613,7 @@ const handleCurrentChange = (val: any) => { getpowerCurve() getFaultRecording() getRunLog() + getfaultCodeDict() } const getpowerCurve = () => { currentRow.value = currentRow.value ?? theoreticalTableData.value[0] From fe312b8d061249b3ef1c0c827bb5953224cde0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Thu, 5 Dec 2024 16:41:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=95=E9=A3=8E=E6=9C=BA=EF=BC=9A?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=9E=9A=E4=B8=BE=20=E9=87=8F=E6=B5=8B?= =?UTF-8?q?=EF=BC=9A=E6=95=85=E9=9A=9C=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/backend/WindBlower/index.vue | 21 +++------------- .../backend/equipment/airBlower/utils.ts | 14 ++++++++++- .../equipment/equipmentManagement/index.vue | 10 ++++++-- .../equipmentManagement/measurement.vue | 25 ++++++++++++++++++- 4 files changed, 49 insertions(+), 21 deletions(-) diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue index e4e92d28..d270d7b1 100644 --- a/ui/dasadmin/src/views/backend/WindBlower/index.vue +++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue @@ -327,7 +327,7 @@ import { useRoute, useRouter } from 'vue-router' import Overview from './overview.vue' import { TableInstance } from 'element-plus' import { dayjs, ElMessage, ElMessageBox } from 'element-plus' -import { getRealTimeState, getCutDecimalsValue } from '/@/views/backend/equipment/airBlower/utils' +import { getRealTimeState, getCutDecimalsValue, malFunctionKeys } from '/@/views/backend/equipment/airBlower/utils' import { sendCommandReq, sendManualCommandReq } from '/@/api/backend/control/request' import { getAlarmListReq } from '/@/api/backend/alarms/request' import { queryfaultCodeDict } from '/@/api/backend/theoreticalpowerCurve/request' @@ -1037,7 +1037,7 @@ const createRealTimeData = async () => { val = enumStore.data[item.attributeCode][val] } if (malFunctionKeys.includes(item.attributeCode)) { - val = malFunctionEnums?.[item.attributeCode] ?? val + val = malFunctionEnums?.[val] ?? val } if (sigleDataKeys.includes(item.attributeCode.toLowerCase())) { realTimeDataForSingle.value[item.attributeCode.toLowerCase()] = val === '-' ? val : val @@ -1345,29 +1345,16 @@ const getAlarmList = () => { }) } -const malFunctionKeys = [ - 'ActiveStatusCode01', - 'ActiveStatusCode02', - 'ActiveStatusCode03', - 'ActiveStatusCode04', - 'ActiveStatusCode05', - 'ActiveStatusCode06', - 'ActiveStatusCode07', - 'ActiveStatusCode08', - 'FirstTriggeredCode', -] - -const malFunctionEnums: any = {} +let malFunctionEnums: any = {} const getMalfunctionEnums = () => { const curWindBlower = airBlowerList.value.find((item) => item.irn === route.query.irn) - console.log(curWindBlower) - queryfaultCodeDict({ madeinfactory: curWindBlower!.madeinfactory, model: curWindBlower!.model }).then((res) => { if (res.code == 200) { const data: any = {} res.data.forEach((item: any) => { data[item.code] = item.description }) + malFunctionEnums = data } }) } diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts b/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts index 2300b0f7..ba5be2e8 100644 --- a/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts +++ b/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts @@ -35,4 +35,16 @@ export const getEnumToValue = (key: string, value: any) => { } else { return value } -} \ No newline at end of file +} + +export const malFunctionKeys = [ + 'ActiveStatusCode01', + 'ActiveStatusCode02', + 'ActiveStatusCode03', + 'ActiveStatusCode04', + 'ActiveStatusCode05', + 'ActiveStatusCode06', + 'ActiveStatusCode07', + 'ActiveStatusCode08', + 'FirstTriggeredCode', +] diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue index 3c617488..1b96fd15 100644 --- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue +++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue @@ -487,6 +487,8 @@ :iotModelId="measureData.iotModelId" :autoUpdate="measureData.autoUpdate" :attributeType="measureData.measureType" + :madein-factory="measureData.madeinFactory" + :model="measureData.model" > @@ -765,8 +767,6 @@ const modelList = ref<{ model: string; madeinFactory: string }[]>([]) const getModelList = () => { theoreticalpowerCurveList().then((res) => { if (res.rows) { - console.log(res) - modelList.value = (res.rows as any[]).map((item: any) => { return { model: item.model, @@ -1060,16 +1060,22 @@ const measureData = reactive<{ iotModelId: string autoUpdate: boolean measureType: ModelAttributeType + madeinFactory:string + model:string }>({ deviceId: '', iotModelId: '', autoUpdate: false, measureType: 138, + madeinFactory:'', + model:'' }) const showMeasure = ref(false) const openMeasure = (data: any) => { measureData.deviceId = data.row.id measureData.iotModelId = data.row.iotModelId + measureData.madeinFactory = data.row.madeinFactory + measureData.model = data.row.model if (measureData.iotModelId) { showMeasure.value = true } else { diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue index 23e52612..0f31f27b 100644 --- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue +++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue @@ -89,16 +89,21 @@ import { getModelAttributeListReq, getRealValueListReq } from '/@/api/backend/de import * as echarts from 'echarts' import { getRealValueRangeReq } from '/@/api/backend/deviceModel/request' import { useEnumStore } from '/@/stores/enums' +import { queryfaultCodeDict } from '/@/api/backend/theoreticalpowerCurve/request' +import { malFunctionKeys} from '/@/views/backend/equipment/airBlower/utils' + const enumStore = useEnumStore() const props = withDefaults( - defineProps<{ iotModelId: string; deviceId: string; show: boolean; autoUpdate: boolean; attributeType: ModelAttributeType }>(), + defineProps<{ iotModelId: string; deviceId: string; show: boolean; autoUpdate: boolean; attributeType: ModelAttributeType;model:string;madeinFactory:string }>(), { iotModelId: '', deviceId: '', show: false, autoUpdate: false, attributeType: 138, + model:'', + madeinFactory:'' } ) @@ -204,6 +209,20 @@ const getRealValueList = (data: { deviceId: string; attributes: string[] }, list }) } +let malFunctionEnums: any = {} +const getMalfunctionEnums = () => { + queryfaultCodeDict({ madeinfactory: props.madeinFactory, model: props.model }).then((res) => { + if (res.code == 200) { + const data: any = {} + res.data.forEach((item: any) => { + data[item.code] = item.description + }) + malFunctionEnums = data + } + }) +} + + const getCompleteData = () => { getAttributeList() .then(({ data, codeList }: any) => { @@ -217,6 +236,9 @@ const getCompleteData = () => { if (enumStore.keys.includes(item.attributeCode)) { realValItem = enumStore.data[item.attributeCode][realValItem] } + if(malFunctionKeys.includes(item.attributeCode)){ + realValItem = malFunctionEnums?.[realValItem] ?? realValItem + } return { ...item, realTimeValue: realValItem @@ -505,6 +527,7 @@ watch( (newVal) => { if (newVal) { getCompleteData() + getMalfunctionEnums() searchOptions.datePickerValue = shortcuts[0].value() } else { autoUpdateTimer.value && clearInterval(autoUpdateTimer.value) From ec17854c8ceb6076f5f63ae1a18473af9f443f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Thu, 5 Dec 2024 17:08:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=9A=E6=9C=BA?= =?UTF-8?q?=E7=BB=84=E9=A2=9D=E5=AE=9A=E5=AE=B9=E9=87=8F=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/equipmentManagement/index.vue | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue index 1b96fd15..9c75668a 100644 --- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue +++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue @@ -119,9 +119,9 @@ @@ -129,7 +129,7 @@ - + @@ -299,9 +300,9 @@ @@ -309,7 +310,7 @@ - + @@ -733,7 +735,7 @@ const addDeviceList = () => { editAddDeviceData.iotModelId = '' editAddDeviceData.belongLine = '' editAddDeviceData.standard = 0 - editAddDeviceData.nominalCapacity = null + editAddDeviceData.nominalCapacity = '' } // 查看设备详情 @@ -756,13 +758,13 @@ const editDeviceData = reactive({ id: '', belongLine: '', standard: 0, - nominalCapacity: null, + nominalCapacity: '', }) -const hasShowSelect = computed(() => { +const hasSetOfMachines = computed(() => { return queryParameter.value.equipmentTypeId === 10002 }) -const modelList = ref<{ model: string; madeinFactory: string }[]>([]) +const modelList = ref<{ model: string; madeinFactory: string; nominalCapacity: string }[]>([]) const getModelList = () => { theoreticalpowerCurveList().then((res) => { @@ -771,6 +773,7 @@ const getModelList = () => { return { model: item.model, madeinFactory: item.madeinfactory, + nominalCapacity: item.nominalCapacity, } }) } @@ -778,9 +781,11 @@ const getModelList = () => { } const selectEditModel = (value: string) => { editDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || '' + editDeviceData.nominalCapacity = modelList.value.find((item) => item.model == value)?.nominalCapacity || '' } const selectAddModel = (value: string) => { editAddDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || '' + editAddDeviceData.nominalCapacity = modelList.value.find((item) => item.model == value)?.nominalCapacity || '' } const size = ref<'default' | 'large' | 'small'>('default') @@ -938,7 +943,7 @@ const editAddDeviceData = reactive({ iotModelId: '', belongLine: '', standard: 0, - nominalCapacity: null, + nominalCapacity: '', }) const addhandleSwitchChange = (value: any) => { editAddDeviceData.standard = value ? 1 : 0 @@ -1060,15 +1065,15 @@ const measureData = reactive<{ iotModelId: string autoUpdate: boolean measureType: ModelAttributeType - madeinFactory:string - model:string + madeinFactory: string + model: string }>({ deviceId: '', iotModelId: '', autoUpdate: false, measureType: 138, - madeinFactory:'', - model:'' + madeinFactory: '', + model: '', }) const showMeasure = ref(false) const openMeasure = (data: any) => {