sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
谷成伟 2024-12-06 11:03:33 +08:00
commit df8c900be7
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/dasadmin/src/views/backend/WindBlower/overview.vue
View File

@ -21,7 +21,7 @@
:total="pageSetting.total" :total="pageSetting.total"
:page-sizes="pageSetting.pageSizes" :page-sizes="pageSetting.pageSizes"
background background
:pager-count="7" :pager-count="4"
layout="prev, pager, next, jumper,sizes,total" layout="prev, pager, next, jumper,sizes,total"
@size-change="sizeChangePage" @size-change="sizeChangePage"
></el-pagination> ></el-pagination>

23
ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
View File

@ -85,25 +85,31 @@ import { reactive, ref, watch, onMounted } from 'vue'
import { ElMessage, FormInstance, dayjs } from 'element-plus' import { ElMessage, FormInstance, dayjs } from 'element-plus'
import type { ModelAttributeFieldsEnums, GetModelAttributeType } from '/@/views/backend/auth/model/type' import type { ModelAttributeFieldsEnums, GetModelAttributeType } from '/@/views/backend/auth/model/type'
import { ModelAttributeType } 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 * as echarts from 'echarts'
import { getRealValueRangeReq } from '/@/api/backend/deviceModel/request'
import { useEnumStore } from '/@/stores/enums' 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 enumStore = useEnumStore()
const props = withDefaults( 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: '', iotModelId: '',
deviceId: '', deviceId: '',
show: false, show: false,
autoUpdate: false, autoUpdate: false,
attributeType: 138, attributeType: 138,
model:'', model: '',
madeinFactory:'' madeinFactory: '',
} }
) )
@ -222,7 +228,6 @@ const getMalfunctionEnums = () => {
}) })
} }
const getCompleteData = () => { const getCompleteData = () => {
getAttributeList() getAttributeList()
.then(({ data, codeList }: any) => { .then(({ data, codeList }: any) => {
@ -236,7 +241,7 @@ const getCompleteData = () => {
if (enumStore.keys.includes(item.attributeCode)) { if (enumStore.keys.includes(item.attributeCode)) {
realValItem = enumStore.data[item.attributeCode][realValItem] realValItem = enumStore.data[item.attributeCode][realValItem]
} }
if(malFunctionKeys.includes(item.attributeCode)){ if (malFunctionKeys.includes(item.attributeCode)) {
realValItem = malFunctionEnums?.[realValItem] ?? realValItem realValItem = malFunctionEnums?.[realValItem] ?? realValItem
} }
return { return {