From 8ba368f194f3b2c0d90182e48887245293ae7a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Tue, 3 Dec 2024 16:11:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=9A=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=8D=95=E9=A3=8E=E6=9C=BA=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E9=A2=84=E8=A7=88=E6=95=85=E9=9A=9C=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=9E=9A=E4=B8=BE=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/WindBlower/index.vue    | 41 ++++++++++++++++++-
 .../src/views/backend/WindBlower/overview.vue | 28 ++++++-------
 ui/dasadmin/src/views/backend/node/utils.ts   | 10 +++--
 3 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue
index b5418100..46c31029 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue
@@ -330,6 +330,7 @@ import { dayjs, ElMessage, ElMessageBox } from 'element-plus'
 import { getRealTimeState, getCutDecimalsValue } 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'
 import { useEnumStore } from '/@/stores/enums'
 const enumStore = useEnumStore()
 
@@ -1037,6 +1038,9 @@ const createRealTimeData = async () => {
             if (enumStore.keys.includes(item.attributeCode)) {
                 val = enumStore.data[item.attributeCode][val]
             }
+            if (malFunctionKeys.includes(item.attributeCode)) {
+                val = malFunctionEnums?.[item.attributeCode] ?? val
+            }
             if (sigleDataKeys.includes(item.attributeCode.toLowerCase())) {
                 realTimeDataForSingle.value[item.attributeCode.toLowerCase()] = val === '-' ? val : val
             }
@@ -1351,6 +1355,34 @@ const getAlarmList = () => {
         }
     })
 }
+
+const malFunctionKeys = [
+    'ActiveStatusCode01',
+    'ActiveStatusCode02',
+    'ActiveStatusCode03',
+    'ActiveStatusCode04',
+    'ActiveStatusCode05',
+    'ActiveStatusCode06',
+    'ActiveStatusCode07',
+    'ActiveStatusCode08',
+    'FirstTriggeredCode',
+]
+
+const 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
+            })
+        }
+    })
+}
+
 const airBlowerList = ref<
     {
         irn: string
@@ -1358,11 +1390,12 @@ const airBlowerList = ref<
         name: string
         deviceCode: string
         iotModelId: string
+        madeinfactory: string
     }[]
 >([])
 
 const getAirBlowerList = () => {
-    getAirBlowerListReq().then((res) => {
+    return getAirBlowerListReq().then((res) => {
         if (res.success) {
             airBlowerList.value = res.data.map((item) => {
                 return {
@@ -1371,8 +1404,10 @@ const getAirBlowerList = () => {
                     name: item.name,
                     deviceCode: item.deviceCode,
                     iotModelId: item.modelId,
+                    madeinfactory: item.madeinfactory,
                 }
             })
+            return
         }
     })
 }
@@ -1413,7 +1448,9 @@ onMounted(() => {
     useEventListener(window, 'resize', echartsResize)
     autoUpdate()
     getAlarmList()
-    getAirBlowerList()
+    getAirBlowerList().then(() => {
+        getMalfunctionEnums()
+    })
 })
 
 onUnmounted(() => {
diff --git a/ui/dasadmin/src/views/backend/WindBlower/overview.vue b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
index 9f107782..3d457c46 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/overview.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
@@ -1,16 +1,18 @@
 <template>
     <div class="overviewWrap">
         <div class="dialogContent">
-            <div class="PitchPart">
-                <el-row>
-                    <el-col :span="12" v-for="item in showData" :key="item.name">
-                        <div class="Pitchitem">
-                            <span class="PitchitemLeft">{{ item.name }}</span>
-                            <span class="PitchitemRight">{{ item.value }}</span>
-                        </div>
-                    </el-col>
-                </el-row>
-            </div>
+            <el-scrollbar>
+                <div class="PitchPart">
+                    <el-row>
+                        <el-col :span="12" v-for="item in showData" :key="item.name">
+                            <div class="Pitchitem">
+                                <span class="PitchitemLeft">{{ item.name }}</span>
+                                <span class="PitchitemRight">{{ item.value }}</span>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </div>
+            </el-scrollbar>
         </div>
         <div class="footer">
             <el-pagination
@@ -71,15 +73,13 @@ onMounted(() => {
 <style scoped lang="scss">
 .dialogContent {
     width: 100%;
-    max-height: 540px;
-    overflow-x: hidden;
-    overflow-y: auto;
+    height: 540px;
     .PitchPart {
         .Pitchitem {
             border: 1px solid #e1edf6;
             display: flex;
             justify-content: space-between;
-            margin-left: 15px;
+            // margin-left: 15px;
             width: 100%;
             height: 100%;
             .PitchitemLeft {
diff --git a/ui/dasadmin/src/views/backend/node/utils.ts b/ui/dasadmin/src/views/backend/node/utils.ts
index e6debe1e..e6ccdeac 100644
--- a/ui/dasadmin/src/views/backend/node/utils.ts
+++ b/ui/dasadmin/src/views/backend/node/utils.ts
@@ -603,6 +603,8 @@ export const createUpLoadExcelData = (workbookData: any) => {
                 }
                 sheetData.params = JSON.stringify(params)
                 data.push(sheetData)
+                console.log(data);
+                
             }
         })
     })
@@ -622,10 +624,10 @@ export const createSheetData = (data: any, protocol: string | number) => {
         const result: any = {}
         data[item].forEach((obj: any, index: number) => {
             const params = obj.params && obj.params !== '' ? JSON.parse(obj.params) : {}
-            obj = { ...obj, ...params }
+            const newObj = { ...obj, ...params }
             const row = index + 1
             result[row] = {}
-            Object.keys(obj).forEach((field) => {
+            Object.keys(newObj).forEach((field) => {
                 const col = excelCellDataMap[field]
                 if (col) {
                     let custom: any
@@ -633,9 +635,9 @@ export const createSheetData = (data: any, protocol: string | number) => {
                         custom = {}
                         custom.type = item
                         custom.protocol = Number(protocol)
-                        custom.otherData = params
+                        custom.otherData = obj
                     }
-                    result[row][col] = { v: obj[field], s: '1', custom }
+                    result[row][col] = { v: newObj[field], s: '1', custom }
                 }
             })
         })