code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

设备列表bug修复

Browse Source
This commit is contained in:
kerwincui
2022-06-09 13:28:29 +08:00
parent 5660a399b8
commit 87f7a6eb86
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
View File

@@ -189,10 +189,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.device_id, d.device_name, d.product_id, d.product_name, select d.device_id, d.device_name, d.product_id, d.product_name,
d.user_id, d.user_name, d.tenant_id, d.tenant_name, d.serial_number, d.user_id, d.user_name, d.tenant_id, d.tenant_name, d.serial_number,
d.firmware_version, d.status,d.rssi,d.is_shadow ,d.location_way, d.firmware_version, d.status,d.rssi,d.is_shadow ,d.location_way,
d.things_model_value, d.active_time,d.img_url,g.group_id,u.user_id d.things_model_value, d.active_time,d.img_url,u.user_id
from iot_device d from iot_device d
left join iot_device_user u on u.device_id = d.device_id left join iot_device_user u on u.device_id = d.device_id
left join iot_device_group g on g.device_id=d.device_id <if test="groupId != null and groupId !=0 "> left join iot_device_group g on g.device_id=d.device_id </if>
<where> <where>
<if test="groupId != null and groupId !=0 "> and g.group_id = #{groupId}</if> <if test="groupId != null and groupId !=0 "> and g.group_id = #{groupId}</if>
<if test="userId != null and userId != 0"> and u.user_id = #{userId}</if> <if test="userId != null and userId != 0"> and u.user_id = #{userId}</if>

1
vue/src/views/iot/product/product-alert.vue
View File

@@ -7,6 +7,7 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button> <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
</el-col> </el-col>
<el-tag type="danger" style="margin-left:15px;">该功能暂不可用,后面版本发布</el-tag>
</el-row> </el-row>
<el-table v-loading="loading" :data="alertList" @selection-change="handleSelectionChange" border size="mini"> <el-table v-loading="loading" :data="alertList" @selection-change="handleSelectionChange" border size="mini">