优化设备

pages/edit/edit.vue

@@ -9,53 +9,54 @@
 			<view class="facilityType">
 				<p>设备类型</p>
 				<view class="buttonOP" v-if="typeList">
-						<view class="item" @click="selectOne('type_sn',index,item)" :class="{selectType:index==selectTypeIndex}" v-for="(item,index) in typeList" :key="index">
-							<img :src="item.cover_url" alt="">
-							<span>{{item.name}}</span>
-						</view>
+					<view class="item" @click="selectOne('type_sn',index,item)"
+						:class="{selectType:index==selectTypeIndex}" v-for="(item,index) in typeList" :key="index">
+						<img :src="item.cover_url" alt="">
+						<span>{{item.name}}</span>
+					</view>
 				</view>
 			</view>
 			<view class="facilityType">
 				<p>探头</p>
 				<view class="buttonOP" v-if="typeList!=''">
-						<view class="item" @click="selectOne('detectors',index,item)" :class="{selectType:index==selectDetectorsIndexA}" v-for="(item,index) in typeList[selectTypeIndex].detectors"
-						:key="index">
-							<img :src="item.cover_url" alt="">
-							<span>{{item.detector_name}}</span>
-						</view>
+					<view class="item" @click="selectOne('detectors',index,item)"
+						:class="{selectType:index==selectDetectorsIndexA}"
+						v-for="(item,index) in typeList[selectTypeIndex].detectors" :key="index">
+						<img :src="item.cover_url" alt="">
+						<span>{{item.detector_name}}</span>
+					</view>
 				</view>
 			</view>
 			<!-- mode中的模式 -->
 			<view class="pattern">
-			<view class="facilityType"
-				v-if="typeList!=''&&typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.mode&&typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.mode.list">
-				<p>模式</p>
-				<view class="buttonOP">
-					<button @click="selectOne('mode',index,item)" :class="{selectType:index==selectModeIndexA}"
-						v-for="(item,index) in typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.mode.list">{{item.name}}</button>
+				<view class="facilityType"
+					v-if="typeList!=''&&typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.mode&&typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.mode.list">
+					<p>模式</p>
+					<view class="buttonOP">
+						<button @click="selectOne('mode',index,item)" :class="{selectType:index==selectModeIndexA}"
+							v-for="(item,index) in typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.mode.list">{{item.name}}</button>
+					</view>
 				</view>
-			</view>
-			<!-- power中的模式 -->
-			<view class="facilityType"
-				v-else-if="typeList!=''&&typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.power.list">
-				<p>模式</p>
-				<view class="buttonOP">
-					<button @click="selectOne('mode',index,item)" :class="{selectType:index==selectModeIndexA}"
-						v-for="(item,index) in typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.power.list">{{item.name}}</button>
-					<button style="margin-left: 100px; background-color: #374b5f;" @click="pqCLick">点击排气</button>
+				<!-- power中的模式 -->
+				<view class="facilityType"
+					v-else-if="typeList!=''&&typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.power.list">
+					<p>模式</p>
+					<view class="buttonOP">
+						<button @click="selectOne('mode',index,item)" :class="{selectType:index==selectModeIndexA}"
+							v-for="(item,index) in typeList[selectTypeIndex].detectors[selectDetectorsIndex].config.power.list">{{item.name}}</button>
+						<button style="margin-left: 100px; background-color: #374b5f;" @click="pqCLick">点击排气</button>
+					</view>
 				</view>
-			</view>
-			<view class="facilityType" v-else>
-				<p>强度</p>
-				<view class="buttonOPO">
-					<button @click="reduce">减少</button>
-					<view class="strength">
-						{{modeClass}}
-					</view><button @click="add">增加</button>
+				<view class="facilityType" v-else>
+					<p>强度</p>
+					<view class="buttonOPO">
+						<button @click="reduce">减少</button>
+						<view class="strength">
+							{{modeClass}}
+						</view><button @click="add">增加</button>
+					</view>
 				</view>
 			</view>
-			{{CODE}}
-			</view>
 		</view>
 		<view class="bottomBox">
 			<view class="back">
