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

细节优化

Browse Source
This commit is contained in:
kerwincui
2022-06-12 02:30:02 +08:00
parent 9cd08b74d1
commit 2b1b73abff
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.beginActiveTime != null and params.beginActiveTime != '' and params.endActiveTime != null and params.endActiveTime != ''"> and d.active_time between #{params.beginActiveTime} and #{params.endActiveTime}</if> <if test="params.beginActiveTime != null and params.beginActiveTime != '' and params.endActiveTime != null and params.endActiveTime != ''"> and d.active_time between #{params.beginActiveTime} and #{params.endActiveTime}</if>
</where> </where>
group by d.device_id,d.user_id group by d.device_id,d.user_id
order by d.create_time desc order by u.is_owner desc,d.create_time desc
</select> </select>
<select id="selectDeviceByDeviceId" parameterType="Long" resultMap="DeviceResult"> <select id="selectDeviceByDeviceId" parameterType="Long" resultMap="DeviceResult">

2
vue/src/views/iot/device/running-status.vue
View File

@@ -155,7 +155,7 @@
<mqtt-client ref="mqttClient" :publish="publish" :subscribes="subscribes" @callbackEvent="mqttCallback($event)" /> <mqtt-client ref="mqttClient" :publish="publish" :subscribes="subscribes" @callbackEvent="mqttCallback($event)" />
</el-col> </el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="14" :xl="14"> <el-col :xs="24" :sm="24" :md="24" :lg="14" :xl="14" v-if="deviceInfo.readOnlyList.length >0">
<el-row :gutter="20" style="background-color:#F5F7FA;padding:20px 20px 10px 10px;border-radius:15px;margin-right:5px;"> <el-row :gutter="20" style="background-color:#F5F7FA;padding:20px 20px 10px 10px;border-radius:15px;margin-right:5px;">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="8" v-for="(item,index) in deviceInfo.readOnlyList" :key="index"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="8" v-for="(item,index) in deviceInfo.readOnlyList" :key="index">
<el-card shadow="hover" style="border-radius:30px;margin-bottom:20px;"> <el-card shadow="hover" style="border-radius:30px;margin-bottom:20px;">

2
vue/src/views/system/role/index.vue
View File

@@ -123,7 +123,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1 && scope.row.roleId !== 1 && scope.row.roleId !== 1"> <template slot-scope="scope" v-if="scope.row.roleId !== 1 && scope.row.roleId !== 2 && scope.row.roleId !== 3">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"