Merge remote-tracking branch 'origin/main'

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>

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:'',
+        model: '',
-        madeinFactory:''
+        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 {