018A初步完成
This commit is contained in:
@ -39,14 +39,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="warnnig" :class="formData.sta_ShakeBit!=0 ?'':'displayNone'">
|
||||
<view>{{formData.sta_ShakeBit==3?'设备疑似受到外力碰撞':'设备声光报警中'}}!</view>
|
||||
<view @click.stop="SOSToggle()">
|
||||
<uni-icons type="closeempty" color="#FFFFFFde" size="16"></uni-icons>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -119,8 +112,15 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="warnnig" :class="formData.sta_ShakeBit!=0 ?'':'displayNone'">
|
||||
<view>{{formData.sta_ShakeBit==3?'设备疑似受到外力碰撞':'设备声光报警中'}}!</view>
|
||||
<view @click.stop="SOSToggle()">
|
||||
<uni-icons type="closeempty" color="#FFFFFFde" size="16"></uni-icons>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<view class="lamp">
|
||||
<view class="title">
|
||||
<text>灯光亮度</text>
|
||||
@ -223,10 +223,7 @@
|
||||
<text class="lbl">职位:</text>
|
||||
<input class="value" v-model="formData.job" placeholder="请输入职位" placeholder-class="usrplace" />
|
||||
</view>
|
||||
<view class="item">
|
||||
<text class="lbl">ID号:</text>
|
||||
<input class="value" v-model="formData.usrid" placeholder="请输入ID" placeholder-class="usrplace" />
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -625,7 +622,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '确定',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
showCancel: false,
|
||||
showHeader: false,
|
||||
visibleClose: true,
|
||||
@ -1128,7 +1125,7 @@
|
||||
uni.chooseImage({
|
||||
count: 1,
|
||||
sizeType: ['original', 'compressed'],
|
||||
sourceType: ['album'],
|
||||
sourceType: ['album','camera'],
|
||||
success: function(res) {
|
||||
uni.navigateTo({
|
||||
url: "/pages/common/ImgCrop/ImgCrop",
|
||||
@ -1426,7 +1423,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '确定',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
showCancel: true,
|
||||
buttonCancelText: '取消',
|
||||
okCallback: send
|
||||
@ -1463,7 +1460,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '确定',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
showCancel: true,
|
||||
showHeader: true,
|
||||
visibleClose: false,
|
||||
@ -1522,9 +1519,7 @@
|
||||
}
|
||||
|
||||
|
||||
this.formData.textLines = [this.formData.company, this.formData.usrname, this.formData.job, this.formData
|
||||
.usrid
|
||||
];
|
||||
this.formData.textLines = [this.formData.company, this.formData.usrname, this.formData.job];
|
||||
console.log("data=", this.formData.textLines);
|
||||
showLoading(these, {
|
||||
text: "发送中"
|
||||
@ -1590,11 +1585,14 @@
|
||||
let sendPacket = () => {
|
||||
|
||||
if (combinedData.length === curr - 1) {
|
||||
holdHand('transmit complete', 200).then(res => {
|
||||
setTimeout(()=>{
|
||||
holdHand('transmit complete', 200).then(res => {
|
||||
MsgSuccess("人员信息发送成功", "确定", these);
|
||||
hideLoading(these);
|
||||
this.setBleFormData();
|
||||
});
|
||||
},300);
|
||||
|
||||
hideLoading();
|
||||
return;
|
||||
}
|
||||
@ -1608,7 +1606,7 @@
|
||||
curr++;
|
||||
console.log("发送成功", curr);
|
||||
updateLoading(these, {
|
||||
text: '发送中,' + (curr - 1) + '/' + 4
|
||||
text: '发送中,' + (curr - 1) + '/' + combinedData.length
|
||||
})
|
||||
setTimeout(sendPacket, 250);
|
||||
}).catch(err => {
|
||||
|
||||
Reference in New Issue
Block a user