Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev

pages/projectEnd/InspectionRoute/inspecteddetail.vue

@@ -12,15 +12,15 @@
 			<view class="coordinate">
 				<view class="coordinate-header">
 					<view>
-						<image src="@/static/ppt.png" mode=""></image>
+						<image src="@/static/inspecteIcon-normal.png" mode=""></image>
 						已巡检-正常
 					</view>
-					<view>
+					<view class="abnormal">
-						<image src="@/static/ppt.png" mode=""></image>
+						<image src="@/static/inspectelcon-abnormal.png" mode=""></image>
 						已巡检-异常
 					</view>
 					<view>
-						<image src="@/static/ppt.png" mode=""></image>
+						<image src="@/static/inspectelcon-not.png" mode=""></image>
 						未巡检
 					</view>
 				</view>
@@ -92,7 +92,7 @@
 				//获取我整改的巡查记录数量
 				this.sendRequest({
 					url: 'xmgl/checkingPoint/selectPage',
-					method: 'get',
+					method: 'post',
 					data: {
 						projectSn: this.projectSn,
 						xzCheckingRouteTaskId: this.info.xzCheckingRoute.id,
@@ -106,10 +106,10 @@
 			},
 			getcheckingInfo() {
 				let that = this;
-				//获取我整改的巡查记录数量
+				//获取我整改的巡查记录详情
 				this.sendRequest({
 					url: 'xmgl/checkingPointInfo/selectPage',
-					method: 'get',
+					method: 'post',
 					data: {
 						projectSn: this.projectSn,
 						xzCheckingRouteTaskId: this.info.xzCheckingRoute.id,
@@ -218,13 +218,18 @@
 				>view {
 					display: flex;
 					align-items: center;
-
 					>image {
 						width: 50rpx;
 						height: 60rpx;
 						margin-right: 8rpx;
 					}
 				}
+				.abnormal{
+					>image {
+						width: 60rpx !important;
+						height: 60rpx;
+					}
+				}
 			}
 
 			.coordinate-item {

pages/projectEnd/InspectionRoute/inspectedstay.vue

@@ -32,7 +32,7 @@
 					</view>
 					<view>
 						<text>巡检点情况:</text>
-						<text>10/15</text>
+						<text>10/{{item.checkingPointNum}}</text>
 					</view>
 				</view>
 				<view class="item-box">

pages/standardScheduleNews/auditDetail.vue

@@ -214,8 +214,9 @@
 		border-top: 2rpx solid #f0f0f0;
 		display: flex;
 		height: 200rpx;
-		line-height: 80rpx;
+		// line-height: 80rpx;
 		padding-top: 40rpx;
+		margin: 0 20rpx;
 
 		.inputFrom {
 			width: 80%;

pages/submit/submit.vue

@@ -1,10 +1,11 @@
 <template>
 	<view class="fullHeight">
-		<!-- <levitatedsphere :x="100" :y="80"></levitatedsphere> -->
+		<!-- <levitatedsphere id="levitatedsphere" :x="100" :y="80"></levitatedsphere> -->
 		<view>
 			<!-- :webview-styles="styles" -->
-			<web-view class="webView" :src="work_url"  :fullscreen="false"
+			<web-view class="webView" :src="work_url" :fullscreen="false" @onPostMessage="handlePostMessage">
-				@onPostMessage="handlePostMessage"></web-view>
+				
+			</web-view>
 		</view>
 		<footers class="footer" activeTab="submit"></footers>
 	</view>
@@ -20,7 +21,7 @@
 			return {
 				styles: {
 					height: '0',
-					screenHeight:''
+					screenHeight: '',
 				}
 			}
 		},
@@ -41,21 +42,36 @@
 					token: userInfo.token,
 					loginUser: userInfo
 				};
+				
 				setTimeout(function() {
+					console.log(JSON.stringify(currentWebview.children()[0]));
 					let wv = currentWebview.children()[0]
 					wv.setStyle({
 						top: 50,
 						height: ((this.screenHeight - 300)),
 						bottom: uni.upx2px(110)
 					})
+					// let query=uni.createSelectorQuery();
+					// let dom = query.select("#levitatedsphere");
+					// console.log(dom);
+					// currentWebview.appendChild(dom)
 					wv.evalJS(`${_funName}(${JSON.stringify(_data)})`);
+					console.log(1111111111,currentWebview);
 				}, 1000);
 			} catch (e) {
 				//TODO handle the exception
 			}
-
 		},
 		methods: {
+			handleLoad(data){
+				console.log(11111,data);
+				let query=uni.createSelectorQuery();
+				let dom = query.select("#levitatedsphere");
+				console.log(dom);
+				console.log(uni.createSelectorQuery().select("#app"));
+				console.log(document.body);
+				uni.createSelectorQuery().select("#app").appendChild(dom);
+			},
 			handlePostMessage(data) {
 				console.log(data);
 				uni.showToast({
@@ -73,9 +89,10 @@
 </style>
 
 <style lang="less" scoped>
-	.fullHeight{
+	.fullHeight {
 		height: 100vh
 	}
+
 	.webView {
 		width: 100vw;
 		height: 80vh;