liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827

Browse Source
This commit is contained in:
liub
2026-03-05 10:08:08 +08:00
parent c1c7d4491b 2db6ac47b7
commit 2f9d13153d
5 changed files with 222 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pages/common/index/index.vue
View File

@ -40,15 +40,15 @@
<view class="device-name">
<view>设备:{{item.deviceName}}</view>
<view class="ID">
<view class="ID" v-if="item.communicationMode==0">ID:{{item.deviceImei}}
<view class="ID" v-if="item.communicationMode==0 || item.communicationMode==2">ID:{{item.deviceImei}}
</view>
<view class="ID" v-else>ID:{{item.deviceMac}}</view>
<!-- 在线状态 -->
<view class="onlines"
v-if="item.communicationMode==0 && item.onlineStatus==1">在线</view>
v-if="item.onlineStatus==1">在线</view>
<!-- 离线状态 -->
<view class="offlines"
v-if="item.communicationMode==0 && item.onlineStatus==0">离线</view>
v-if="item.onlineStatus==0">离线</view>
<view>电量：{{item.battery || '0'}}%</view>
</view>
</view>
@ -386,7 +386,7 @@ import BleReceive from '@/utils/BleReceive';
if (res.code == 200) {
//console.log("deviceTypeList=" + JSON.stringify(res.data));
this.tabs = [{
id: '',
id: '',
name: '全部设备',
typeName: '全部设备'
},
@ -405,9 +405,6 @@ import BleReceive from '@/utils/BleReceive';
this.deviceList = [];
this.activeTab = index;
this.activeTabInfo = tab
this.downCallback();
},
// 获取设备列表

4
pages/common/shareDevices/index.vue
View File

@ -216,7 +216,7 @@
const res = await deviceShareAdd({
phonenumber: this.phone,
smsCode: this.code,
deviceId: this.itemInfo.id,
deviceId: this.itemInfo.id || this.itemInfo.deviceId,
permission: selectedPermissions.join(',')
})
@ -250,8 +250,8 @@
const eventChannel = this.getOpenerEventChannel();
// 监听 'shareDevice' 事件，获取传过来的数据
eventChannel.on('shareDevice', (data) => {
console.log(data, 'data1t111');
this.itemInfo = data.data;
console.log(this.itemInfo,'this.itemInfo');
this.permissions=Common.getPermissions(this.itemInfo.persissonType);
console.log(this.itemInfo.persissonType,'this.itemInfo.persissonType');
})

13
pages/common/shareManagement/index.vue
View File

@ -86,7 +86,9 @@
},
getData(val) {
let data = {
deviceId: val
deviceId: val,
pageNum: 1,
pageSize: 500
}
deviceShareList(data).then((res) => {
if (res.code == 200) {
@ -117,7 +119,7 @@
eventChannel.on('shareManagement', (data) => {
console.log(data, 'data1t111');
this.itemInfo = data.data;
this.getData(this.itemInfo.id)
this.getData(this.itemInfo.id ||this.itemInfo.deviceId)
})
}
}
@ -179,12 +181,13 @@
border-radius: 32px;
background: rgba(255, 200, 78, 0.06);
display: inline-block;
width: 152rpx;
height: 60rpx;
width: 100rpx;
height: 50rpx;
text-align: center;
line-height: 60rpx;
line-height: 50rpx;
color: rgba(224, 52, 52, 1);
cursor: pointer;
margin-top: 30rpx;
}
.IMG {