diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index 0757855..c76608e 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -14,10 +14,9 @@
-
-
-
+
报警
+ 位置
发送信息
@@ -28,6 +27,31 @@
+
-
- 未连接
-
- 在线
-
- 电量：90%
+
+ 已连接
+ 未连接
+
@@ -152,7 +179,7 @@
}
],
page: 1, // 当前页码
- size:10, // 每页条数
+ size: 10, // 每页条数
total: 0, // 总数据量
loading: false,
finished: false,
@@ -247,7 +274,7 @@
// }
// });
- uni.navigateTo({
+ uni.navigateTo({
url:"/pages/common/addBLE/addEquip"
})
break;
@@ -344,9 +371,8 @@
// communicationMode 0是4G 1是蓝牙
if (item.communicationMode == 0) {
uni.navigateTo({
- url: '/pages/6170/deviceControl/index'
- });
- return;
+ url: `/pages/6170/deviceControl/index?id=${item.id}`
+return;
}
if(item.typeName=='6155'){
@@ -403,15 +429,17 @@
/* justify-content: space-around; */
cursor: pointer;
margin-bottom: 40rpx;
- /* min-width: 100%; */
+ /* min-width: 100%; */
/* 最小宽度 */
}
.tab-item {
font-size: 28rpx;
- /* min-width: 120rpx; */
- padding: 0 30rpx; /* 左右内边距 */
- text-align: center; /* 文字居中 */
+ /* min-width: 120rpx; */
+ padding: 0 30rpx;
+ /* 左右内边距 */
+ text-align: center;
+ /* 文字居中 */
/* 设置最小宽度 */
}
@@ -429,45 +457,38 @@
margin-bottom: 30rpx;
font-size: 28rpx;
}
- .gprs{
- width:28rpx;
- height:35rpx;
+
+ .gprs {
+ width: 28rpx;
+ height: 35rpx;
position: absolute;
- left:50rpx
+ left: 50rpx
}
.Sendmessage {
margin-left: 50rpx;
- border: 1px solid rgba(187, 230, 0, 0.4);
- border-radius: 20px;
- padding: 7rpx 20rpx;
- color: rgba(187, 230, 0, 1);
+ color: rgba(255, 255, 255, 0.87);
}
- .callpolice{
- border: 1px solid rgba(224, 52, 52, 0.4);
- border-radius: 20px;
+
+ .callpolice {
color: rgba(224, 52, 52, 1);
- width: 150rpx;
- text-align: center;
- padding: 5rpx 10rpx;
}
/* 设备卡片 */
.device-card {
background-color: rgb(26, 26, 26);
border-radius: 16rpx;
- /* padding: 30rpx; */
margin-bottom: 20rpx;
- /* box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05); */
box-sizing: border-box;
position: relative;
}
- .device-header {
+ /* .device-header {
display: flex;
align-items: center;
margin-bottom: 15rpx;
padding: 30rpx 0 10rpx 30rpx;
+ width: 100%;
}
.device-name {
@@ -499,8 +520,8 @@
width: 8rpx;
height: 40rpx;
position: absolute;
- right: 40rpx;
- top: 80rpx;
+ right: 18rpx;
+ top: 65rpx;
}
.online {
@@ -520,11 +541,15 @@
.device-info {
display: flex;
- justify-content: space-evenly;
font-size: 28rpx;
color: rgba(255, 255, 255, 0.87);
position: relative;
- padding: 0rpx 0rpx 30rpx 30rpx;
+ width: 100%;
+ }
+ .device-flex{
+ display: flex;
+ justify-content: space-between;
+
}
.deviceIMG {
@@ -569,19 +594,123 @@
color: rgba(255, 255, 255, 0.6);
padding: 20rpx;
font-size: 22rpx;
- }
-
- .device-uplod {
- background-color: rgb(26, 26, 26);
- border-radius: 16rpx;
+ } */
+ .device-header {
+ display: flex;
align-items: center;
- text-align: center;
- height: 202rpx;
- line-height: 200rpx;
+ margin-bottom: 15rpx;
+ padding: 30rpx 0 10rpx 30rpx;
}
- .uni-swipe-action-item__options {
- transition: width 0.3s ease;
+ .unline {
+ color: rgba(255, 255, 255, 0.4);
+ }
+
+ .device-name {
+ font-size: 32rpx;
+ color: rgba(255, 255, 255, 0.87);
+ margin-left: 24rpx;
+ line-height: 50rpx;
+ width: 75%;
+ white-space: nowrap;
+ }
+
+ .ID {
+ color: rgba(255, 255, 255, 0.6);
+ font-size: 26rpx;
+ display: flex;
+ justify-content: space-between;
+ position: relative;
+
+ }
+
+ .device-status {
+ width: 122rpx;
+ height: 52rpx;
+ font-size: 26rpx;
+ border-radius: 0px 8px 0px 8px;
+ background-color: rgb(42, 42, 42);
+ position: absolute;
+ top: 0rpx;
+ right: 0rpx;
+ text-align: center;
+ line-height: 52rpx;
+ }
+
+ .circle {
+ width: 8rpx;
+ height: 40rpx;
+ position: absolute;
+ right: 25rpx;
+ top: 60rpx;
+ }
+
+ .online {
+ color: rgb(187, 230, 0);
+ }
+
+ .device-id {
+ font-size: 26rpx;
+ color: #999;
+ margin-bottom: 20rpx;
+ display: block;
+ }
+
+ .device-info {
+ display: flex;
+ justify-content: space-evenly;
+ font-size: 28rpx;
+ color: rgba(255, 255, 255, 0.87);
+ position: relative;
+ padding: 0rpx 0rpx 30rpx 30rpx;
+ }
+
+ .deviceIMG {
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 16rpx;
+ position: relative;
+ background-color: rgba(42, 42, 42, 0.6);
+ display: flex;
+ align-items: center;
+ }
+
+ .IMG {
+ width: 68rpx;
+ height: 50rpx;
+ margin-left: 17%;
+ }
+
+ .onlines {
+ position: relative;
+ }
+
+ .onlines::before {
+ content: '';
+ position: absolute;
+ width: 15rpx;
+ height: 15rpx;
+ background: rgb(0, 171, 103);
+ border-radius: 50%;
+ top: 20rpx;
+ left: -20rpx
+ }
+
+ .line {
+ width: 2rpx;
+ height: 24rpx;
+ background: linear-gradient(90deg,
+ rgba(0, 0, 0, 0) 0%,
+ rgb(255, 255, 255) 50%,
+ rgba(255, 255, 255, 0) 100%);
+ margin-top: 12rpx;
+ }
+
+ .loading-status {
+ text-align: center;
+ color: rgba(255, 255, 255, 0.6);
+ padding: 20rpx;
+ font-size: 22rpx;
}
/* 遮罩层 */