强跟泛光指令修改

pages/6155/deviceDetail.vue

@@ -108,15 +108,15 @@
 
 			<view class="item">
 				<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 class="item">
 				<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 class="item">
 				<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>
@@ -919,7 +919,7 @@
 							fail: (ex) => {
 
 								updateLoading(these, {
-									text: '视频文件上传失败了,请检查网络连接'
+									text  : '视频文件上传失败了,请检查网络连接'
 								});
 
 								reject(ex);
@@ -1295,7 +1295,12 @@
 						items = [{
 								text: '泛光',
 								icon: '/static/images/6155/DeviceDetail/fan.png'
-						}];
+							},
+							{
+								text: '强+泛光',
+								icon: '/static/images/6155/DeviceDetail/fan.png'
+							},
+						];
 						break;
 				}
 
@@ -1330,29 +1335,22 @@
 			},
 
 			setMode(mode, type) {
-
 				let dataValue = 0;
-
-
 				switch (mode) {
 					case 0:
-
-
 						if (type == 'main') {
-
 							dataValue = 0x01;
 						} else if (type == 'fu') {
-
 							dataValue = 0x04;
 						}
-
 						break;
 					case 1:
+						if (type == 'main') {
 							dataValue = 0x02;
+						} else if (type == 'fu') {
+							dataValue = 0x0A; //强泛光
+						}
 						break;
-						// case 2:
-						// 	dataValue = 0x02;
-						// 	break;
 					case 2:
 						dataValue = 0x03;
 						break;
@@ -1361,7 +1359,7 @@
 						break;
 
 				}
-				// console.log("dataValue=", dataValue)
+				console.log("dataValue=", dataValue)
 				// 构建数据包
 				var buffer = new ArrayBuffer(6);
 				var dataView = new DataView(buffer);

pages/common/addBLE/addEquip.vue

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