dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dyf:5c69e32c2d8c98e4ef50a538373f6b0ec5fd6603
Branches Tags
dyf:main
...
compare: dyf:8ccc37cb937b0d32b6bd5df6e04981079c33a8fb
Branches Tags
dyf:main

3 Commits
5c69e32c2d ... 8ccc37cb93

Author SHA1 Message Date
fengerli
8ccc37cb93 强跟泛光指令修改 2025-11-26 16:06:34 +08:00
fengerli
ebbac4232a Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-11-26 15:57:54 +08:00
fengerli
362b752087 6155添加强泛光指令 2025-11-26 15:57:52 +08:00
2 changed files with 32 additions and 34 deletions
Expand all files Collapse all files

38
pages/6155/deviceDetail.vue
View File

@ -108,15 +108,15 @@
<view class="item"> <view class="item">
<text class="lbl">单位：</text> <text class="lbl">单位：</text>
<input class="value" v-model="formData.textLines[0]" placeholder="请输入单位" placeholder-class="usrplace" /> <input class="value" v-model.trim="formData.textLines[0]" placeholder="请输入单位" placeholder-class="usrplace" />
</view> </view>
<view class="item"> <view class="item">
<text class="lbl">部门：</text> <text class="lbl">部门：</text>
<input class="value" v-model="formData.textLines[1]" placeholder="请输入姓名" placeholder-class="usrplace" /> <input class="value" v-model.trim="formData.textLines[1]" placeholder="请输入姓名" placeholder-class="usrplace" />
</view> </view>
<view class="item"> <view class="item">
<text class="lbl">姓名：</text> <text class="lbl">姓名：</text>
<input class="value" v-model="formData.textLines[2]" placeholder="请输入职位" placeholder-class="usrplace" /> <input class="value" v-model.trim="formData.textLines[2]" placeholder="请输入职位" placeholder-class="usrplace" />
</view> </view>
</view> </view>
@ -919,7 +919,7 @@
fail: (ex) => { fail: (ex) => {
updateLoading(these, { updateLoading(these, {
text: '视频文件上传失败了,请检查网络连接' text : '视频文件上传失败了,请检查网络连接'
}); });
reject(ex); reject(ex);
@ -1293,9 +1293,14 @@
case "fu": case "fu":
title = '辅灯模式'; title = '辅灯模式';
items = [{ items = [{
text: '泛光', text: '泛光',
icon: '/static/images/6155/DeviceDetail/fan.png' icon: '/static/images/6155/DeviceDetail/fan.png'
}]; },
{
text: '强+泛光',
icon: '/static/images/6155/DeviceDetail/fan.png'
},
];
break; break;
} }
@ -1330,29 +1335,22 @@
}, },
setMode(mode, type) { setMode(mode, type) {
let dataValue = 0; let dataValue = 0;
switch (mode) { switch (mode) {
case 0: case 0:
if (type == 'main') { if (type == 'main') {
dataValue = 0x01; dataValue = 0x01;
} else if (type == 'fu') { } else if (type == 'fu') {
dataValue = 0x04; dataValue = 0x04;
} }
break; break;
case 1: case 1:
dataValue = 0x02; if (type == 'main') {
dataValue = 0x02;
} else if (type == 'fu') {
dataValue = 0x0A; //强泛光
}
break; break;
// case 2:
// dataValue = 0x02;
// break;
case 2: case 2:
dataValue = 0x03; dataValue = 0x03;
break; break;
@ -1361,7 +1359,7 @@
break; break;
} }
// console.log("dataValue=", dataValue) console.log("dataValue=", dataValue)
// 构建数据包 // 构建数据包
var buffer = new ArrayBuffer(6); var buffer = new ArrayBuffer(6);
var dataView = new DataView(buffer); var dataView = new DataView(buffer);

2
pages/common/addBLE/addEquip.vue
View File

@ -419,7 +419,7 @@
console.log("缺少定位权限，已中止蓝牙扫描。"); console.log("缺少定位权限，已中止蓝牙扫描。");
return; return;
} }
// #endif
if (!ble) { if (!ble) {
ble = bleTool.getBleTool(); ble = bleTool.getBleTool();