diff --git a/.env.local b/.env.local index 5bdf058c..9f6a531f 100644 --- a/.env.local +++ b/.env.local @@ -8,8 +8,8 @@ VITE_DEV=true # 线上环境 # VITE_BASE_URL='https://besure.ngsk.tech:7001' # 本地联调 -VITE_BASE_URL='http://localhost:48081' -# VITE_BASE_URL='http://192.168.5.135:48081' +# VITE_BASE_URL='http://192.168.5.107:48081' +VITE_BASE_URL='http://192.168.5.131:48081' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 diff --git a/src/views/mes/energydevicecheck/index.vue b/src/views/mes/energydevicecheck/index.vue index 8900fe01..742e43b4 100644 --- a/src/views/mes/energydevicecheck/index.vue +++ b/src/views/mes/energydevicecheck/index.vue @@ -39,10 +39,14 @@ @@ -116,20 +120,18 @@ const queryParams = reactive({ const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 -const getOperationRuleRows = (row: EnergyDeviceDataRecordVO) => { - const map = row?.operationRulesVOMap - if (!map) return [] - const entries = Object.entries(map).filter(([k]) => !!k) - if (!entries.length) return [] - return entries.map(([name, value]) => ({ name, value: value ?? '-' })) +const getPointDetailsRows = (row: EnergyDeviceDataRecordVO) => { + const list = (row as any)?.pointDetails + if (!Array.isArray(list)) return [] + return list } const getRowClassName = ({ row }: { row: EnergyDeviceDataRecordVO }) => { - return getOperationRuleRows(row).length ? '' : 'row-no-expand' + return getPointDetailsRows(row).length ? '' : 'row-no-expand' } const handleRowClick = (row: EnergyDeviceDataRecordVO) => { - const rows = getOperationRuleRows(row) + const rows = getPointDetailsRows(row) if (!rows.length) return const key = row.id const idx = expandRowKeys.value.findIndex((k) => k === key)