From deb2bbe87bc52ccba050e18d9d092eefc19b0015 Mon Sep 17 00:00:00 2001
From: xiaokangsix <2539509415@qq.com>
Date: Sun, 28 Apr 2024 15:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/footers/footers.vue                |  28 +-
 main.js                                       |   4 +-
 pages.json                                    |  20 +-
 .../dangerBigProject/addFinallyAcceptance.vue | 322 ++++++++++++++++++
 pages/projectEnd/dangerBigProject/details.vue |  19 +-
 .../dangerBigProject/finallyAcceptance.vue    |  37 ++
 pages/projectEnd/laborManage/index.vue        |   8 +-
 pages/projectEnd/ukashManage/materials.vue    |   1 +
 pages/projectEnd/ukashManage/ukashManage.vue  |   1 +
 .../visitorsManage/visitorsDetails.vue        |   2 +-
 .../visitorsManage/visitorsManage.vue         |   7 +-
 11 files changed, 423 insertions(+), 26 deletions(-)
 create mode 100644 pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue
 create mode 100644 pages/projectEnd/dangerBigProject/finallyAcceptance.vue

diff --git a/components/footers/footers.vue b/components/footers/footers.vue
index 0183603e..4518ab76 100644
--- a/components/footers/footers.vue
+++ b/components/footers/footers.vue
@@ -35,20 +35,20 @@
 					plugin: 'projectEnd',
 					appShow: 1
 				}, 
-				// {
-				// 	appName: '发起审批',
-				// 	moduleIcon2: 'submit-n',
-				// 	moduleIcon: 'submit',
-				// 	plugin: 'submit',
-				// 	appShow: 1
-				// }, 
-				// {
-				// 	appName: '工作台',
-				// 	moduleIcon2: 'workspace-n',
-				// 	moduleIcon: 'workspace',
-				// 	plugin: 'workspace',
-				// 	appShow: 1
-				// }, 
+				{
+					appName: '发起审批',
+					moduleIcon2: 'submit-n',
+					moduleIcon: 'submit',
+					plugin: 'submit',
+					appShow: 1
+				}, 
+				{
+					appName: '工作台',
+					moduleIcon2: 'workspace-n',
+					moduleIcon: 'workspace',
+					plugin: 'workspace',
+					appShow: 1
+				}, 
 				{
 					appName: '我的',
 					moduleIcon2: 'tabIcon-my2',
diff --git a/main.js b/main.js
index ccb8eb7f..af223756 100644
--- a/main.js
+++ b/main.js
@@ -38,8 +38,8 @@ if (process.env.NODE_ENV === 'development') {
   // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 线上地址
   // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
   // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
-  // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
-  Vue.prototype.url_config = 'http://192.168.34.155:19111/' //
+  Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
+  // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //
   // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址
   Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
   // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
diff --git a/pages.json b/pages.json
index b472c0d2..8fc70aec 100644
--- a/pages.json
+++ b/pages.json
@@ -1429,7 +1429,25 @@
 			"enablePullDownRefresh" : false
 		}
 	}
