导入登录跳转 测量详情获取

api/blueToothMeasure.js

@@ -9,8 +9,9 @@ export function getSelectList(data) { // 获取下拉列表数据
 }
 
 export function getDetailInfo(data) { // 获取下拉列表数据
+console.log('data', data)
   return request({
-    url: '/product/getList',
+    url: '/product/getExpectedDepth',
     method: 'get',
 	data
   })

pages/home/blueMeasure.vue

@@ -4,7 +4,7 @@
 		</CustomNavbar>
 
 		<view class="body-wrapper">
-			<button @click="gosend">获取电量</button>
+			<!-- <button @click="gosend">获取电量{{ actualWaterLevel }}</button> -->
 			<view class="demo-uni-row">
 				<uni-row>
 					<uni-col :span="7" class="_title">
@@ -85,6 +85,7 @@
 					</uni-col>
 				</uni-row>
 			</view>
+
 			<view class="only-read-row">
 				<uni-row class="demo-uni-row mb-10 demo-uni-row-unborder">
 					<uni-col :span="7" class="_title">
@@ -149,7 +150,8 @@
 		stringToBytes,
 		getCurrentTime,
 		showCustomToast,
-		showCustomModal
+		showCustomModal,
+		pager
 	} from '../../common/util.js'
 	import {
 		getSelectList,
@@ -157,6 +159,8 @@
 		saveData,
 		getDict
 	} from '../../api/blueToothMeasure.js'
