From 8d2a8f1c9d83ed194125862633bcce389e6aede7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 6 Dec 2024 10:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E9=A3=8E=E6=9C=BA=EF=BC=9A=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E9=A2=84=E8=A7=88=E9=A1=B5=E7=A0=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E8=AE=BE=E5=A4=87=EF=BC=9A=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=87=8F=E6=B5=8B=E5=BD=93=E6=9E=9A=E4=B8=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E9=94=99=E5=8F=96=E6=B6=88=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/WindBlower/overview.vue |  2 +-
 .../equipmentManagement/measurement.vue       | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/WindBlower/overview.vue b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
index 3d457c46..b1c15fa9 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/overview.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/overview.vue
@@ -21,7 +21,7 @@
                 :total="pageSetting.total"
                 :page-sizes="pageSetting.pageSizes"
                 background
-                :pager-count="7"
+                :pager-count="4"
                 layout="prev, pager, next, jumper,sizes,total"
                 @size-change="sizeChangePage"
             ></el-pagination>
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
index 0f31f27b..df8e6e37 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
@@ -85,25 +85,31 @@ import { reactive, ref, watch, onMounted } from 'vue'
 import { ElMessage, FormInstance, dayjs } from 'element-plus'
 import type { ModelAttributeFieldsEnums, GetModelAttributeType } from '/@/views/backend/auth/model/type'
 import { ModelAttributeType } from '/@/views/backend/auth/model/type'
-import { getModelAttributeListReq, getRealValueListReq } from '/@/api/backend/deviceModel/request'
+import { getModelAttributeListReq, getRealValueListReq, getRealValueRangeReq, queryfaultCodeDict } from '/@/api/backend/deviceModel/request'
 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'
+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;model:string;madeinFactory:string }>(),
+    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:''
+        model: '',
+        madeinFactory: '',
     }
 )
 
@@ -214,7 +220,7 @@ const getMalfunctionEnums = () => {
     queryfaultCodeDict({ madeinfactory: props.madeinFactory, model: props.model }).then((res) => {
         if (res.code == 200) {
             const data: any = {}
-            res.data.forEach((item: any) => {                
+            res.data.forEach((item: any) => {
                 data[item.code] = item.description
             })
             malFunctionEnums = data
@@ -222,7 +228,6 @@ const getMalfunctionEnums = () => {
     })
 }
 
-
 const getCompleteData = () => {
     getAttributeList()
         .then(({ data, codeList }: any) => {
@@ -236,7 +241,7 @@ const getCompleteData = () => {
                 if (enumStore.keys.includes(item.attributeCode)) {
                     realValItem = enumStore.data[item.attributeCode][realValItem]
                 }
-                if(malFunctionKeys.includes(item.attributeCode)){
+                if (malFunctionKeys.includes(item.attributeCode)) {
                     realValItem = malFunctionEnums?.[realValItem] ?? realValItem
                 }
                 return {