heart ok

common/mixin.js

@@ -43,8 +43,7 @@ const blueToothMixin = {
 	data() {
 		return {
 			startMeasureText: '开始测量',
-			pageLoaded: false,
-			pageLoadText: '页面加载中',
+			pageLoadText: '',
 			form: {
 				// 回显详情
 				'engineeringName': '',
@@ -189,8 +188,6 @@ const blueToothMixin = {
 			this.setNavBarTitle('正在连接 ')
 			commonStateCodeDeal(2, `startLink=>正在创建连接蓝牙设备`)
 			try {
-
-				
 				// const result4close = await blueToother.closeBLEConnection(this.deviceId)
 
 				const result = await blueToother.createBLEConnection(storager.get('deviceInfo').deviceId)
@@ -418,14 +415,14 @@ const blueToothMixin = {
 							});
 							return
 						}
-						if(recStr.indexOf('HEART') > -1){ // 处理掉测量深度对象值后面拼接的HEART字符串
+						if(recStr.indexOf('HEART_OK') > -1){ // 处理掉测量深度对象值粘包后拼接的HEART字符串
+							return
+						}
+						if(recStr.indexOf('HEART') > -1){ // 处理掉测量深度对象值粘包后拼接的HEART字符串
 							recStr = recStr.split('HEART')[0]
 						}
 						// 设置测试值：
 						const recBlueResData = JSON.parse(recStr)
-						console.log('设备检测值', recBlueResData)
-						
-						console.info('获取小球id和电量', recBlueResData)
 						// console.log('设备检测值：', recBlueResData.angle)
 						if(recBlueResData.power1){
 							this.$store.commit('setPower', {
@@ -469,11 +466,7 @@ const blueToothMixin = {
 
 
 		},
-		resetForm() {
-			for (let key in this.form) {
-				this.form[key] = ''
-			}
-		},
+
 		async gosend(text) {
 			var that = this;
 			if (text === 'START') {

common/util.js

@@ -40,6 +40,7 @@ var commonStateCodeDeal = async (code, msg, contextThis) => {
 				tipContent: '未初始化蓝牙适配器',
 			})
 		}
+		popuper.hideLoading()
 	} else if (code === 10001) { // 当前蓝牙适配器不可用（手机没开启蓝牙）
 		contextThis.setConnected(false)
 		contextThis.unlinkModalShow({
@@ -48,63 +49,75 @@ var commonStateCodeDeal = async (code, msg, contextThis) => {
 				contextThis.initLink()
 			}
 		})
+		popuper.hideLoading()
 	} else if (code === 10002) {
 		// showCustomToast({
 		// 	title: '没有找到指定设备'
 		// })
 		contextThis.setConnected(false)
 		contextThis.setNavBarTitle('没有找到指定设备-10002')
+		popuper.hideLoading()
 	} else if (code === 10003) {
 		// showCustomToast({
 		// 	title: '连接失败'
 		// })
 		contextThis.setNavBarTitle('连接失败-10003【请检查蓝牙是否正确连接】')
+		popuper.hideLoading()
 	} else if (code === 10004) {
 		// showCustomToast({
 		// 	title: '没有找到指定服务'
 		// })
 		contextThis.setConnected(false)
 		contextThis.setNavBarTitle('没有找到指定服务-10004【请检查蓝牙是否正确连接】')
+		popuper.hideLoading()
 	} else if (code === 10005) {
 		// showCustomToast({
 		// 	title: '没有找到指定特征值'
 		// })
 		contextThis.setNavBarTitle('没有找到指定特征值-10005【请检查蓝牙是否正确连接】')
+		popuper.hideLoading()
 	} else if (code === 10006) {
 		// showCustomToast({
 		// 	title: '当前连接已断开'
 		// })
 		contextThis.setConnected(false)
 		contextThis.setNavBarTitle('当前连接已断开-10006')
+		popuper.hideLoading()
 	} else if (code === 10007) {
 		// showCustomToast({
 		// 	title: '当前特征值不支持此操作'
 		// })
 		contextThis.setConnected(false)
 		contextThis.setNavBarTitle('当前特征值不支持此操作-10007【请检查蓝牙是否正确连接】')
+		popuper.hideLoading()
 	} else if (code === 10008) {
 		// showCustomToast({
 		// 	title: '当前特征值不支持此操作'
 		// })
 		contextThis.setNavBarTitle('其余所有系统上报的异常-10008【请检查蓝牙是否正确连接】')
+		popuper.hideLoading()
 	} else if (code === 10009) {
 		// showCustomToast({
 		// 	title: 'Android系统版本低于4.3 不支持BLE'
 		// })
 		contextThis.setConnected(false)
 		contextThis.setNavBarTitle('Android系统版本低于4.3 不支持BLE-10009')
+		popuper.hideLoading()
 	} else if (code === 10012) {
 		// contextThis.unlinkModalShow({
 		// 	tipContent: '蓝牙连接超时，请尝试重新连接',
 		// })
 		contextThis.setNavBarTitle('蓝牙连接超时，请尝试重新连接-10012【请检查蓝牙是否正确连接】')
+		popuper.hideLoading()
 	} else if (code === 10013) { // deviceId为空，重新选择蓝牙设备
 		// contextThis.unlinkModalShow({
 		// 	tipContent: 'deviceId 为空，请确认设备是否正确连接',
 		// })
 		contextThis.setConnected(false)
 		contextThis.setNavBarTitle('deviceId 为空，请确认设备是否正确连接-10013')
+		popuper.hideLoading()
 	} else if (code === -1) { // 蓝牙连接中再次重连，导致报错
+		popuper.hideLoading()
 		/**
 		 * 1、连接后断开蓝牙返回首页再次进入该页面，提醒开启蓝牙后，开启蓝牙后开始连接时产生的问题处理
 		 * 1-1该情况与未连接成功直接迅速推出然后进入进行连接操作的情况几乎一致，平台连接api报异常。
@@ -132,6 +145,7 @@ var commonStateCodeDeal = async (code, msg, contextThis) => {
 		// 	}
 		// })
 	}
+	
 	logError(code, msg)
 };
 

pages/home/blueMeasure.vue

@@ -2,9 +2,7 @@
 	<view class="pageWrapper">
 		<CustomNavbar :title="navBarTitle" goBackUrl="/pages/home/home" @gobackDeal="gobackDeal">
 		</CustomNavbar>
-
 		<view class="body-wrapper">
-			<!-- <button @click="gosend">获取电量{{ actualWaterLevel }}</button> -->
 			<view class="demo-uni-row">
 				<uni-row>
 					<uni-col :span="7" class="_title">
@@ -109,8 +107,6 @@
 				</uni-row>
 			</view>
 		</view>
-		
-
 		<view class="footer-wrapper" v-show="connected">
 			<view class="funcBtn end" @tap="resetForm">
 				取消
@@ -119,33 +115,11 @@
 				保存
 			</view>
 		</view>
-
-		<view class="" v-show="!connected" style="text-align: center; color: darkgray; margin-top:20rpx;">
-			{{ pageLoadText }}
-		</view>
-		<!-- <button @click="showResultModal">点击模态框显示</button> -->
-		<!-- <uni-popup ref="popup" background-color="#fff" @change="change">
-			<view class="popup-content" >
-				<view class="_header">
-					孔实测结果
-				</view>
-				<view class="_body">
-					<p>实测孔深： <span>{{form['actualDepth']|| '-'}}m</span></p>
-					<p>实测倾角： <span>{{form['actualWaterLevel']|| '-'}}°</span></p>
-				</view>
-				<view class="funcBtn _btn" @click="saveTestResult">
-					保存测量结果
-				</view>
-			</view>
-		</uni-popup> -->
 	</view>
 </template>
 
 <script>
 	import CustomNavbar from '@/pages/component/CustomNavbar.vue';
-	// import {
-	// 	blueToothMixin
-	// } from '../../common/mixin.js'
 	import {
 		stringToBytes,
 		getCurrentTime,
@@ -162,7 +136,6 @@
 	
 	import { mapState } from "vuex";
 	export default {
-		// mixins: [blueToothMixin],
 		components: {
 			CustomNavbar,
 		},
@@ -196,40 +169,25 @@
 		 */
 		onLoad: function(options) {
 			uni.hideLoading()
-			// this.dataList = uni.getStorageSync('importDataList') || []
-			// console.log('this.dataList',JSON.stringify(this.dataList));
+			this.resetForm()
 			this.getDictInfo()
-			this.getSelectListLv1()
-
-			// this.initLink()
 		},
 		computed:{
 			...mapState(['actualDepth', 'actualWaterLevel'])
 		},
 		methods: {
+			resetForm() {
+				for (let key in this.form) {
+					this.form[key] = ''
+				}
+				this.$store.commit('setMeasureVal', { // 清空测量值
+					actualDepth: '',
+					actualWaterLevel: ''
+				})
+			},
 			gobackDeal(){
 				pager.relaunchTo('/pages/home/home')
 			},
-			gosend(){
-				var strbuf = new Uint8Array(stringToBytes('POWER'));
-				var buffer1 = strbuf.buffer;
-				setTimeout(()=>{
-					uni.writeBLECharacteristicValue({
-						deviceId: 'C8:47:80:52:93:A2',
-						serviceId: '0000FFE0-0000-1000-8000-00805F9B34FB',
-						characteristicId:'0000FFE1-0000-1000-8000-00805F9B34FB',
-						value: buffer1,
-						success: (res) => {
-							console.log('writeBLECharacteristicValue-success:res=>', res)
-						},
-						fail: (res) => {
-							console.log('writeBLECharacteristicValue-fail:res=>', res)
-							// commonStateCodeDeal(res.errCode || res, 'gosend -> writeBLECharacteristicValue',
-								// this)
-						},
-					});
-				}, 1000)
-			},
 			async getDictInfo() {
 				let res = await getDict({
 					type: 'zhuangyao_type'
@@ -241,6 +199,8 @@
 							value: item.dictValue
 						}
 					})
+					
+					this.getSelectListLv1() // 获取以及下拉列表
 				}
 			},
 			changeLvCommonReset(lvNum) { // 下拉列表值改变，清空级联数据公共方法
@@ -248,15 +208,14 @@
 				let newDataListSelectArr = []
 
 				let formFieldArr = [
-					'productName', 'artilleryAreaName', 'cannonHoleArrayNum', 'cannonHoleNum',
-					'status', 'expectedDepth',
-					'actualDepth', 'actualWaterLevel'
+					'productName', 'artilleryAreaName', 'cannonHoleArrayNum',
+					'cannonHoleNum', 'status',
 				]
 
 
 				let dataListSelectArr = [
 					'selectListLv1', 'selectListLv2', 'selectListLv3',
-					'selectListLv4', 'selectListLv5'
+					'selectListLv4', 'zhuangyaoDict'
 				]
 
 				// [1, 2, 3, 4, 5];  lvNum:2  => [3, 4, 5]
@@ -271,16 +230,6 @@
 
 			},
 			async getSelectListLv1() {
-				// const dataArr = JSON.parse(JSON.stringify(this.dataList))
-				// // 获取第一个数据列表
-				// this.selectListLv1 = getCascadeList(dataArr, {
-				// 	productName: null
-				// }).map((item) => {
-				// 	return {
-				// 		text: item.productName,
-				// 		value: item.productName
-				// 	}
-				// })
 				const res = await getSelectList({
 					productName: '',
 					artilleryAreaName: '',
@@ -304,16 +253,6 @@
 			},
 
 			async getSelectListLv2(prevLvVal) {
-				// const dataArr = JSON.parse(JSON.stringify(this.dataList))
-				// this.selectListLv2 = getCascadeList(dataArr, {
-				// 	productName: prevLvVal,
-				// }).map((item) => {
-				// 	return {
-				// 		text: item.artilleryAreaName,
-				// 		value: item.artilleryAreaName
-				// 	}
-				// })
-				// //console.log('this.selectListLv2', this.selectListLv2)
 				const res = await getSelectList({
 					productName: prevLvVal,
 					artilleryAreaName: '',
@@ -336,16 +275,6 @@
 			},
 
 			async getSelectListLv3(prevLvVal) {
-				// const dataArr = JSON.parse(JSON.stringify(this.dataList))
-				// this.selectListLv3 = getCascadeList(dataArr, {
-				// 	productName: this.form.productName,
-				// 	artilleryAreaName: prevLvVal
-				// }).map((item) => {
-				// 	return {
-				// 		text: item.cannonHoleArrayNum,
-				// 		value: item.cannonHoleArrayNum
-				// 	}
-				// })
 				const res = await getSelectList({
 					productName: this.form.productName,
 					artilleryAreaName: prevLvVal,
@@ -367,17 +296,6 @@
 			},
 
 			async getSelectListLv4(prevLvVal) {
-				// const dataArr = JSON.parse(JSON.stringify(this.dataList))
-				// this.selectListLv4 = getCascadeList(dataArr, {
-				// 	productName: this.form.productName,
-				// 	artilleryAreaName: this.form.artilleryAreaName,
-				// 	cannonHoleArrayNum: prevLvVal
-				// }).map((item) => {
-				// 	return {
-				// 		text: item.cannonHoleNum,
-				// 		value: item.cannonHoleNum
-				// 	}
-				// })
 				const res = await getSelectList({
 					productName: this.form.productName,
 					artilleryAreaName: this.form.artilleryAreaName,
@@ -399,24 +317,6 @@
 				this.getDetailInfo(e)
 			},
 
-			// getSelectListLv5(prevLvVal) {
-			// 	const dataArr = JSON.parse(JSON.stringify(this.dataList))
-			// 	this.selectListLv5 = getCascadeList(dataArr, {
-			// 		productName: this.form.productName,
-			// 		artilleryAreaName: this.form.artilleryAreaName,
-			// 		cannonHoleArrayNum: this.form.cannonHoleArrayNum,
-			// 		cannonHoleNum: prevLvVal,
-			// 	}).map((item) => {
-			// 		return {
-			// 			text: item.boreholeNumber,
-			// 			value: item.boreholeNumber
-			// 		}
-			// 	})
-			// },
-			// changeLv5(e) {
-			// 	//console.log("e:", e);
-			// 	this.getDetailInfo(e)
-			// },
 			async getDetailInfo(prevLvVal) {
 				let res = await getDetailInfo({
 					productName: this.form.productName,
@@ -426,6 +326,10 @@
 				})
 				if (res) {
 					this.form['expectedDepth'] = res['expectedDepth']
+					this.$store.commit('setMeasureVal', {
+						actualDepth: res['actualDepth'],
+						actualWaterLevel: res['actualWaterLevel']
+					})
 					return
 				}
 				showCustomToast({
@@ -435,7 +339,7 @@
 			async saveData() { // 保存当前表单数据到本地
 				let formFieldArr = [
 					'productName', 'artilleryAreaName', 'cannonHoleArrayNum',
-					'cannonHoleNum', 'boreholeNumber'
+					'cannonHoleNum', 'expectedDepth'
 				]
 				var validFlag = true
 				for (var i = 0; i < formFieldArr.length; i++) {
@@ -451,92 +355,30 @@
 					})
 					return
 				}
-				// const index = this.dataList.findIndex((item) => {
-				// 	return item.productName === this.form.productName &&
-				// 		item.artilleryAreaName === this.form.artilleryAreaName &&
-				// 		item.cannonHoleArrayNum === this.form.cannonHoleArrayNum &&
-				// 		item.cannonHoleNum === this.form.cannonHoleNum &&
-				// 		item.boreholeNumber === this.form.boreholeNumber
-				// })
-				if (this.form.measureDepth && this.form.shuiwei) {
+				
+				if(!this.actualDepth || !this.actualWaterLevel){
+					showCustomModal({
+						content: `孔深水位不能为空`
+					})
+					return
+				}
+				
+				this.form['actualDepth'] = this.actualDepth
+				this.form['actualWaterLevel'] = this.actualWaterLevel
+				
 
 					let res = await saveData({
 						...this.form
 					})
-					// this.$set(this.dataList[index], 'actualWaterLevel', this.form.actualWaterLevel);
-					// this.$set(this.dataList[index], 'actualDepth', this.form.actualDepth);
-					// this.$set(this.dataList[index], 'remark', getCurrentTime());
-					// uni.setStorageSync('importDataList', JSON.parse(JSON.stringify(this.dataList)))
 					if (res) {
-						uni.showToast({
+						showCustomToast({
 							title: '保存成功',
-							icon: false
 						})
 						this.resetForm()
 					}
-					return
-				}
-				showCustomModal({
-					content: '孔深水位不能为空',
-				})
 			},
 		}
 	};
-
-	/**
-	 * 处理级联数据方法
-	 */
-	function getCascadeList(originArr = [], paramObj) {
-		let sonArr = new Array()
-		// let sonArr = new Set()
-
-
-		if (paramObj.artilleryAreaName && paramObj.productName && paramObj.cannonHoleArrayNum && paramObj
-			.cannonHoleNum) { // 返回第5级
-			const tempArr = originArr.filter((item) => {
-				return item.productName === paramObj.productName &&
-					item.artilleryAreaName === paramObj.artilleryAreaName &&
-					item.cannonHoleArrayNum === paramObj.cannonHoleArrayNum &&
-					item.cannonHoleNum === paramObj.cannonHoleNum
-			})
-			const uniqueArray = Array.from(new Map(tempArr.map(item => [item.boreholeNumber, item])).values());
-			return uniqueArray
-		}
-
-		if (paramObj.artilleryAreaName && paramObj.productName && paramObj.cannonHoleArrayNum) { // 返回第4级
-			const tempArr = originArr.filter((item) => {
-				return item.productName === paramObj.productName &&
-					item.artilleryAreaName === paramObj.artilleryAreaName &&
-					item.cannonHoleArrayNum === paramObj.cannonHoleArrayNum
-			})
-			const uniqueArray = Array.from(new Map(tempArr.map(item => [item.cannonHoleNum, item])).values());
-			return uniqueArray
-		}
-
-		if (paramObj.artilleryAreaName && paramObj.productName) { // 返回第三级
-			const tempArr = originArr.filter((item) => {
-				return item.productName === paramObj.productName &&
-					item.artilleryAreaName === paramObj.artilleryAreaName
-			})
-			const uniqueArray = Array.from(new Map(tempArr.map(item => [item.cannonHoleArrayNum, item])).values());
-			return uniqueArray
-		}
-
-
-		if (paramObj.productName) { // 返回2级列表
-			const tempArr = originArr.filter((item) => { // 二级列表基于1级选择后的值进行过滤
-				return item.productName === paramObj.productName
-			})
-			const uniqueArray = Array.from(new Map(tempArr.map(item => [item.artilleryAreaName, item])).values());
-			return uniqueArray
-		}
-
-
-		if (!paramObj.productName) { // 返回1级列表
-			const uniqueArray = Array.from(new Map(originArr.map(item => [item.productName, item])).values());
-			return uniqueArray
-		}
-	}
 </script>
 
 <style lang="scss">

pages/home/blueSearch.vue

@@ -29,6 +29,14 @@
 </template>
 
 <script>
+	import {
+		showCustomModal,
+		showCustomToast,
+		commonStateCodeDeal,
+		popuper,
+		storager,
+		pager
+	} from "../../common/util.js"
 	import CustomNavbar from '@/pages/component/CustomNavbar.vue';
 	import {
 		blueToothMixin
@@ -173,7 +181,9 @@
 			},
 
 			goto_Comm(e) {
-			
+				popuper.showLoading({
+					title: '设备连接中...'
+				})
 				// this.$globalData.ble_device = e.currentTarget.dataset;
 				const deviceInfo = e.currentTarget.dataset
 				this.deviceId = deviceInfo.deviceId

pages/home/home.vue

@@ -19,15 +19,15 @@
 					<div class="top">
 						<h2>设备电量</h2>
 						<p>
-							小球 <image src="/static/image/paokong/qiu-dl.png">{{ power1 }} %
-							仪器 <image src="/static/image/paokong/shebei-dl.png">{{ power2 }} %
+							小球 <image src="/static/image/paokong/qiu-dl.png">{{ power1 || '-' }} %
+							仪器 <image src="/static/image/paokong/shebei-dl.png">{{ power2 || '-' }} %
 						</p>
 					</div>
 					<div class="bottom">
 						<h2>设备参数</h2>
 						<p>设备名称：露天炮孔验收仪</p>
 						<p>设备型号：MYSM-OH-01</p>
-						<p>设备ID：{{ qiuId }}</p>
+						<p>设备ID：{{ qiuId || '-' }}</p>
 					</div>
 					
 				</div>
@@ -302,6 +302,7 @@
 		gap: 20rpx;
 		background-color: linear-gradient(180deg, #007AFF 0%, #419AFF 16%, #EFF1F4 43%);
 		padding-top: 50rpx;
+		padding-bottom: 20rpx;
 	}
 
 	.logo-wrapper {

pages/user/login.vue

@@ -5,7 +5,7 @@
 				<image src='../../static/image/paokong/login-icon.png'></image>
 				<view class="title">露天炮孔验收仪</view>
 			</view>
-			<view class='content'>
+			<view class='content' v-if="!hasToken">
 				<view class="title">手机号</view>
 				<input class="uni-input" focus placeholder="请输入手机号" v-model="phone" />
 
@@ -58,9 +58,13 @@
 		},
 		data() {
 			return {
-				phone: ''
+				phone: '',
+				hasToken: false
 			}
 		},
+		mounted() {
+			this.hasToken = !!storager.get('token')
+		},
 		methods: {
 			async getPhoneNumber(e) {
 				popuper.showLoading()