+	
+	import { mapState } from "vuex";
 	export default {
 		// mixins: [blueToothMixin],
 		components: {
@@ -199,7 +203,13 @@
 
 			// this.initLink()
 		},
+		computed:{
+			...mapState(['actualWaterLevel'])
+		},
 		methods: {
+			gobackDeal(){
+				pager.relaunchTo('/pages/home/home')
+			},
 			gosend(){
 				var strbuf = new Uint8Array(stringToBytes('POWER'));
 				var buffer1 = strbuf.buffer;
@@ -407,12 +417,15 @@
 			// 	//console.log("e:", e);
 			// 	this.getDetailInfo(e)
 			// },
-			async getDetailInfo() {
-				let res = await getDetailInfo()
+			async getDetailInfo(prevLvVal) {
+				let res = await getDetailInfo({
+					productName: this.form.productName,
+					artilleryAreaName: this.form.artilleryAreaName,
+					cannonHoleArrayNum: this.form.cannonHoleArrayNum,
+					cannonHoleNum: prevLvVal
+				})
 				if (res) {
-					this.form['status'] = res['status']
 					this.form['expectedDepth'] = res['expectedDepth']
-					this.form['designInclination'] = res['designInclination']
 					return
 				}
 				showCustomToast({
@@ -626,37 +639,12 @@
 		}
 	}
 
-	// ._title {
-	// 	// border: 1px solid lightgray;
-	// 	height: 70rpx;
-	// 	text-align: center;
-	// 	line-height: 70rpx;
-	// 	margin-right: 10rpx;
-	// 	font-size: 32rpx;
-	// 	font-weight: bold;
-	// 	color: #000000;
-	// }
-
 	._content {
 		// border: 1px solid lightgray;
-		height: 70rpx;
-		line-height: 70rpx;
+		height: 110rpx;
+		line-height: 110rpx;
 		padding-left: 20rpx;
 		position: relative;
-
-		// &:after {
-		// 	content: 'm';
-		// 	width: 70rpx;
-		// 	height: 70rpx;
-		// 	// border-left: 1px solid lightgray;
-		// 	position: absolute;
-		// 	right: -12rpx;
-		// 	top: 0;
-		// 	text-align: center;
-		// 	line-height: 70rpx;
-		// 	font-size: 29rpx;
-		// 	color: #000000;
-		// }
 	}
 
 	.funcBtn {

pages/home/home.vue

@@ -5,7 +5,7 @@
 				<image class="logoImg" src="/static/image/home/logo.png" alt="" />
 				
 				<h3>露天炮孔验收仪</h3>
-				<button @click="gosend">获取电量</button>
+				<!-- <button @click="gosend">获取电量 {{ actualWaterLevel }}</button> -->
 			</view>
 			<view class="link-info-wrapper" @click="gosend('POWER')">
 				<image class="bg" src="../../static/image/paokong/home-title-bg.png" mode=""></image>
@@ -93,11 +93,14 @@
 		pager
 	} from "../../common/util.js"
 	import * as XLSX from '@/common/excel.js'
+	
 	import {
 		getExportData,
 	} from '../../api/home.js'
 	
 	import { BASEURL } from "../../common/config.js";
+	import { mapState } from "vuex";
+	console.log('mapState', mapState)
 
 	export default {
 		data() {
@@ -115,7 +118,7 @@
 			uni.hideLoading()
 		},
 		mounted() {
-			
+			console.log('this.$store.state.actualWaterLevel', this.$store.state.actualWaterLevel)
 			
 			
 			const deviceInfo = uni.getStorageSync('deviceInfo')
@@ -124,7 +127,9 @@
 			}
 			uni.hideTabBar()
 		},
-
+		computed:{
+			...mapState(['actualWaterLevel'])
+		},
 		methods: {
 			uploadExcel(){
 				wx.chooseMessageFile({
@@ -146,9 +151,7 @@
 									showCustomModal({
 										content: res.msg,
 										success: function() {
-											pager.navTo({ // 登录超时跳转登录页面
-												url: "/pages/user/login"
-											})
+											pager.navTo("/pages/user/login")
 										}
 									});
 									return
@@ -204,6 +207,10 @@
 				}
 			},
 			gosend() {
+				this.$store.commit('setMeasureVal', {
+					actualDepth: 'xxx', // 孔深
+					actualWaterLevel: '666' // 水深
+				})
 				var strbuf = new Uint8Array(stringToBytes('POWER'));
 				var buffer1 = strbuf.buffer;
 				setTimeout(() => {

store/index.js

@@ -10,63 +10,69 @@ import { createStore } from 'vuex'
 const store = createStore({
 // #endif
 	state: {
-		hasLogin: false,
-		isUniverifyLogin: false,
-		loginProvider: "",
-		openid: null,
-		testvuex: false,
-		colorIndex: 0,
-		colorList: ['#FF0000', '#00FF00', '#0000FF'],
-		noMatchLeftWindow: true,
-		active: 'componentPage',
-		leftWinActive: '/pages/component/view/view',
-		activeOpen: '',
-		menu: [],
-		univerifyErrorMsg: ''
+		// hasLogin: false,
+		// isUniverifyLogin: false,
+		// loginProvider: "",
+		// openid: null,
+		// testvuex: false,
+		// colorIndex: 0,
+		// colorList: ['#FF0000', '#00FF00', '#0000FF'],
+		// noMatchLeftWindow: true,
+		// active: 'componentPage',
+		// leftWinActive: '/pages/component/view/view',
+		// activeOpen: '',
+		// menu: [],
+		// univerifyErrorMsg: ''
+		actualDepth: '2222', // 孔深
+		actualWaterLevel: '111' // 水深
 	},
 	mutations: {
-		login(state, provider) {
-			state.hasLogin = true;
-			state.loginProvider = provider;
-		},
-		logout(state) {
-			state.hasLogin = false
-			state.openid = null
-		},
-		setOpenid(state, openid) {
-			state.openid = openid
-		},
-		setTestTrue(state) {
-			state.testvuex = true
-		},
-		setTestFalse(state) {
-			state.testvuex = false
-		},
-		setColorIndex(state, index) {
-			state.colorIndex = index
-		},
-		setMatchLeftWindow(state, matchLeftWindow) {
-			state.noMatchLeftWindow = !matchLeftWindow
-		},
-		setActive(state, tabPage) {
-			state.active = tabPage
-		},
-		setLeftWinActive(state, leftWinActive) {
-			state.leftWinActive = leftWinActive
-		},
-		setActiveOpen(state, activeOpen) {
-			state.activeOpen = activeOpen
-		},
-		setMenu(state, menu) {
-			state.menu = menu
-		},
-		setUniverifyLogin(state, payload) {
-			typeof payload !== 'boolean' ? payload = !!payload : '';
-			state.isUniverifyLogin = payload;
-		},
-		setUniverifyErrorMsg(state,payload = ''){
-			state.univerifyErrorMsg = payload
+		setMeasureVal(state, testRes){
+			state.actualDepth = testRes.actualDepth
+			state.actualWaterLevel = testRes.actualWaterLevel
 		}
+		// login(state, provider) {
+		// 	state.hasLogin = true;
+		// 	state.loginProvider = provider;
+		// },
+		// logout(state) {
+		// 	state.hasLogin = false
+		// 	state.openid = null
+		// },
+		// setOpenid(state, openid) {
+		// 	state.openid = openid
+		// },
+		// setTestTrue(state) {
+		// 	state.testvuex = true
+		// },
+		// setTestFalse(state) {
+		// 	state.testvuex = false
+		// },
+		// setColorIndex(state, index) {
+		// 	state.colorIndex = index
+		// },
+		// setMatchLeftWindow(state, matchLeftWindow) {
+		// 	state.noMatchLeftWindow = !matchLeftWindow
+		// },
+		// setActive(state, tabPage) {
+		// 	state.active = tabPage
+		// },
+		// setLeftWinActive(state, leftWinActive) {
+		// 	state.leftWinActive = leftWinActive
+		// },
+		// setActiveOpen(state, activeOpen) {
+		// 	state.activeOpen = activeOpen
+		// },
+		// setMenu(state, menu) {
+		// 	state.menu = menu
+		// },
+		// setUniverifyLogin(state, payload) {
+		// 	typeof payload !== 'boolean' ? payload = !!payload : '';
+		// 	state.isUniverifyLogin = payload;
+		// },
+		// setUniverifyErrorMsg(state,payload = ''){
+		// 	state.univerifyErrorMsg = payload
+		// }
 	},
 	getters: {
 		currentColor(state) {