yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !815 from puhui999/feature/iot

pull/815/MERGE
puhui999 2025-08-24 03:50:43 +00:00 committed by Gitee
parent 96a9154e52 30bbda805b
commit a779ebd04d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/iot/device/device/index.vue
View File

@ -212,7 +212,7 @@
<span
class="text-[#0b1d30] inline-block align-middle overflow-hidden text-ellipsis whitespace-nowrap max-w-[130px]"
>
{{ item.deviceName || '-' }}
{{ item.nickname || item.deviceName }}
</span>
</div>
</div>

6
src/views/iot/rule/data/rule/components/SourceConfigForm.vue
View File

@ -108,7 +108,7 @@
import { ProductApi } from '@/api/iot/product/product'
import { DeviceApi } from '@/api/iot/device/device'
import { ThingModelApi } from '@/api/iot/thingmodel'
import { IotDeviceMessageMethodEnum, IotThingModelTypeEnum } from '@/views/iot/utils/constants'
import { IotDeviceMessageMethodEnum, IoTThingModelTypeEnum } from '@/views/iot/utils/constants'
const formData = ref<any[]>([])
const productList = ref<any[]>([]) // 产品列表
@ -149,9 +149,9 @@ const getThingModelOptions = (row: any) => {
const thingModels: any[] = thingModelCache.value.get(row.productId) || []
let filteredModels: any[] = []
if (row.method === IotDeviceMessageMethodEnum.EVENT_POST.method) {
filteredModels = thingModels.filter((item: any) => item.type === IotThingModelTypeEnum.EVENT)
filteredModels = thingModels.filter((item: any) => item.type === IoTThingModelTypeEnum.EVENT)
} else if (row.method === IotDeviceMessageMethodEnum.PROPERTY_POST.method) {
filteredModels = thingModels.filter((item: any) => item.type === IotThingModelTypeEnum.PROPERTY)
filteredModels = thingModels.filter((item: any) => item.type === IoTThingModelTypeEnum.PROPERTY)
}
return filteredModels.map((item: any) => ({
label: `${item.name} (${item.identifier})`,