export

api/home.js

@@ -2,7 +2,7 @@ import request from '@/common/request.js'
 
 export function getExportData(data) { // 获取下拉列表数据
   return request({
-    url: '/product/ryexport',
+    url: '/records/ryexport',
     method: 'get',
 	data
   })

common/mixin.js

@@ -410,6 +410,8 @@ const blueToothMixin = {
 						// console.log('设备检测值：', recBlueResData.angle)
 						this.form.realTestInclination = recBlueResData.angle
 						this.form.realTestHoleDepth = recBlueResData.lenth
+						commonStateCodeDeal(2, '监听到设备反馈信息'+JSON.stringify(recBlueResData))
+						
 						// this.form.realTestTime = getCurrentTime()
 
 					});

pages/home/home.vue

@@ -183,16 +183,22 @@
 					this.loading = false
 				
 					const fileName='炮孔测量数据导出'
-					const header = ['productName', 'artilleryAreaName', 'cannonHoleArrayNum', 'cannonHoleNum', 'expectedDepth',
-						'remark'
+					const header = ['productName', 'artilleryAreaName', 'cannonHoleArrayNum',
+					'cannonHoleNum', 'expectedDepth','remark',
+					'actualDepth', 'actualWaterLevel',
+					'afterActualDepth', 'afterActualWaterLevel',
 					];
 					const headerName = {
 						productName: '工程名称',
 						artilleryAreaName: '爆区名称',
 						cannonHoleArrayNum: '炮孔排号',
-						cannonHoleNum: '炮孔编号',
+						cannonHoleNum: '炮孔孔号',
 						expectedDepth: '设计孔深',
-						remark: '备注'
+						actualDepth: '实测孔深',
+						actualWaterLevel: '实测水深',
+						afterActualDepth: '装药后孔深',
+						afterActualWaterLevel: '装药后水深',
+						// remark: '备注'
 					};
 					
 					showCustomToast({
@@ -344,7 +350,7 @@
 		}
 		.left {
 			position: absolute;
-			left: 60rpx;
+			left: 30rpx;
 			top: 110rpx;
 			image {
 				width: 136rpx;
@@ -369,7 +375,7 @@
 
 		.right {
 			position: absolute;
-			right: 10rpx;
+			right: 40rpx;
 			top: 18rpx;
 			.top{
 				image{
@@ -384,7 +390,7 @@
 					font-size: 30rpx;
 					padding-bottom: 20rpx;
 					margin-bottom: 20rpx;
-					border-bottom: 4rpx solid #CCD1DB;
+					border-bottom: 2rpx solid #CCD1DB;
 				}
 				
 			}