@@ -87,7 +88,6 @@
 				selectModeIndex: 0, //模式index
 				selectModeIndexA: 99, //模式index
 				TYPE_SN: 'ZK', //设备名称
-				CODE: 'AABB12343838373244363235444138020301010101', //设备码
 				PQCODE: "AABB12343838373244363235444138010101010101", //开始排气
 				PQCLOSECODE: "AABB12343838373244363235444138010201010101", //关闭排气
 				modeClass: 0, //强度等级
@@ -98,10 +98,9 @@
 				PAUSE: '00', //暂停
 				equipmentNum: '', //设备编号
 				modeNum: '01', //模式编号
-				CODE: '',
 				startTime: "", //开始时间
 				time: '00:00:00', //初始展示时间
-				timer: '', 
+				timer: '',
 				istimer: false, //是否暂停
 				hour: 0, //计时(时)
 				minutes: 0, //计时(分)
@@ -109,15 +108,15 @@
 			};
 		},
 		onLoad(options) {
-			console.log(options, 333333);
+			// console.log(options, 333333);
 			this.deviceId = options.deviceId
 			this.serviceId = options.serviceId
 			this.characteristicId = options.characteristicId
 			let typeList = uni.getStorageSync('typeList')
-			if(!typeList){
+			if (!typeList) {
 				// 获取设备列表
 				this.getTypeList()
-			}else{
+			} else {
 				this.typeList = typeList
 			}
 		},
@@ -126,19 +125,6 @@
 			blueError(code) {
 				switch (code) {
 					case 10000:
-						// uni.openBluetoothAdapter({
-						// 	success(res) {
-						// 		uni.showToast({
-						// 			title: '初始化成功,请重新启动',
-						// 			duration: 2500,
-						// 			icon: 'none'
-						// 		})
-						// 	},
-						// 	fail(err) {
-						// 		uni.hideLoading()
-						// 		console.log('初始化蓝牙失败')
-						// 	}
-						// })
 						this.errorToast('未初始化蓝牙适配器,请返回重新连接')
 						break
 					case 10001:
@@ -199,17 +185,15 @@
 				const {
 					data: res
 				} = await uni.$http.post('v2/api-device/device/type_list')
-				console.log(JSON.parse(JSON.stringify(res.data.list)), '获取的数据返回');
+				// console.log(JSON.parse(JSON.stringify(res.data.list)), '获取的数据返回');
 				// 筛选出无创水光
 				for (let key in res.data.list) {
-					if (res.data.list[key].id != 1&&res.data.list[key].id != 15) {
-						this.typeList.push(res.data.list[key])   
+					if (res.data.list[key].id != 1 && res.data.list[key].id != 15) {
+						this.typeList.push(res.data.list[key])
 					}
 				}
-				// this.typeList = res.data.list
+				// 将数据保存到本地
 				uni.setStorageSync('typeList', this.typeList)
-				// console.log(JSON.parse(JSON.stringify(this.typeList[0].detectors[1])), 333333);
-				// console.log(JSON.parse(JSON.stringify(this.typeList)), 333333);
 			},
 			// ------------------选择设备配置
 			selectOne(type, index, item) {
@@ -222,7 +206,7 @@
 						this.selectModeIndexA = 99
 						this.equipmentNum = '' //重置探头
 						this.modeNum = '' //重置模式或强度
-						console.log(item)
+						// console.log(item)
 						//赋值哪个厂家的设备
 						if (item.type_sn.includes('ZK')) {
 							this.TYPE_SN = 'ZK'
@@ -236,24 +220,19 @@
 						this.selectModeIndexA = 99
 						this.equipmentNum = Number(item.detector_sn).toString(16) < 10 ? '0' + Number(item.detector_sn)
 							.toString(16) : Number(item.detector_sn).toString(16) //设备探头编号(16进制)
-						console.log(this.equipmentNum)
-						console.log(JSON.parse(JSON.stringify(this.typeList[this.selectTypeIndex].detectors[this
-							.selectDetectorsIndex])))
-						this.minClass = this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config
-							.power.min //最小值
-						this.maxClass = this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config
-							.power.max //最大值
-						this.incrementClass = this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex]
-							.config.power.increment //增幅
-						this.modeClass = this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config
-							.power.default //默认值
+						// console.log(this.equipmentNum)
+						// console.log(item)
+						this.minClass = item.config.power.min //最小值
+						this.maxClass = item.config.power.max //最大值
+						this.incrementClass = item.config.power.increment //增幅
+						this.modeClass = item.config.power.default //默认值
 						break
 					case 'mode':
 						this.selectModeIndex = index
 						this.selectModeIndexA = index
 						this.modeNum = Number(item.value).toString(16) < 10 ? '0' + Number(item.value).toString(16) :
 							Number(item.value).toString(16)
-						console.log(this.modeNum)
+						// console.log(this.modeNum)
 						break
 				}
 			},
@@ -301,13 +280,14 @@
 			// ----------------------操作设备开启暂停结束
 			operate(type) {
 				// 强度编号
-				let	modeNum = Number(this.modeClass).toString(16) < 10 ? '0' + Number(this.modeClass).toString(16) :
-						Number(this.modeClass).toString(16)
+				let modeNum = Number(this.modeClass).toString(16) < 10 ? '0' + Number(this.modeClass).toString(16) :
+					Number(this.modeClass).toString(16)
 				// 设备模式编号
-				if (this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config.mode?.list||this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config.power?.list) {
+				if (this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config.mode?.list || this
+					.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config.power?.list) {
 					modeNum = this.modeNum
 				}
-				console.log(modeNum);
+				// console.log(modeNum);
 				// 蓝牙指令操作码
 				let code =
 					`AABB12343838373244363235444138${this.equipmentNum}03${type=='open'?this.START:this.PAUSE}${modeNum}0101`
@@ -322,13 +302,14 @@
 					})
 					return
 				}
-				if (this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config.mode?.list||this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config.power?.list) {
-					if(this.selectModeIndexA==99){						
-					uni.showToast({
-						title: '请选择模式',
-						icon: "none"
-					})
-					return
+				if (this.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config.mode?.list || this
+					.typeList[this.selectTypeIndex].detectors[this.selectDetectorsIndex].config.power?.list) {
+					if (this.selectModeIndexA == 99) {
+						uni.showToast({
+							title: '请选择模式',
+							icon: "none"
+						})
+						return
 					}
 				}
 				// 操作 开始 暂停 结束
@@ -364,7 +345,6 @@
 			// -------------------发送数据
 			send(newMsg, title = '执行成功') {
 				console.log(newMsg);
-				this.CODE = newMsg
 				wx.showLoading({
 					title: '正在启动',
 					mask: true
@@ -380,7 +360,7 @@
 						index++
 					}
 				}
-				console.log(that.deviceId, that.serviceId, that.characteristicId);
+				// console.log(that.deviceId, that.serviceId, that.characteristicId);
 				// return
 				uni.writeBLECharacteristicValue({
 					deviceId: that.deviceId, // 设备ID
@@ -425,7 +405,7 @@
 						} else {
 							that.finishTime()
 						}
-						console.log(res,'发送数据成功')
+						console.log(res, '发送数据成功')
 					},
 					fail(err) {
 						uni.hideLoading()
@@ -468,18 +448,22 @@
 		margin-left: 100px;
 		margin-top: 40px;
 		width: 85%;
-		.pattern{
+
+		.pattern {
 			display: flex;
 			overflow-x: scroll;
-			.facilityType{
+
+			.facilityType {
 				margin-right: 80px;
 			}
 		}
+
 		.buttonOP {
 			display: flex;
-			.item{
+
+			.item {
 				padding-right: 20px;
-				padding-left:6px;
+				padding-left: 6px;
 				height: 100px;
 				background-color: #b8b8b8;
 				margin-right: 20px;
@@ -488,13 +472,15 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				img{
+
+				img {
 					width: 90px;
 					height: 90px;
 					border-radius: 24px;
 					margin-right: 20px;
 				}
 			}
+
 			button {
 				flex-shrink: 0;
 				margin: 0;
@@ -506,7 +492,7 @@
 			.selectType {
 				background-color: #1e98d7;
 			}
-			
+
 		}
 
 		.buttonOPO {
@@ -575,4 +561,4 @@
 			}
 		}
 	}
-</style>
+</style>