From 85aaa5b44396144ce779b9e81aad400f708a27e9 Mon Sep 17 00:00:00 2001 From: fengrong Date: Thu, 19 Dec 2024 15:16:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/dashboard.vue | 2 +- ui/dasadmin/src/views/backend/home/home.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue index 603df4b2..d7c38d14 100644 --- a/ui/dasadmin/src/views/backend/dashboard.vue +++ b/ui/dasadmin/src/views/backend/dashboard.vue @@ -301,7 +301,7 @@ const StatusListData = () => { objectType: 10002, belongProject: '', attributesList: [ - 'iwindspeed"', + 'iwindspeed', 'iturbineoperationmode', 'iyplevel', 'gridlostdetected', diff --git a/ui/dasadmin/src/views/backend/home/home.vue b/ui/dasadmin/src/views/backend/home/home.vue index 60024075..5ab59585 100644 --- a/ui/dasadmin/src/views/backend/home/home.vue +++ b/ui/dasadmin/src/views/backend/home/home.vue @@ -205,7 +205,7 @@ const StatusListData = () => { objectType: 10002, belongProject: '', attributesList: [ - 'iwindspeed"', + 'iwindspeed', 'iturbineoperationmode', 'iyplevel', 'gridlostdetected', From 5639a87289520f5bd33b023da68b1a40cc564ad6 Mon Sep 17 00:00:00 2001 From: yu Date: Thu, 19 Dec 2024 15:17:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/das/modules/equipment/domain/vo/SysEquipmentVo.java | 5 +++++ .../java/com/das/modules/equipment/entity/SysEquipment.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java index d874dead..460b7694 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java +++ b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java @@ -124,4 +124,9 @@ public class SysEquipmentVo implements Serializable { */ private String options; + /** + * 所属工程 + */ + private String belongProject; + } diff --git a/das/src/main/java/com/das/modules/equipment/entity/SysEquipment.java b/das/src/main/java/com/das/modules/equipment/entity/SysEquipment.java index 7f7c4c49..4594f84c 100644 --- a/das/src/main/java/com/das/modules/equipment/entity/SysEquipment.java +++ b/das/src/main/java/com/das/modules/equipment/entity/SysEquipment.java @@ -143,4 +143,10 @@ public class SysEquipment extends BaseEntity { */ @TableField(value = "options") private String options; + + /** + * 所属工程 + */ + @TableField(value = "belong_project") + private String belongProject; } From c0a2713124d45fefbbc253aa1ed0c6f65f41fec5 Mon Sep 17 00:00:00 2001 From: fengrong Date: Thu, 19 Dec 2024 16:23:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=85=E9=9A=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/home/home.vue | 29 ++++++++++++++--- .../src/views/backend/home/windMatrixpage.vue | 31 ++++++++++++++----- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/ui/dasadmin/src/views/backend/home/home.vue b/ui/dasadmin/src/views/backend/home/home.vue index 5ab59585..03e95dd7 100644 --- a/ui/dasadmin/src/views/backend/home/home.vue +++ b/ui/dasadmin/src/views/backend/home/home.vue @@ -203,6 +203,7 @@ const StatusListData = () => { getWindTurbineMatrixData( { objectType: 10002, + /*belongProject: overviewSlotData.value,*/ belongProject: '', attributesList: [ 'iwindspeed', @@ -233,9 +234,12 @@ const StatusListData = () => { let color:any='' const state = getRealTimeState(item.attributeMap) let firsttriggeredcode=item.attributeMap.firsttriggeredcode - /* if (enumStore.keys.includes('FirstTriggeredCode')) { + if (enumStore.keys.includes('FirstTriggeredCode')) { firsttriggeredcode = enumStore.data['FirstTriggeredCode'][firsttriggeredcode] - }*/ + } + if (malFunctionKeys.includes('FirstTriggeredCode')) { + firsttriggeredcode = malFunctionEnums?.[firsttriggeredcode] ?? firsttriggeredcode + } paramColorData.value.forEach((item, index) => { if (item.state == state) { @@ -329,6 +333,7 @@ const StatusListData = () => { belongLine: item.belongLine || '-', standard: item.standard, layout:paramLayoutData.value[0], + madeinFactory: item.madeinFactory || '-', attributeMap: { iwindspeed: item.attributeMap.iwindspeed, igenpower: item.attributeMap.igenpower, @@ -338,7 +343,7 @@ const StatusListData = () => { color:color, locked: item.attributeMap.locked, irotorspeed: item.attributeMap.irotorspeed, - firsttriggeredcode:item.attributeMap.firsttriggeredcode, + firsttriggeredcode:firsttriggeredcode, }, } }) @@ -351,7 +356,21 @@ const StatusListData = () => { } }) } - +let malFunctionEnums: any = {} +const getMalfunctionEnums = () => { + /*queryfaultCodeDict({ madeinfactory: item!.madeinFactory, model: item!.model }).then((res) => {*/ + queryfaultCodeDict({ madeinfactory: '广东明阳风电', model: 'MY1.5/89' }).then((res) => { + if (res.code == 200) { + const data: any = {} + res.data.forEach((item: any) => { + data[item.code] = item.description + }) + malFunctionEnums = data + } else { + console.warn('查询故障代码字典失败:', res.message); + } + }) +} let autoUpdateForSecondTimer: any = null @@ -386,7 +405,7 @@ onMounted(() => { getList() window.addEventListener('resize', sizeChange) sizeChange() - //getAllChartData() + getMalfunctionEnums() overviewList() StatusListData() autoUpdate() diff --git a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue index d81652ab..b032f924 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue @@ -70,8 +70,11 @@
- {{ item.attributeMap.firsttriggeredcode }} + {{ item.attributeMap.firsttriggeredcode }} + 已锁定
@@ -125,6 +128,10 @@ import { sendCommandReq, sendManualCommandReq } from '/@/api/backend/control/req import {ElMessage, ElMessageBox} from "element-plus"; import {equipUpdate} from '/@/api/backend/index.ts' import {queryfaultCodeDict} from "/@/api/backend/theoreticalpowerCurve/request"; +import { malFunctionKeys } from '/@/views/backend/equipment/airBlower/utils' +import { useEnumStore } from '/@/stores/enums' + +const enumStore = useEnumStore() const router = useRouter() const props = defineProps({ @@ -404,20 +411,30 @@ const getSafeImagePath = (item, type) => { return imagePath; }; +/*const getFaultDescription=(item)=>{ + getMalfunctionEnums(item) + let firsttriggeredcode=item.attributeMap.firsttriggeredcode + if (malFunctionKeys.includes('FirstTriggeredCode')) { + firsttriggeredcode = malFunctionEnums?.[firsttriggeredcode] ?? firsttriggeredcode + } + return firsttriggeredcode +}*/ -let malFunctionEnums: any = {} -const getMalfunctionEnums = () => { - const curWindBlower = airBlowerList.value.find((item) => item.irn === route.query.irn) - queryfaultCodeDict({ madeinfactory: curWindBlower!.madeinfactory, model: curWindBlower!.model }).then((res) => { +/*let malFunctionEnums: any = {} +const getMalfunctionEnums = (item) => { + /!*queryfaultCodeDict({ madeinfactory: item!.madeinFactory, model: item!.model }).then((res) => {*!/ + queryfaultCodeDict({ madeinfactory: '广东明阳风电', model: 'MY1.5/89' }).then((res) => { if (res.code == 200) { const data: any = {} res.data.forEach((item: any) => { data[item.code] = item.description }) malFunctionEnums = data - } + } else { + console.warn('查询故障代码字典失败:', res.message); + } }) -} +}*/