-  ],
+      ,{
+            "path" : "pages/projectEnd/dangerBigProject/finallyAcceptance",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/projectEnd/dangerBigProject/addFinallyAcceptance",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "下发验收任务",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
   // "subPackages":[{
   // 	"root": "carManage",
   // 	"pages": [{
diff --git a/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue b/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue
new file mode 100644
index 00000000..ecce4ae7
--- /dev/null
+++ b/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue
@@ -0,0 +1,322 @@
+<template>
+	<view class="addPlan">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				下发验收任务
+			</view>
+		</headers>
+<!-- 		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
+			<view class="plan-form">
+				<view class="form-item b-bottom">
+					<view class="form-lable"><text class="tag">*</text>验收部位</view>
+					<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入验收部位" />
+				</view>
+				<view class="form-item f-column b-bottom">
+					<view class="form-lable">施工情况</view>
+					 <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入施工情况" />
+					<view class="txt-length">{{textareaLengh}}/50</view>
+				</view>
+				<view class="form-item f-column">
+					<view class="form-lable">现场照片</view>
+					<view class="uni-form-input imgBox_wrap">
+						<view class="addImgBox" @click="uploadImg" v-show="formData.imgFileList.length == 0">
+							<image src="/static/safeMange/upload_image.png" class="icon-add" color="#F56C6C"></image>
+						</view>
+						<view class="imgBox" v-show="formData.imgFileList.length>0" v-for="(item,index) in formData.imgFileList" :key="index">
+							<image :src="url_config+'image/'+item.url" class="img"
+								@click="previewImage(url_config+'image/'+item.url)"></image>
+							<view @click="deleteImg(item,1)" class="deleteImg">
+								<image src="/static/safeMange/close_icon.png"></image>
+							</view>
+						</view>
+					</view> -->
+					<view class="uni-form-item b-bottom">
+						<view class="uni-form-label">
+							星期几
+						</view>
+						<view class="uni-form-input">
+							<picker @change="bindPickerChange" :value="selectIndex" :range="colorList">
+								<view class="uni-input uni-select cl" v-if="selectIndex==null">
+									请选择 <image class="icon-down" src="/static/icon-down-black.png" mode=""></image>
+								</view>
+								<view class="uni-input uni-select" v-else>{{colorList[selectIndex]}}
+									<image class="icon-down" src="/static/icon-down-black.png" mode=""></image>
+								</view>
+							</picker>
+						</view>
+					</view>
+				<!-- </view> -->
+				
+			<!-- 	
+			</view>
+		</view> -->
+		<view class="save-btn" @click="saveForm">保存</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				statusBarHeight: 0,
+				title: "新增旁站记录",
+				formData:{
+					sideStationAddr: "",
+					buildSituation: "",
+					imgFileList:[],
+					dangerousEngineeringId: ""
+				},
+				textareaLengh: 0,
+			}
+		},
+		onShow(){
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
+		},
+		onLoad(val){
+			this.formData.dangerousEngineeringId = val.id
+		},
+		methods:{
+			bindTextAreaBlur(e){
+				console.log(e)
+				this.formData.buildSituation = e.detail.value
+			},
+			bindInputBlur(e){
+				console.log(e)
+				this.formData.sideStationAddr = e.detail.value
+			},
+			uploadImg() {
+				var that = this
+				uni.chooseImage({
+					count: 5 - that.formData.imgFileList.length,
+					success(res) {
+						const tempFilePaths = res.tempFilePaths;
+						uni.uploadFile({
+							url: that.url_config + 'upload/image', //仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'files',
+							success: (uploadFileRes) => {
+								let data = {
+									name: JSON.parse(uploadFileRes.data).data[0].filename,
+									url: JSON.parse(uploadFileRes.data).data[0].imageUrl
+								};
+								that.formData.imgFileList.push(data)
+							}
+						});
+					}
+				})
+			},
+			//删除附件
+			deleteImg(val, type) {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定删除该附件吗?',
+					success: function(res) {
+						if (res.confirm) {
+							if (type == 1) {
+								let fileArr = JSON.parse(JSON.stringify(that.formData.imgFileList));
+								fileArr.forEach((item, index) => {
+									if (item.url == val.url) {
+										fileArr.splice(index, 1)
+									}
+								})
+								that.formData.imgFileList = fileArr;
+							} else if (type == 2) {
+								let fileArr = JSON.parse(JSON.stringify(that.videoFileList));
+								fileArr.forEach((item, index) => {
+									if (item.url == val.url) {
+										fileArr.splice(index, 1)
+									}
+								})
+								that.videoFileList = fileArr;
+							}
+			
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			
+			},
+			
+			//预览图片
+			previewImage(url) {
+				uni.previewImage({
+					urls: [url]
+				})
+			},
+			bindLength(e){
+				// console.log(e)
+				this.textareaLengh = e.detail.value.split('').length
+			},
+			saveForm(){
+				console.log(this.formData)
+				let data = {
+					sideStationAddr: this.formData.sideStationAddr,
+					buildSituation: this.formData.buildSituation,
+					dangerousEngineeringId: this.formData.dangerousEngineeringId,
+					createUser: JSON.parse(uni.getStorageSync('userInfo')).userId,
+				}
+				let arr = []
+				this.formData.imgFileList.forEach(item=>{
+					arr.push(item.url)
+				})
+				data.imageUrl = arr.join(',')
+				if(data.sideStationAddr == ""){
+					uni.showToast({
+					    title: '请输入验收部位！',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				console.log(data)
+				this.sendRequest({
+					url:'xmgl/dangerousEngineeringSideStation/add',
+					method:'post',
+					data: data,
+					success:res=>{
+						uni.hideLoading()
+						if(res.code==200){
+							uni.showToast({
+								title:'保存成功'
+							})
+							uni.navigateBack({})
+						}
+						console.log(res)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.addPlan{
+	min-height: 100%;
+	background: #F6F6F6;
+	.fixedheader{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 2;
+	}
+	.save-btn{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 96rpx;
+		background: #2b8df3;
+		color: #fff;
+		text-align: center;
+		line-height: 96rpx;
+	}
+	.imgBox_wrap {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 20rpx;
+		width: 100%;
+		min-height: 120rpx;
+	}
+	
+	.imgBox {
+		width: 120rpx;
+		height: 120rpx;
+		display: inline-flex;
+		position: relative;
+		margin-right: 30rpx;
+		margin-bottom: 16rpx;
+	
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 12rpx;
+		}
+	
+		.deleteImg {
+			position: absolute;
+			right: -12rpx;
+			top: -18rpx;
+			uni-image{
+				width: 20rpx;
+				height: 20rpx;
+			}
+		}
+	
+	}
+	
+	.addImgBox {
+		border: 1px solid rgba(42, 43, 91, 0.1);
+		background-color: #f6f5f8;
+		width: 120rpx;
+		height: 120rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 20rpx;
+		font-size: 24rpx;
+		margin-right: 12rpx;
+		uni-image{
+			width: 100%;
+			height: 100%;
+		}
+		// .icon-add {
+		// 	width: 36rpx;
+		// 	height: 36rpx;
+		// }
+	}
+	.b-bottom{
+		border-bottom: 1px solid #F6F6F6;
+	}
+	.f-column{
+		flex-direction: column;
+	}
+	.plan-form{
+		padding-top: 20rpx;
+		padding-bottom: 96rpx;
+		.form-item{
+			padding: 28rpx 24rpx;
+			display: flex;
+			justify-content: space-between;
+			background: #fff;
+			.form-lable{
+				white-space: nowrap;
+				.tag{
+					color: #DD524D;
+				}
+			}
+			.from-input{
+				text-align: right;
+			}
+		}
+		.txt-length{
+			color: #888;
+			text-align: right;
+			margin-top: 20rpx;
+			font-size: 14px;
+		}
+		.form-textarea{
+			margin-top: 30rpx;
+			width: 100%;
+			background: #F8F8F8;
+			border: 1px solid #f0f0f0;
+			height: 160rpx;
+			padding: 20rpx;
+			box-sizing: border-box;
+			// overflow: auto;
+			/deep/uni-textarea{
+				width: 100%;
+				height: 100%;
+				font-size: 28rpx;
+				.uni-textarea-compute{
+					width: 100%;
+					height: 100%;
+					overflow: auto;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue
index cda290ab..277317c4 100644
--- a/pages/projectEnd/dangerBigProject/details.vue
+++ b/pages/projectEnd/dangerBigProject/details.vue
@@ -63,6 +63,7 @@
 							<ordinaryAcceptance ref="list" v-if="componentName == 'ordinaryAcceptance'" :detailId="detailId" :info="detailData"></ordinaryAcceptance>
 							<engineeringData ref="list" v-if="componentName == 'engineeringData'" :detailId="detailId" :info="detailData"></engineeringData>
 							<verifyTableList ref="list" v-if="componentName == 'verifyTableList'" :detailId="detailId" :info="detailData"></verifyTableList>
+							<finally-acceptance  ref="list" v-if="componentName =='finallyAcceptance'" :detailId="detailId" :info="detailData" ></finally-acceptance>
 						</view>
 					</view>
 					<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) && COMPANY != 'longguang'" @click="addForm">
@@ -83,6 +84,7 @@
 	import ordinaryAcceptance from './ordinaryAcceptance.vue'
 	import engineeringData from './engineeringData.vue'
 	import verifyTableList from './verifyTableList.vue'
+	import finallyAcceptance from './finallyAcceptance.vue'
 	export default {
 		components:{
 			safeList,
@@ -91,7 +93,8 @@
 			constructionStation,
 			ordinaryAcceptance,
 			engineeringData,
-			verifyTableList
+			verifyTableList,
+			finallyAcceptance
 		},
 		data(){
 			return{
@@ -119,7 +122,12 @@
 				},{
 					id: 7,
 					name: "管控要点"
-				}],
+				},
+				{
+					id: 8,
+					name: "最终验收"
+				}
+				],
 				activeIndex: 1,
 				detailId: "",
 				detailData:{},
@@ -188,6 +196,8 @@
 					this.componentName = "constructionStation"
 				} else if(val.id == 7){
 					this.componentName = "control"
+				}else if(val.id == 8){
+					this.componentName = "finallyAcceptance"
 				}
 			},
 			addForm(){
@@ -218,6 +228,11 @@
 						url:'./addConstructionStation?id='+this.detailId
 					})
 				}
+				else if(this.activeIndex == 8){
+					uni.navigateTo({
+						url:'./addFinallyAcceptance?id='+this.detailId
+					})
+				}
 			}
 		}
 	}
diff --git a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue
new file mode 100644
index 00000000..ba4de230
--- /dev/null
+++ b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue
@@ -0,0 +1,37 @@
+<template>
+	<view>
+		<view class="finally">
+			<view style="padding:10px;">
+				危大工程名称：基坑
+			</view>
+			<view style="padding:10px;">
+				计划时间：基坑
+			</view>
+			<view style="padding:10px;">
+				验收人：基坑
+			</view>
+			<view style="padding:10px;">
+				验收结果：基坑
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:['detailId'],
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+.finally{
+	background-color: #fff;
+	height: 150px;
+	margin: 10px;
+}
+</style>
diff --git a/pages/projectEnd/laborManage/index.vue b/pages/projectEnd/laborManage/index.vue
index 62f64df3..b2359f1c 100644
--- a/pages/projectEnd/laborManage/index.vue
+++ b/pages/projectEnd/laborManage/index.vue
@@ -112,14 +112,14 @@
 			</view>
 		</view>
 		<view class="box operateBox">
-			<view class="item" @click="viewSafeMange">
+			<!-- <view class="item" @click="viewSafeMange">
 				<view class="imgBox">
 					<image src="/static/personManage/aqjy.png" mode="" style="width: 29px;height: 20px;"></image>
 				</view>
 				<view class="txt">
 					安全教育
 				</view>
-			</view>
+			</view> -->
 			<view v-if="COMPANY != 'longguang'" class="item" @click="goClockIn" v-show="mobileAttendance==0">
 				<view class="imgBox">
 					<image src="/static/personManage/ydkq.png" mode="" style="width: 22px;height: 22px;"></image>
@@ -144,14 +144,14 @@
 					考勤记录
 				</view>
 			</view>
-			<view class="item" @click="safeMeeting" v-if="COMPANY !='sccr'&& COMPANY != 'sanjiang'">
+			<!-- <view class="item" @click="safeMeeting" v-if="COMPANY !='sccr'&& COMPANY != 'sanjiang'">
 				<view class="imgBox">
 					<image src="/static/personManage/kqjl.png" mode="" style="width: 23px;height: 20px;"></image>
 				</view>
 				<view class="txt">
 					班前喊话
 				</view>
-			</view>
+			</view> -->
 			<view class="item" @click="viewVideo" v-if="COMPANY != 'nanchang'&& COMPANY != 'sccr'&& COMPANY != 'sanjiang'">
 				<view class="imgBox">
 					<image src="/static/personManage/video.png" mode="" style="width: 25px;height: 18px;"></image>
diff --git a/pages/projectEnd/ukashManage/materials.vue b/pages/projectEnd/ukashManage/materials.vue
index 8f710ae0..f6816df0 100644
--- a/pages/projectEnd/ukashManage/materials.vue
+++ b/pages/projectEnd/ukashManage/materials.vue
@@ -141,6 +141,7 @@
 
 		.no-data {
 			text-align: center;
+			margin-top: 50%;
 
 			.img {
 				display: block;
diff --git a/pages/projectEnd/ukashManage/ukashManage.vue b/pages/projectEnd/ukashManage/ukashManage.vue
index 38d8a3b7..5a4de5a5 100644
--- a/pages/projectEnd/ukashManage/ukashManage.vue
+++ b/pages/projectEnd/ukashManage/ukashManage.vue
@@ -173,6 +173,7 @@
 
 		.no-data {
 			text-align: center;
+			margin-top: 50%;
 
 			.img {
 				display: block;
diff --git a/pages/projectEnd/visitorsManage/visitorsDetails.vue b/pages/projectEnd/visitorsManage/visitorsDetails.vue
index 36521f08..5562d55a 100644
--- a/pages/projectEnd/visitorsManage/visitorsDetails.vue
+++ b/pages/projectEnd/visitorsManage/visitorsDetails.vue
@@ -98,7 +98,7 @@
 							})
 							setTimeout(() => {
 								uni.navigateBack({
-									url:'visitorsManage'
+									url:'visitorsManage?el=1'
 								})
 							}, 1000)
 						}
diff --git a/pages/projectEnd/visitorsManage/visitorsManage.vue b/pages/projectEnd/visitorsManage/visitorsManage.vue
index 61dab715..af82c3c5 100644
--- a/pages/projectEnd/visitorsManage/visitorsManage.vue
+++ b/pages/projectEnd/visitorsManage/visitorsManage.vue
@@ -43,19 +43,21 @@
 				isBrowsing : 0
 			}
 		},
-		onLoad() {
+		onShow() {
+			this.dataList = []
 			this.queryList()
 		},
 		onReachBottom() {
 			console.log(99999);
 			if (!this.isLoadMore) {
+				this.pageNo += 1
 				this.isLoadMore = true
 				this.queryList()
 			}
 		},
 		onPullDownRefresh() {
 			console.log(222);
-			this.pageNo = 1
+			this.pageNo += 1
 			this.dataList = []
 			this.queryList()
 		},
@@ -74,6 +76,7 @@
 					success: res => {
 						console.log(res);
 						this.dataList = this.dataList.concat(res.result.records)
+						// this.dataList = [...this.dataList,...res.result.records]
 						if (res.result.records.length < this.pageSize) {
 							//判断接口返回数据量小于请求数据量，则表示此为最后一页
 							this.isLoadMore = true