From b2b8d0d0fdefb7becdf25dcad10d6b4a936be377 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Thu, 16 May 2024 12:14:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectEnd/dangerBigProject/list/list.vue |    1 +
 .../fireWork - 副本/addPlan.vue               |  333 +++++
 .../fireWork - 副本/addSide.vue               |  337 +++++
 .../fireWork - 副本/addWorkFinally.vue        |  375 +++++
 .../fireWork - 副本/check.vue                 |  505 +++++++
 .../fireWork - 副本/checkList.vue             |  132 ++
 .../fireWork - 副本/detail.vue                |  402 +++++
 .../fireWork - 副本/plan.vue                  |  145 ++
 .../fireWork - 副本/safe.vue                  |   62 +
 .../fireWork - 副本/safeList.vue              | 1329 +++++++++++++++++
 .../fireWork - 副本/safeMesure.vue            |   95 ++
 .../fireWork - 副本/side.vue                  |  145 ++
 .../fireWork - 副本/work.vue                  |  211 +++
 .../fireWork - 副本/workFinally.vue           |   92 ++
 .../specialOperations/fireWork/addSide.vue    |    2 +-
 .../fireWork/addWorkFinally.vue               |    2 +-
 .../specialOperations/fireWork/check.vue      |    2 +-
 .../specialOperations/fireWork/checkList.vue  |    2 +-
 .../specialOperations/fireWork/detail.vue     |    2 +-
 .../specialOperations/fireWork/plan.vue       |    5 +-
 .../specialOperations/fireWork/safeList.vue   |    4 +-
 .../specialOperations/fireWork/side.vue       |    5 +-
 .../specialOperations/fireWork/work.vue       |   34 +-
 .../fireWork/workFinally.vue                  |    2 +-
 24 files changed, 4182 insertions(+), 42 deletions(-)
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/addPlan.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/addSide.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/addWorkFinally.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/check.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/checkList.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/detail.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/plan.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/safe.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/safeList.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/safeMesure.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/side.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/work.vue
 create mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/workFinally.vue

diff --git a/pages/projectEnd/dangerBigProject/list/list.vue b/pages/projectEnd/dangerBigProject/list/list.vue
index 80dc1e5f..78769ce9 100644
--- a/pages/projectEnd/dangerBigProject/list/list.vue
+++ b/pages/projectEnd/dangerBigProject/list/list.vue
@@ -950,6 +950,7 @@
 				console.log('查询列表条件数据', this.checkedTab)
 				let that = this;
 				// uni.showLoading({title: '加载中'})
+				that.condition.type = 1
 				this.sendRequest({
 					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
 					method: 'post',
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/addPlan.vue b/pages/projectEnd/specialOperations/fireWork - 副本/addPlan.vue
new file mode 100644
index 00000000..2a456036
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/addPlan.vue	
@@ -0,0 +1,333 @@
+<template>
+	<view class="addPlan">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				{{title}}
+			</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" :maxlength="22" type="text" :value="formData.dutyRegion" @blur="bindInputBlur" placeholder="请输入责任区域" />
+				</view>
+				<view class="form-item f-column b-bottom">
+					<view class="form-lable"><text class="tag">*</text>进度描述</view>
+					 <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.progressDescribe" placeholder="请输入进度描述" />
+					<view class="txt-length">{{textareaLengh}}/50</view>
+				</view>
+				<view class="form-item f-column">
+					<view class="form-lable"><text class="tag">*</text>现场照片</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>
+				
+			</view>
+		</view>
+		<view class="save-btn" @click="saveForm">保存</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				statusBarHeight: 0,
+				title: "新增进度记录",
+				formData:{
+					dutyRegion: "",
+					progressDescribe: "",
+					imgFileList:[],
+					engineeringId: "",
+					createUser: "",
+					createUserName: ""
+				},
+				textareaLengh: 0,
+			}
+		},
+		onShow(){
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
+			this.formData.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId;
+			this.formData.createUserName = JSON.parse(uni.getStorageSync('userInfo')).realName
+		},
+		onLoad(val){
+			this.formData.engineeringId = val.id
+		},
+		methods:{
+			bindTextAreaBlur(e){
+				console.log(e)
+				this.formData.progressDescribe = e.detail.value
+			},
+			bindInputBlur(e){
+				console.log(e)
+				this.formData.dutyRegion = 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(){
+				let data = {
+					type: 2,
+					dutyRegion: this.formData.dutyRegion,
+					progressDescribe: this.formData.progressDescribe,
+					engineeringId: this.formData.engineeringId,
+					createUser: this.formData.createUser,
+					createUserName: this.formData.createUserName
+				}
+				let arr = []
+				this.formData.imgFileList.forEach(item=>{
+					arr.push(item.url)
+				})
+				data.imageUrl = arr.join(',')
+				if(!data.dutyRegion){
+					uni.showToast({
+					    title: '请输入责任区域',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(!data.progressDescribe){
+					uni.showToast({
+					    title: '请输入进度描述',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(!data.imageUrl){
+					uni.showToast({
+					    title: '请上传图片',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				this.sendRequest({
+					url:'xmgl/dangerousEngineeringProgressRecord/add',
+					method:'post',
+					data: data,
+					success:res=>{
+						uni.hideLoading()
+						if(res.code==200){
+							uni.showToast({
+								title:'保存成功'
+							})
+							uni.navigateBack({})
+						}
+						console.log(res)
+					}
+				})
+				// console.log(data)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+.addPlan{
+	min-height: 100%;
+	background: #F6F6F6;
+	/deep/ .uni-input-wrapper{
+		font-size: 14px;
+	}
+	.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{
+				width: 57%;
+				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;
+				}
+			}
+			font-size: 14px;
+		}
+	}
+}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/addSide.vue b/pages/projectEnd/specialOperations/fireWork - 副本/addSide.vue
new file mode 100644
index 00000000..4881eb60
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/addSide.vue	
@@ -0,0 +1,337 @@
+<template>
+	<view class="addPlan">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				{{title}}
+			</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"><text class="tag">*</text>旁站记录</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"><text class="tag">*</text>现场照片</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>
+				
+			</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)
+				if(!this.formData.sideStationAddr){
+					uni.showToast({
+						icon: 'none',
+						title: '请输入施工部位',
+						duration: 2000
+					})
+					return
+				}
+				if(!this.formData.buildSituation){
+					uni.showToast({
+						icon: 'none',
+						title: '请输入旁站记录',
+						duration: 2000
+					})
+					return
+				}
+				if(!this.formData.imgFileList.length > 0){
+					uni.showToast({
+						icon: 'none',
+						title: '请上传图片',
+						duration: 2000
+					})
+					return
+				}
+				let data = {
+					sideStationAddr: this.formData.sideStationAddr,
+					buildSituation: this.formData.buildSituation,
+					dangerousEngineeringId: this.formData.dangerousEngineeringId,
+					createUser: JSON.parse(uni.getStorageSync('userInfo')).userId,
+					type: 2
+				}
+				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;
+				/deep/ .uni-input-placeholder{
+					font-size: 14px;
+				}
+			}
+		}
+		.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;
+				}
+			}
+			/deep/ .uni-textarea-placeholder{
+				font-size: 14px;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/addWorkFinally.vue b/pages/projectEnd/specialOperations/fireWork - 副本/addWorkFinally.vue
new file mode 100644
index 00000000..e8c57fbd
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/addWorkFinally.vue	
@@ -0,0 +1,375 @@
+<template>
+	<view class="addPlan">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				{{title}}
+			</view>
+		</headers>
+		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
+			<view class="plan-form">
+				<view class="form-item b-bottom">
+					<view class="form-lable">动火作业</view>
+					<!-- <view class="">{{engineeringName}}</view> -->
+				</view>
+				<view class="form-item b-bottom">
+					<view class="form-lable"><text class="tag">*</text>验收单位</view>
+					<picker @change="bindPickerChangeEnterprise" :value="enterpriseIndex" range-key="enterpriseName" :range="enterpriseInfoList">
+						<view style="display: flex;align-items: center;">
+							<view class="uni-input" style="margin-right: 10px;">{{enterpriseInfoList[enterpriseIndex] ? enterpriseInfoList[enterpriseIndex].enterpriseName : ""}}</view>
+							<uni-icons2 type="arrowright" size="20"></uni-icons2>
+						</view>
+					</picker>
+				</view>
+				<view class="form-item b-bottom">
+					<view class="form-lable"><text class="tag">*</text>验收人</view>
+					<picker @change="bindPickerChangePerson" :value="acceptanceIndex" range-key="workerName" :range="acceptancePersonList">
+						<view style="display: flex;align-items: center;">
+							<view class="uni-input" style="margin-right: 10px;">{{acceptancePersonList[acceptanceIndex] ? acceptancePersonList[acceptanceIndex].workerName : ""}}</view>
+							<uni-icons2 type="arrowright" size="20"></uni-icons2>
+						</view>
+					</picker>
+				</view>
+				<view class="form-item b-bottom">
+					<view class="form-lable"><text class="tag">*</text>验收时间</view>
+					<dateTimePicker :placeholder="'请选择验收时间'" :disabled="isDisabled"
+					  :start="getNowTime()" :fields="'minute'" :default-value="planTime"
+					  @change="bindPickerChange($event,'planTime')"
+					  class="form-content">
+					  <view class="uni-input">
+					    <!-- <text>{{addForm.inspectTime}}</text> -->
+					  	<uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" />
+					  </view>
+					</dateTimePicker>
+				</view>
+			</view>
+		</view>
+		<view class="save-btn" @click="saveForm">提交验收申请</view>
+	</view>
+</template>
+
+<script>
+	import dateTimePicker from '@/components/dateTimePicker/index.vue'
+	import { computed } from "vue";
+	export default {
+		components:{
+			dateTimePicker
+		},
+		data(){
+			return{
+				engineeringId: '',
+				//验收人相关属性
+				acceptanceIndex: '',
+				acceptancePerson: '',
+				acceptancePersonList: [],
+				
+				//验收单位相关属性
+				enterpriseId: '',
+				enterpriseIndex: '',
+				enterpriseInfoList: [],
+				
+				projectSn: '',
+				isDisabled: false,
+				planTime: '',
+				
+				statusBarHeight: 0,
+				// title: "下发验证任务",
+				title: "验收申请",
+				inspectTime:'',
+				
+				userInfo: {}
+			}
+		},
+		created() {
+			// this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn
+		},
+		onShow(){
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
+		},
+		onLoad(val){
+			console.log("========================");
+			console.log(val);
+			console.log("========================");
+			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			this.engineeringId = val.id
+			this.engineeringName = val.name
+			this.getEnterpriseInfoList()
+		},
+		watch:{
+			enterpriseId(newVal,oldVal){
+				if(newVal !== oldVal) {
+					this.sendRequest({
+						// url:'xmgl/enterpriseInfo/list',
+						url:'xmgl/systemUser/getProjectChilderSystemUserList',
+						method:'post',
+						data:{
+							enterpriseId: this.enterpriseId,
+							projectSn: this.projectSn,
+						},
+						success:res=>{
+							uni.hideLoading()
+							this.acceptancePersonList = res.result
+							console.log(this.acceptancePersonList);
+						}
+					})
+				}
+			}
+		},
+		methods:{
+			getEnterpriseInfoList(){
+				this.sendRequest({
+					url:'xmgl/enterpriseInfo/list',
+					method:'post',
+					data:{
+						// engineeringId: this.detailId,
+						projectSn: this.projectSn,
+						// projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
+					},
+					success:res=>{
+						uni.hideLoading()
+						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
+						this.enterpriseInfoList = res.result;
+					}
+				})
+			},
+			
+			saveForm(){
+				let data = {
+					projectSn: this.projectSn,
+					engineeringId: this.engineeringId,	//危大工程Id
+					//申请验收相关属性
+					// applyAcceptanceUnitId: this.userInfo.userEnterpriseId,	//申请验收单位id
+					// applyAcceptanceUserId: this.userInfo.userId,	//申请验收人id
+					//验收相关属性
+					acceptanceUnitId: this.enterpriseId,
+					acceptanceUserId: this.acceptancePerson.userId,
+					planTime: this.planTime,
+					type: 2
+				}
+				console.log(data);
+				if(!data.acceptanceUnitId){
+					uni.showToast({
+					    title: '请选择验收单位',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(!data.acceptanceUserId){
+					uni.showToast({
+					    title: '请选择验收人',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(!data.planTime){
+					uni.showToast({
+					    title: '请选择验收时间',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				console.log("=====================================addform",data)
+				console.log("=====================================userInfo",this.userInfo)
+				this.sendRequest({
+					url:'xmgl/xzDangerousEngineeringAcceptance/add',
+					method:'post',
+					data: data,
+					success:res=>{
+						uni.hideLoading()
+						if(res.code==200){
+							uni.showToast({
+								title:'保存成功'
+							})
+							uni.navigateBack({})
+						}
+						console.log(res)
+					}
+				})
+			},
+			
+			
+			bindPickerChange(e){
+				this.planTime = e.f3
+			},
+			bindPickerChangePerson(e){
+				this.acceptanceIndex = e.target.value
+				this.acceptancePerson = this.acceptancePersonList[e.target.value]
+			},
+			bindPickerChangeEnterprise(e){
+				this.enterpriseIndex = e.target.value
+				this.enterpriseId = this.enterpriseInfoList[e.target.value].id
+			},
+			getNowTime() {
+				let dateTime
+				let yy = new Date().getFullYear()
+				let mm = new Date().getMonth() + 1
+				let dd = new Date().getDate()
+				let hh = new Date().getHours()
+				let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
+				let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
+				dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+				console.log(dateTime)
+				return dateTime
+			}
+		}
+	}
+</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;
+			align-items: center;
+			background: #fff;
+			.form-lable{
+				white-space: nowrap;
+				.tag{
+					color: #DD524D;
+				}
+			}
+			.from-input{
+				text-align: right;
+			}
+			.form-result{
+				.form-radio{
+					display: flex;
+					margin-left: 30rpx;
+					border: 1px solid #E5E5E5;
+					padding: 0;
+					border-radius: 12rpx;
+					overflow: hidden;
+					li{
+						list-style: none;
+						font-size: 14px;
+						background: #EEEEEE;
+						text-align: center;
+						width: 156rpx;
+						padding: 12rpx 0;
+					}
+					.active-radio{
+						background: #2b8df3;
+						color: #fff;
+					}
+				}
+			}
+		}
+		.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;
+				}
+			}
+		}
+		.a-none{
+			align-items: initial;
+		}
+	}
+}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/check.vue b/pages/projectEnd/specialOperations/fireWork - 副本/check.vue
new file mode 100644
index 00000000..4917d094
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/check.vue	
@@ -0,0 +1,505 @@
+<template>
+	<view class="addPlan">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				{{title}}
+			</view>
+		</headers>
+		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
+			<view class="plan-form">
+				<view style="background-color: #fff;border-bottom: 10px solid #068de8;padding:10px 10px 15px 10px">
+					<!-- <view class="backlogMargin">危大工程名称：{{checkRecord.engineeringName}}</view> -->
+					<view class="backlogMargin">动火作业</view>
+					<view class="backlogMargin">计划执行时间：{{checkRecord.planTime}}</view>
+					<view class="backlogMargin">申请验收单位：{{checkRecord.applyAcceptanceUnitName}}</view>
+					<view class="backlogMargin">申请验收人：{{checkRecord.applyAcceptanceUserName}}</view>
+				</view>
+				
+				<view class="form-item b-bottom" style="justify-content: flex-start;">
+					<view class="form-lable"><text class="tag">*</text>验收结果</view>
+					<view class="form-result" v-if="checkRecord.acceptanceResult !== 1 && checkRecord.acceptanceResult !== 2">
+						<ul class="form-radio">
+							<li :class="{'active-radio': formData.acceptanceResult == 1}" @click="checkRadio(1)">合格</li>
+							<li :class="{'active-radio': formData.acceptanceResult == 2}" @click="checkRadio(2)">不合格</li>
+						</ul>
+					</view>
+					<view class="form-result" v-else>
+						<ul class="form-radio">
+							<li :class="{'active-radio': checkRecord.acceptanceResult == 1}" @click="checkRadio(1)">合格</li>
+							<li :class="{'active-radio': checkRecord.acceptanceResult == 2}" @click="checkRadio(2)">不合格</li>
+						</ul>
+					</view>
+				</view>
+				
+				<view class="form-item f-column b-bottom a-none" v-if="checkRecord.acceptanceResult !== 1 && checkRecord.acceptanceResult !== 2">
+					<view class="form-lable"><text class="tag">*</text>验收描述</view>
+					<textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50"
+						:value="formData.acceptanceDescribe" placeholder="请输入验收描述" />
+					<view class="txt-length">{{textareaLengh}}/50</view>
+				</view>
+				<view class="form-item f-column b-bottom a-none" v-else>
+					<view class="form-lable"><text class="tag">*</text>验收描述</view>
+					<textarea class="form-textarea" maxlength="50" :disabled="true"
+						:value="checkRecord.acceptanceDesc" placeholder="请输入验收描述" />
+				</view>
+				
+				<view class="form-item f-column a-none">
+					<view class="form-lable"><text class="tag">*</text>现场照片</view>
+					<view class="uni-form-input imgBox_wrap" v-if="checkRecord.acceptanceResult !== 1 && checkRecord.acceptanceResult !== 2">
+						<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="" v-else>
+						<view class="imgBox">
+							<image :src="url_config+'image/'+checkRecord.photo" class="img"
+								@click="previewImage(url_config+'image/'+item.url)"></image>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<view class="save-btn" v-if="checkRecord.acceptanceResult !== 1 && checkRecord.acceptanceResult !== 2" @click="saveForm">确 认</view>
+		<!-- <u-popup :show="isPopupVisible" @close="closePopup" @open="isPopupVisible === true" z-index="9999">
+			<view class="slot-content">
+				弹窗内容
+				这里是弹窗的内容
+				<u-button @click="closePopup">关闭弹窗</u-button>
+			</view>
+		</u-popup> -->
+		
+		
+		<view class="dialog-container" v-if="unitDialog" @click="unitDialog=false">
+		<!-- <view class="dialog-container" v-if="unitDialog"> -->
+			<view class="dialog-content">
+				<view class="text-tip">
+					提示：最终验收通过后，将闭合该动火作业计划，任何人不能再进行操作！
+				</view>
+				<view class="confirm-btn" @click="confirmClose">关闭</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				unitDialog: false,
+				checkRecord: {},	//验收记录
+				
+				statusBarHeight: 0,
+				isPopupVisible: true,
+				title: "新增验收记录",
+				formData: {
+					acceptanceRegion: "",
+					acceptanceDescribe: "",
+					imgFileList: [],
+					acceptanceResult: 1,
+					acceptanceType: "",
+					dangerousEngineeringId: ""
+				},
+				textareaLengh: 0,
+				typeIndex: "",
+				typeList: [{
+					id: 1,
+					name: '施工条件验收'
+				}, {
+					id: 2,
+					name: '危大工程验收'
+				}]
+			}
+		},
+		onShow() {
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
+		},
+		onLoad(val) {
+			// this.formData.dangerousEngineeringId = val.id
+			this.checkRecord = JSON.parse(decodeURIComponent(val.checkRecord));
+			console.log("===============onload===================");
+			console.log(this.checkRecord);
+			console.log("===============onload===================");
+		},
+		methods: {
+			checkRadio(val) {
+				this.formData.acceptanceResult = val
+			},
+			bindTextAreaBlur(e) {
+				console.log(e)
+				this.formData.acceptanceDescribe = e.detail.value
+			},
+			bindInputBlur(e) {
+				console.log(e)
+				this.formData.acceptanceRegion = 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)
+				// this.isPopupVisible = true
+				
+				if(!this.formData.acceptanceResult){
+					uni.showToast({
+					    title: '请选择结果',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(!this.formData.acceptanceDescribe){
+					uni.showToast({
+					    title: '请输入验收描述',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(!this.formData.imgFileList[0]){
+					uni.showToast({
+					    title: '请上传现场照片',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(this.formData.acceptanceResult === 1){
+					this.unitDialog = true
+				}else{
+					this.confirmClose()
+				}
+			},
+			confirmClose(){
+				// this.unitDialog = true
+				let data = {
+					id: this.checkRecord.id,
+					acceptanceResult: this.formData.acceptanceResult,	//验收结果
+					acceptanceDesc: this.formData.acceptanceDescribe,	//验收描述
+					photo: this.formData.imgFileList[0].url,
+					type: 2
+				}
+				// data.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId;
+				// let arr = []
+				// this.formData.imgFileList.forEach(item=>{
+				// 	arr.push(item.url)
+				// })
+				// data.imageUrl = arr.join(',')
+				// console.log(data)
+				this.sendRequest({
+					url:'xmgl/xzDangerousEngineeringAcceptance/edit',
+					method:'post',
+					data: data,
+					success:res=>{
+						uni.hideLoading()
+						if(res.code==200){
+							uni.showToast({
+								title:'保存成功'
+							})
+							this.unitDialog = false
+							uni.navigateBack({})
+						}
+						console.log(res)
+					}
+				})
+			},
+			bindPickerChange(e) {
+				this.typeIndex = e.target.value
+				this.formData.acceptanceType = this.typeList[e.target.value].id
+			},
+			closePopup() {
+				this.isPopupVisible = false
+			}
+		}
+	}
+</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;
+				align-items: center;
+				background: #fff;
+
+				.form-lable {
+					white-space: nowrap;
+
+					.tag {
+						color: #DD524D;
+					}
+				}
+
+				.from-input {
+					text-align: right;
+				}
+
+				.form-result {
+					.form-radio {
+						display: flex;
+						margin-left: 30rpx;
+						border: 1px solid #E5E5E5;
+						padding: 0;
+						border-radius: 12rpx;
+						overflow: hidden;
+
+						li {
+							list-style: none;
+							font-size: 14px;
+							background: #EEEEEE;
+							text-align: center;
+							width: 156rpx;
+							padding: 12rpx 0;
+						}
+
+						.active-radio {
+							background: #2b8df3;
+							color: #fff;
+						}
+					}
+				}
+			}
+
+			.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;
+					}
+				}
+			}
+
+			.a-none {
+				align-items: initial;
+			}
+		}
+	}
+
+	.backlogMargin {
+		margin-bottom: 15px;
+	}
+	.dialog-container {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 111;
+		background-color: rgba(0, 0, 0, 0.5);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		.dialog-content{
+			// padding: 10px 10px;
+			width: 80%;
+			height: 400rpx;
+			background-color: #fff;
+			// line-height: 32px;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			.text-tip{
+				font-size: 14px;
+				width: 93%;
+				height: 70%;
+				// position: absolute;
+				// background-color: darkred;
+			}
+			.confirm-btn{
+				width: auto;
+				height: 15%;
+				color: #fff;
+				background-color: #2b8df3;
+				display: flex;
+				align-items: center;
+				padding: 0 5px;
+				border-radius: 5px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/checkList.vue b/pages/projectEnd/specialOperations/fireWork - 副本/checkList.vue
new file mode 100644
index 00000000..010ca541
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/checkList.vue	
@@ -0,0 +1,132 @@
+<template>
+	<view class="addPlanss">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				{{title}}
+			</view>
+		</headers>
+		<view class="backlogList-admin" v-for="item in listData" :key="item.id" @click="jobTrial(item)">
+			<view class="backlogList backlogMargin">
+				<span>
+					<!-- 危大工程名称：{{item.engineeringName}} -->
+					动火作业
+				</span>
+				<span class="backlogList-span" v-if="!item.acceptanceResult">待确认</span>
+				<span class="backlogList-span" v-if="item.acceptanceResult === 1">合格</span>
+				<span class="backlogList-span" v-if="item.acceptanceResult === 2">不合格</span>
+			</view>
+			<view class="backlogMargin">
+					计划执行时间：{{item.planTime}}
+			</view>
+			<view class="backlogMargin">
+					申请验收单位：{{item.applyAcceptanceUnitName}}
+			</view>
+			<view class="backlogMargin">
+					申请验收人：{{item.applyAcceptanceUserName}}
+			</view>
+		</view>
+		<view class="no-data"  v-if="listData.length === 0">
+			<image class="img" src="/static/noData.png"></image>
+			<text class="txt">暂无数据</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: "查看待办",
+				listData: [],
+				projectSn: '',
+				userInfo: {},
+			};
+		},
+		created() {
+			
+		},
+		onLoad() {
+			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			this.initData()
+		},
+		onShow() {
+			this.initData()
+		},
+		methods:{
+			initData(){
+				this.sendRequest({
+					url:'xmgl/xzDangerousEngineeringAcceptance/list',
+					method:'get',
+					data:{
+						projectSn: this.projectSn,
+						acceptanceUserId: this.userInfo.userId,
+						type: 2
+					},
+					success:res=>{
+						uni.hideLoading()
+						this.listData = res.result
+					}
+				})
+			},
+			jobTrial(item){
+				console.log('sssssss');
+				let checkRecord = {
+					id: item.id,
+					engineeringName: item.engineeringName,
+					planTime: item.planTime,
+					applyAcceptanceUnitName: item.applyAcceptanceUnitName,
+					applyAcceptanceUserName: item.applyAcceptanceUserName
+				}
+				checkRecord = item
+				uni.navigateTo({
+					url:'./check?checkRecord='+encodeURIComponent(JSON.stringify(checkRecord))
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.addPlanss {
+		height: 100%;
+		background-color: #f6f6f6;
+	}
+
+	.backlogList-admin {
+		margin: 10px;
+		background-color: #fff;
+		height: 160px;
+		padding: 15px;
+
+		.backlogList {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			.backlogList-span{
+				padding: 3px 5px;
+				border: 1px solid #ccc;
+				color: #d17b00;
+				border-radius: 3px;
+			}
+		}
+	}
+	.no-data{
+		text-align: center;
+		.img{
+			display: block;
+			height: 200rpx;
+			width: 200rpx;
+			margin: 0 auto;
+			margin-top: 60rpx;
+			margin-bottom: 60rpx;
+		}
+		.txt{
+			color: #C0C4CC;
+		}
+	}
+	
+	.backlogMargin{
+		margin-bottom: 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/detail.vue b/pages/projectEnd/specialOperations/fireWork - 副本/detail.vue
new file mode 100644
index 00000000..84fd5483
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/detail.vue	
@@ -0,0 +1,402 @@
+<template>
+	<view class="dangerbig-details">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				动火作业详情
+			</view>
+		</headers>
+		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
+			<view class="detail-content">
+					<view class="list">
+						<view class="list-info">
+							动火人：<text class="detail-data">{{detailData.firemanName}}</text>
+						</view>
+						<view class="list-info">
+							动火方式：<text class="detail-data">{{detailData.hotMethod}}</text>
+						</view>
+						<view class="list-info">
+							动火实施时间：<text class="detail-data">{{detailData.hotWorkExecutionBeginTime+'-'+detailData.hotWorkExecutionEndTime}}</text>
+						</view>
+						<view class="list-info">
+							动火地点和动火部位：<text class="detail-data">{{detailData.fireLocationAndFirePart}}</text>
+						</view>
+						<view class="" v-if="isShow">
+							<view class="list-info">
+								作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
+							</view>
+							<view class="list-info">
+								作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
+							</view>
+							<view class="list-info">
+								动火作业级别：<text class="detail-data">{{detailData.hotWorkLevel}}</text>
+							</view>
+							<view class="list-info">
+								作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+							</view>
+							<view class="list-info">
+								作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
+							</view>
+							<view class="list-info">
+								作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+							</view>
+							<view class="list-info">
+								关联的其他特殊作业：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
+							</view>
+							<view class="list-info">
+								证书编号：<text class="detail-data">{{detailData.certificateNo}}</text>
+							</view>
+							<view class="list-info">
+								安全作业票编号：<text class="detail-data">{{detailData.safetyWorkTicketCode}}</text>
+							</view>
+							<view class="list-info">
+								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
+							</view>
+							<view class="safe-mesure">
+								<view class="safe-btn" @click="goSafeMesure">安全措施</view>
+							</view>
+							<view class="table-info" style="">
+								<uni-table emptyText="暂无更多数据" class="uni-table-font">
+									<uni-td class="uni-td-font" style="background-color: #eaeaea" align="center">
+										<uni-tr>气体取样分析时间</uni-tr>
+										<uni-tr>代表性气体</uni-tr>
+										<uni-tr>分析结果/%</uni-tr>
+									</uni-td>
+									<uni-td class="uni-td-font" align="center">
+										<uni-tr class="uni-tr-font">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</uni-tr>
+										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</uni-tr>
+										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</uni-tr>
+									</uni-td>
+									<uni-td class="uni-td-font" align="center">
+										<uni-tr style="">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</uni-tr>
+										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</uni-tr>
+										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</uni-tr>
+									</uni-td>
+									<uni-td class="uni-td-font" align="center">
+										<uni-tr style="">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</uni-tr>
+										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</uni-tr>
+										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</uni-tr>
+									</uni-td>
+								</uni-table>
+							</view>
+						</view>
+						
+						<view v-if="COMPANY != 'longguang'" class="more-btn" @click="isShow=!isShow">
+							{{isShow ? "收起详情":"展开详情"}}
+							<uni-icons :type="isShow ? 'arrowup':'arrowdown'"></uni-icons>
+						</view>
+					</view>
+
+					<view class="detail-nav" v-if="COMPANY != 'longguang'">
+						<scroll-view class="scrollx-wrap" scroll-x>
+							<view class="nav-list">
+								<view class="nav-item"
+									:class="{'active-nav': activeIndex == item.id}"
+									v-for="(item,index) in navList" :key="index"
+									@click="checkNav(item)">
+									{{item.name}}
+								</view>
+							</view>
+						</scroll-view>
+						<view class="detail-wrap">
+							<plan ref="list" v-if="componentName == 'plan'" :detailId="detailId" :info="detailData"></plan>
+							<safe ref="list" v-if="componentName == 'safe'" :detailId="detailId" :info="detailData"></safe>
+							<side ref="list" v-if="componentName == 'side'" :detailId="detailId" :info="detailData"></side>
+							<workFinally ref="list" v-if="componentName =='workFinally'" :detailId="detailId" :info="detailData" ></workFinally>
+						</view>
+					</view>
+					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
+					<view class="add-btn" v-if="activeIndex != 7
+					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
+					@click="addForm">
+						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
+						<uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons>
+						<span>+</span>
+					</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import plan from './plan.vue'
+	import safe from './safe.vue'
+	import side from './side.vue'
+	import workFinally from './workFinally.vue'
+	
+	export default {
+		components:{
+			plan,
+			safe,
+			side,
+			workFinally,
+		},
+		data(){
+			return{
+				statusBarHeight: 0,
+				isShow: false,
+				componentName: "plan",
+				navList:[{
+					id: 1,
+					name: "当前进度"
+				},{
+					id: 2,
+					name: "安全检查"
+				},{
+					id: 3,
+					name: "施工旁站"
+				},{
+					id: 4,
+					name: "最终验收"
+				}],
+				activeIndex: 1,
+				detailId: "",
+				detailData:{},
+				isShowBtn: null,
+			}
+		},
+		onReachBottom() {
+			console.log(1,this.$refs['list'])
+		},
+		onPullDownRefresh() {
+			console.log(2)
+		},
+		onShow(){
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
+			// this.initData()
+			this.getWork()
+			let that = this;
+			setTimeout(function(){
+				console.log(that.$refs,777)
+				console.log(that.$refs.listBox,777)
+				if(that.$refs['list'] && that.$refs['list'].initData){
+					console.log(777888)
+					that.$refs['list'].initData()
+				}
+			},200)
+		},
+		onLoad(val){
+			this.detailId = val.id
+		},
+		mounted() {
+		},
+		methods:{
+			getWork(){
+				this.sendRequest({
+					url:'xmgl/xzSpecialOperationFireSafety/queryById',
+					method:'get',
+					data:{id:this.detailId},
+					success:res=>{
+						uni.hideLoading()
+						// if(res.code==200){
+						// 	this.listData = res.result.records
+						// }
+						this.detailData =  res.result
+						// let str = '';
+						// if(res.result.chooseTypeDescribeList){
+						// 	this.detailData.describeName
+						// 	res.result.chooseTypeDescribeList.map((item,index) => {
+						// 		if(index == res.result.chooseTypeDescribeList.length - 1){
+						// 			str = str + item.describeName
+						// 		} else {
+						// 			str = str + item.describeName + ','
+						// 		}
+						// 	})
+						// 	console.log(str,123456789)
+						// 	this.detailData.describeName = str;
+						// }
+						this.getApply()
+					}
+				})
+			},
+			goSafeMesure(){
+				uni.navigateTo({
+					url: "./safeMesure"
+				})
+			},
+			getApply(){
+				console.log("=====================================================detail");
+				console.log(this.detailData);
+				this.sendRequest({
+					url:'xmgl/xzDangerousEngineeringAcceptance/list',
+					method:'get',
+					data:{
+						engineeringId: this.detailData.id,
+						projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
+						type: 2
+					},
+					success:res=>{
+						uni.hideLoading()
+						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
+						let result = res.result
+						if(res.result.length>0){
+							if(res.result[0].acceptanceResult === null) this.isShowBtn = false
+							if(res.result[0].acceptanceResult === 1) this.isShowBtn = false
+							if(res.result[0].acceptanceResult === 2) this.isShowBtn = true
+						}else{
+							this.isShowBtn = true
+						}
+					}
+				})
+			},
+			checkNav(val){
+				this.activeIndex = val.id
+				if(val.id == 1){
+					this.componentName = "plan"
+				} else if(val.id == 2){
+					this.componentName = "safe"
+				} else if(val.id == 3){
+					this.componentName = "side"
+				} else if(val.id == 4){
+					this.componentName = "workFinally"
+				}
+			},
+			addForm(){
+				if(this.activeIndex == 1){
+					uni.navigateTo({
+						url:'./addPlan?id='+this.detailId
+					})
+				} else if(this.activeIndex == 2){
+					if(uni.getStorageSync('dangerData')){
+						uni.removeStorageSync('dangerData');
+					}
+					if(uni.getStorageSync('detailData')){
+						uni.removeStorageSync('detailData');
+					}
+					uni.navigateTo({
+						// url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck'
+						url:'../../safeSame/addIssue?type=2&engineeringId='+this.detailId + '&moduleType=safeCheck'
+					})
+				} else if(this.activeIndex == 3){
+					uni.navigateTo({
+						url:'./addSide?id='+this.detailId
+					})
+				} else if(this.activeIndex == 4){
+					if(this.isShowBtn){
+						uni.navigateTo({
+							url:'./addWorkFinally?id='+this.detailId+'&name='+this.detailData.engineeringName
+						})
+					}else{
+						uni.showToast({
+							title: '请勿重复操作',
+							icon: "none",
+							duration: 2000
+						});
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.safe-mesure{
+	width: 100%;
+	height: 100rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #fff;
+	.safe-btn{
+		text-align: center;
+		width: 80%;
+		line-height: 70rpx;
+		// background-color: darkred;
+		border: 4rpx solid #2b8df3;
+		color: #2b8df3;
+		border-radius: 20rpx;
+		font-weight: bold;
+	}
+}
+.table-info{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #fff;
+	.uni-table-font{
+		margin: 0 5rpx;
+		// width: 95%;
+		box-shadow: 0rpx 0rpx 0rpx 2rpx darkgray;
+		.uni-td-font{
+			width: 25%;
+			font-size: 18rpx;
+			border: 1rpx solid lightgray;
+			.uni-tr-font{
+				border: 1rpx solid black;
+			}
+		}
+		
+	}
+}
+.dangerbig-details{
+	min-height: 100%;
+	background: #F6F6F6;
+	.fixedheader{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 2;
+	}
+	.detail-content{
+		padding-top: 20rpx;
+	}
+	.list{
+		margin-bottom: 20rpx;
+	}
+	.list-info{
+		background: #fff;
+		border-bottom: 1px solid #F6F6F6;
+		font-size: 26rpx;
+		padding: 20rpx;
+	}
+	.more-btn{
+		text-align: center;
+		font-size: 14px;
+		height: 50rpx;
+		background: #F1F7FE;
+		line-height: 50rpx;
+	}
+	.nav-list{
+		display: flex;
+		height: 80rpx;
+		align-items: center;
+		padding: 0 20rpx;
+		.nav-item{
+			width: 25%;
+			text-align: center;
+			white-space: nowrap;
+			padding: 0 20rpx;
+			height: 80rpx;
+			box-sizing: border-box;
+			line-height: 80rpx;
+			font-size: 14px;
+		}
+		.active-nav{
+			border-bottom: 2px solid #4396E7;
+		}
+	}
+	.detail-nav{
+		width: 100%;
+	}
+	.scrollx-wrap{
+		width: 100%;
+		background: #fff;
+	}
+	.add-btn{
+		background: #4181FE;
+		width: 96rpx;
+		height: 96rpx;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 96rpx;
+		position: fixed;
+		bottom: 40rpx;
+		right: 40rpx;
+		span{
+			font-size: 30px;
+			    line-height: 45px;
+			    color: #fff;
+		}
+	}
+}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/plan.vue b/pages/projectEnd/specialOperations/fireWork - 副本/plan.vue
new file mode 100644
index 00000000..88e6fd10
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/plan.vue	
@@ -0,0 +1,145 @@
+<template>
+	<view class="control">
+		<!-- <view class="control-h2 flex j-between a-center">
+			进度记录
+			<view class="control-total">0/10</view>
+		</view> -->
+		<view class="control-list" v-if="listData && listData.length>0">
+			<view class="control-item" v-for="(item,index) in listData" :key="index">
+				<view class="item-title b-bottom">
+					{{item.dutyRegion}}
+				</view>
+				<view class="item-select-box" :class="{'b-bottom': item.imageUrl}">
+					<view class="item-content">进度描述：{{item.progressDescribe}}</view>
+				</view>
+				<view class="item-img" v-if="item.imageUrl">
+					现场照片
+					<view class="img-wrap flex a-center">
+						<view class="imgBox" v-for="(item,index) in item.imageUrl.split(',')" :key="index">
+							<image :src="url_config+'image/'+item" class="img"
+								@click="previewImage(url_config+'image/'+item)"></image>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<view class="no-data" v-else>
+			<image class="img" src="/static/noData.png"></image>
+			<text class="txt">暂无数据</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:["detailId"],
+		data(){
+			return{
+				listData:[]
+			}
+		},
+		created() {
+				this.initData()
+		},
+		methods:{
+			previewImage(url) {
+				uni.previewImage({
+					urls: [url]
+				})
+			},
+			initData(){
+				this.sendRequest({
+					url:'xmgl/dangerousEngineeringProgressRecord/list',
+					method:'post',
+					data: {
+						engineeringId: this.detailId,
+						type: 2,
+					},
+					success:res=>{
+						uni.hideLoading()
+						if(res.code==200){
+							this.listData = res.result
+							console.log(res)
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.control{
+		padding-top: 20rpx;
+		padding-bottom: 40rpx;
+		.flex{
+			display: flex;
+		}
+		.j-between{
+			justify-content: space-between;
+		}
+		.a-center{
+			align-items: center;
+		}
+		.b-bottom{
+			border-bottom: 1px solid #F6F6F6;
+		}
+		.control-h2{
+			font-size: 14px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			background: rgba(255,255,255,0.5);
+		}
+		.control-list{
+			font-size: 14px;
+			.control-item{
+				padding: 0 20rpx;
+				margin-bottom: 20rpx;
+				background: #fff;
+				.item-title{
+					font-weight: 600;
+					height: 72rpx;
+					line-height: 72rpx;
+				}
+			}
+			.item-select-box{
+				padding: 30rpx 0;
+				.item-content{
+					width: 100%;
+				}
+				
+			}
+			.img-wrap{
+				margin-top: 20rpx;
+				flex-wrap: wrap;
+			}
+			.item-img{
+				padding: 30rpx 0;
+				.imgBox{
+					width: 100rpx;
+					height: 100rpx;
+					margin-left: 20rpx;
+					.img{
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+		.no-data{
+			text-align: center;
+			.img{
+				display: block;
+				height: 200rpx;
+				width: 200rpx;
+				margin: 0 auto;
+				margin-top: 60rpx;
+				margin-bottom: 60rpx;
+			}
+			.txt{
+				color: #C0C4CC;
+			}
+		}
+	}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/safe.vue b/pages/projectEnd/specialOperations/fireWork - 副本/safe.vue
new file mode 100644
index 00000000..7df898b6
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/safe.vue	
@@ -0,0 +1,62 @@
+<template>
+	<view class="safe-list">
+		<view class="list-detail">
+			<view class="list-item" @click="previewData(1)">
+				<view>问题隐患&排查记录<text class="num"></text></view>
+				<uni-icons type="arrowright"></uni-icons>
+			</view>
+			<!-- <view class="list-item" @click="previewData(2)">
+				<view>排查记录<text class="num"></text></view>
+				<uni-icons type="arrowright"></uni-icons>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:['detailId'],
+		data(){
+			return{
+				
+			}
+		},
+		onLoad() {
+			console.log("==============safeLis,detailIdt===============");
+			console.log(this.detailId);
+			console.log("==============safeList,detailId===============");
+		},
+		methods:{
+			previewData(val){
+				if(val == 1){
+					uni.navigateTo({
+						// url:'../safeManage/dangerList?type=5&engineeringId='+this.detailId
+						url:"./safeList?type=2&engineeringId=" + this.detailId
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.safe-list{
+		padding-top: 20rpx;
+		height: 500rpx;
+		.list-detail{
+			background: #fff;
+			padding: 0 40rpx;
+			.list-item{
+				height: 96rpx;
+				border-bottom: 1px solid #F6F6F6;
+				line-height: 92rpx;
+				font-size: 14px;
+				display: flex;
+				justify-content: space-between;
+			}
+			.num{
+				margin-left: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/safeList.vue b/pages/projectEnd/specialOperations/fireWork - 副本/safeList.vue
new file mode 100644
index 00000000..24c3ce4e
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/safeList.vue	
@@ -0,0 +1,1329 @@
+<template>
+	<view class="listPage" :class="{popupShow:popupShow}">
+		<headers :showBack="true">
+			<view class="headerName">
+				问题隐患&排查记录
+			</view>
+		</headers>
+		<view class="tab flex2">
+			<view class="tabType" @click="changeTab(0)" :class="checkedTab==0?'checkedTab':'noCheckTab'">问题隐患</view>
+			<view class="tabType" @click="changeTab(9)" :class="checkedTab==9?'checkedTab':'noCheckTab'">排查记录</view>
+			<!-- <view class="tabType" @click="changeTab(2)" :class="checkedTab==2?'checkedTab':'noCheckTab'">待整改</view>
+			<view class="tabType" @click="changeTab(3)" :class="checkedTab==3?'checkedTab':'noCheckTab'">待复查</view>
+			<view class="tabType" @click="changeTab(4)" :class="checkedTab==4?'checkedTab':'noCheckTab'">待核验</view> -->
+		</view>
+		<!-- <view class="searchBox" v-if="checkedTab==0"> -->
+		<view class="searchBox">
+			<form>
+				<view class="uni-form-item">
+					<input class="uni-input" name="searchName" v-model="condition.search" placeholder="搜索"
+						@input="handleInput" />
+					<view class="screen" @click="screenData">筛选</view>
+					<view class="screen" style="margin-top: 3px;
+                        margin-left: 5px;">
+						<image src="/static/screenIcon.png" style="width: 15px;height: 15px">
+						</image>
+					</view>
+				</view>
+			</form>
+		</view>
+		<view class="content">
+			<view class="item" v-if="listData.length>0" v-for="(item,index) in listData" :key="index"
+				@click="goDetails(item)">
+				<view class="item_title" v-if="item.recordType == 1 ">
+					<image src="/static/zlwtIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>安全问题
+				</view>
+				<view class="item_title" v-if="item.recordType == 2 ">
+					<image src="/static/pcjlIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>排查记录
+				</view>
+				<view v-if="item.status==2" class="rightStatus" style="background: #5181f6;">待整改</view>
+				<view v-if="item.status==3" class="rightStatus" style="background:#ff9810">待复查</view>
+				<view v-if="item.status==4" class="rightStatus" style="background:#6554d1">待核验</view>
+				<view v-if="item.status==5" class="rightStatus" style="background:#21c28e">合格</view>
+				<view v-if="item.status==6" class="rightStatus" style="background:#ccc">已撤回</view>
+				<view v-if="item.overTime == true && item.status != 6" class="rightStatus" style="background:#ea3941;margin-right: 10px;">超期
+				</view>
+				<view class="item_content">{{item.dangerItemContent}}</view>
+				<view class="item_content" style="margin: 15px 0px;">整改人: {{item.changeName}}</view>
+				<view class="item_info flex2">
+					<view class="name">检查人：{{item.inspectManName}}</view>
+					<view class="time">{{item.inspectTime}}</view>
+				</view>
+			</view>
+			<view class="noData" v-if="listData.length==0">
+				<image class="noDataImg" src="../../../../static/noData.png"></image>
+				<view>暂无数据</view>
+			</view>
+			<!-- 检查部位 -->
+			<tki-tree style="z-index: 9999;" ref="locationTree" @confirm="(val)=>checkPointBtn(val,1)" idKey='id'
+				:range="checkPointList" rangeKey="regionName" confirmColor="#4e8af7" :selectParent="true" />
+
+
+			<!-- 筛选条件弹框 -->
+			<uni-popup class="screenDialog" ref="screenShow" :show="popupShow">
+
+				<view class="screenContent">
+					<scroll-view style="height: 50%;" scroll-y>
+						<view class="closeIcon" @click="closeBtn">
+							×
+						</view>
+						<view class="screenTitle">
+							筛选条件
+						</view>
+
+						<view class="titleItem">检查时间</view>
+						<view class="screenItem">
+							<view class="screenI" style="width: 140px;position: relative;">
+								<dateTimePiccker v-if="inspectStartTime===''" :placeholder="startTime"
+									:start="startTime" fields="minute"
+									@change="bindPickerChangeStart($event,'startTime')" class="dateTimePiccker">
+								</dateTimePiccker>
+								<view v-else>{{inspectStartTime}}</view>
+								<view v-if="inspectStartTime !=''" @click="showTimePicker(1)"
+									style="position: absolute;top: -1vh;left: 34vw;font-size: 16px;">×</view>
+							</view>
+							<span style="color: gray;margin:6% 5px">一</span>
+							<view class="screenI" style="width: 140px;position: relative;">
+								<dateTimePiccker v-if="inspectEndTime===''" :placeholder="startTime" :start="startTime"
+									fields="minute" @change="bindPickerChangeEnd($event,'startTime')"
+									class="dateTimePiccker">
+								</dateTimePiccker>
+								<view v-else>{{inspectEndTime}}</view>
+								<view v-if="inspectEndTime !=''" @click="showTimePicker(2)"
+									style="position: absolute;top: -1vh;left: 34vw;font-size: 16px;">×</view>
+
+							</view>
+						</view>
+						<view class="titleItem">查询类型</view>
+						<view class="screenItem">
+							<view class="screenText" v-for="(item,index) in searchTypeList" :key="index"
+								@click="searchItem(item,index)" :class="{active:chekItm==index}">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="titleItem">问题等级</view>
+						<view class="screenItem">
+							<view class="screenText" v-for="(item,index) in issueLevelList" :key="index"
+								@click="searchItem(item,index)" :class="{active:chekItm2==index}">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="titleItem">状态</view>
+						<view class="screenItem">
+							<view class="screenText" v-for="(item,index) in statusList" :key="index"
+								@click="searchItem(item,index)" :class="{active:chekItm3==index}">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="titleItem">紧急程度</view>
+						<view class="screenItem">
+							<view class="screenText" v-for="(item,index) in urgencyList" :key="index"
+								@click="searchItem(item,index)" :class="{active:chekItm4==index}">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="titleItem">整改人</view>
+						<view class="screenItem">
+							<view v-for="(item, index) in displayedItems1" :key="index" class="screenText"
+								@click="searchItem(item,index)" :class="{active:chekItm5==index}">
+								{{ item.name }}
+							</view>
+							<view v-if="!isExpanded1" @click="expandItems(1)" class="screenText">
+								查看更多
+								<image src="/static/icon-down-ccc.png"
+									style="width: 10px;height: 5px;margin-left: 5px;">
+								</image>
+							</view>
+							<view v-else @click="collapseItems(1)" class="screenTextClose">
+								收起
+							</view>
+						</view>
+						<view class="titleItem">复查人</view>
+						<view class="screenItem">
+							<view v-for="(item, index) in displayedItems2" :key="index" class="screenText"
+								@click="searchItem(item,index)" :class="{active:chekItm6==index}">
+								{{ item.name }}
+							</view>
+							<view v-if="!isExpanded2" @click="expandItems(2)" class="screenText">
+								查看更多
+								<image src="/static/icon-down-ccc.png"
+									style="width: 10px;height: 5px;margin-left: 5px;">
+								</image>
+							</view>
+							<view v-else @click="collapseItems(2)" class="screenTextClose">
+								收起
+							</view>
+						</view>
+						<view class="titleItem">核验人</view>
+						<view class="screenItem">
+							<view v-for="(item, index) in displayedItems3" :key="index" class="screenText"
+								@click="searchItem(item,index)" :class="{active:chekItm7==index}">
+								{{ item.name }}
+							</view>
+							<view v-if="!isExpanded3" @click="expandItems(3)" class="screenText">
+								查看更多
+								<image src="/static/icon-down-ccc.png"
+									style="width: 10px;height: 5px;margin-left: 5px;">
+								</image>
+							</view>
+							<view v-else @click="collapseItems(3)" class="screenTextClose">
+								收起
+							</view>
+						</view>
+						<view class="titleItem">检查人</view>
+						<view class="screenItem">
+							<view v-for="(item, index) in displayedItems4" :key="index" class="screenText"
+								@click="searchItem(item,index)" :class="{active:chekItm8==index}">
+								{{ item.name }}
+							</view>
+							<view v-if="!isExpanded4" @click="expandItems(4)" class="screenText">
+								查看更多
+								<image src="/static/icon-down-ccc.png"
+									style="width: 10px;height: 5px;margin-left: 5px;">
+								</image>
+							</view>
+							<view v-else @click="collapseItems(4)" class="screenTextClose">
+								收起
+							</view>
+						</view>
+
+						<view class="titleItem">检查区域 <span class="regionText">
+								<picker @click="$refs.locationTree._show()" :disabled="true">
+									<view v-if="checkPointName==''" style="margin-left: 140px;color: gray;">
+										请选择
+									</view>
+									<view v-else>
+										<view style="width: 98%;text-align: center" class="ellipsis">{{checkPointName}}
+										</view>
+									</view>
+								</picker>
+							</span></span>
+							<image src="/static/icon-right-ccc.png"
+								style="width: 5px;height: 10px;display: inline-block;margin-bottom: 4px;"></image>
+						</view>
+						<view class="line"></view>
+
+						<view class="footerBtn">
+							<view class="foterLeft" @click="resettingBtn">
+								重置
+							</view>
+							<!-- <view class="foterRight" @click="screenShow=false">
+							完成
+						</view> -->
+							<view class="foterRight" @click="closeRed">
+								查看{{ listNum }}条记录
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+
+			</uni-popup>
+			<!-- 检查部位 -->
+			<!-- <tki-tree ref="locationTree" @confirm="(val)=>checkPointBtn(val,1)" idKey='id' :range="checkPointList"
+				rangeKey="regionName" confirmColor="#4e8af7" /> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import dateTimePiccker from '@/components/dateTimePicker/index.vue'
+
+	export default {
+		components: {
+			dateTimePiccker,
+		},
+		data() {
+			return {
+				popupShow: false,
+				startTime: '请选择日期',
+				searchTypeList: [{
+					name: '全部',
+					type: 1,
+					value: -1
+				}, {
+					name: '安全问题',
+					type: 1,
+					value: 1
+				}, {
+					name: '排查记录',
+					type: 1,
+					value: 2
+				}], //查询类型
+
+				issueLevelList: [{
+						name: '全部',
+						type: 2,
+						value: -1
+					},
+					{
+						name: '一级',
+						type: 2,
+						value: 1
+					},
+					{
+						name: '二级',
+						type: 2,
+						value: 2
+					},
+					{
+						name: '三级',
+						type: 2,
+						value: 3
+					}, {
+						name: '四级',
+						type: 2,
+						value: 4
+					}
+				], //问题等级
+				statusList: [{
+					name: '全部',
+					type: 3,
+					value: -1
+				}, {
+					name: '待整改',
+					type: 3,
+					value: 2
+				}, {
+					name: '待复查',
+					type: 3,
+					value: 3
+				}, {
+					name: '待核验',
+					type: 3,
+					value: 4
+				}, {
+					name: '合格',
+					type: 3,
+					value: 5
+				}, {
+					name: '已撤回',
+					type: 3,
+					value: 6
+				}], //状态
+				urgencyList: [{
+					name: '全部',
+					type: 4,
+					value: -1
+				}, {
+					name: '一般',
+					type: 4,
+					value: 1
+				}, {
+					name: '严重',
+					type: 4,
+					value: 2
+				}, {
+					name: '紧要',
+					type: 4,
+					value: 3
+				}], //紧急程度
+				items: [], //人员列表
+				itemsList: [], //检查人员
+				displayedItems1: [],
+				displayedItems2: [],
+				displayedItems3: [],
+				displayedItems4: [],
+				isExpanded1: false,
+				isExpanded2: false,
+				isExpanded3: false,
+				isExpanded4: false,
+				valueList: [],
+				listNum: 0,
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				inspectStartTime: '', //开始
+				inspectEndTime: '', //结束
+				show: false,
+				screenShow: false,
+				//------------------------------------
+				checkPointList: [], //获取检查部位数据
+				checkPointName: '',
+				type: 1,
+				listData: [],
+				checkedTab: 0,
+				condition: {
+					pageNo: 1,
+					pageSize: 1000,
+					projectSn: "",
+					status: 2,
+					search: '', //搜索字段
+				},
+				teach: true,
+				userInfo: '',
+				regionId: [],
+				chekItm: '',
+				chekItm2: '',
+				chekItm3: '',
+				chekItm4: '',
+				chekItm5: '',
+				chekItm6: '',
+				chekItm7: '',
+				chekItm8: '',
+
+				engineeringId: '',
+				workType: '',
+			}
+		},
+		onLoad(option) {
+			this.condition.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			this.engineeringId = option.engineeringId
+			// console.log(JSON.parse(uni.getStorageSync('userInfo')))
+			this.getCheckPointList();
+			this.workType = Number(option.type)
+		},
+		onShow() {
+			this.listData = [];
+			this.condition.pageNo = 1;
+			this.condition.pageSize = 1000;
+			this.getListData();
+			this.getPeopleList()
+			this.getPeopleData()
+		},
+		//上拉触底时间
+		onReachBottom() {
+			if (this.teach) {
+				this.condition.pageNo = this.condition.pageNo + 1;
+				// this.condition.pageNo = this.condition.pageNo;
+				this.getListData();
+			}
+		},
+		methods: {
+			//点击重新选择时间
+			showTimePicker(type) {
+				if (type == 1) {
+					this.inspectStartTime = '';
+
+				} else {
+					this.inspectEndTime = '';
+
+				}
+			},
+			//关闭筛选
+			closeBtn() {
+				this.$refs.screenShow.close()
+
+				this.popupShow = false;
+				this.resettingBtn()
+			},
+			//重置
+			resettingBtn() {
+				this.listData = []
+				this.inspectStartTime = ""
+				this.inspectEndTime = ""
+				this.condition.inspectStartTime = ''
+				this.condition.inspectEndTime = ''
+				this.condition.recordType = null
+				this.condition.level = null
+				this.condition.status = null
+				this.condition.urgentLevel = null
+				this.condition.changeId = null
+				this.condition.reviewId = null
+				this.condition.verifyManId = null
+				this.condition.inspectManId = null
+				this.condition.projectSn = this.condition.projectSn
+				this.condition.regionId = null
+				this.condition.pageNo = 1;
+				this.condition.pageSize = 1000;
+				this.checkPointName = ""
+				this.chekItm = 0
+				this.chekItm2 = 0
+				this.chekItm3 = 0
+				this.chekItm4 = 0
+				this.chekItm5 = 0
+				this.chekItm6 = 0
+				this.chekItm7 = 0
+				this.chekItm8 = 0
+				this.getListData()
+			},
+			closeRed() {
+				this.$refs.screenShow.close()
+
+				this.popupShow = false;
+			},
+			//点击筛选项
+			searchItem(item, index) {
+
+				if (item.type === 1) {
+					this.chekItm = index
+				}
+				if (item.type === 2) {
+					this.chekItm2 = index
+				}
+				if (item.type === 3) {
+					this.chekItm3 = index
+				}
+				if (item.type === 4) {
+					this.chekItm4 = index
+				}
+				if (item.type === 5) {
+					this.chekItm5 = index
+				}
+				if (item.type === 6) {
+					this.chekItm6 = index
+				}
+				if (item.type === 7) {
+					this.chekItm7 = index
+				}
+				if (item.type === 8) {
+					this.chekItm8 = index
+				}
+				if (item.value === -1) {
+					this.valueList = this.valueList.filter(v => v.type !== item.type)
+					console.log('过滤list :{}', this.valueList.length)
+				}
+				let isSet = true;
+
+				for (var i = 0; i < this.valueList.length; i++) {
+					if (this.valueList[i].type === item.type) {
+						this.valueList[i] = item;
+						isSet = false;
+					}
+				}
+				if (isSet && item.value !== -1) {
+					this.valueList.push(item)
+				}
+				//点击筛选查看数据
+				this.condition.inspectStartTime = this.inspectStartTime
+				this.condition.inspectEndTime = this.inspectEndTime
+				this.condition.recordType = this.fileValueList(1)
+				this.condition.level = this.fileValueList(2)
+				this.condition.status = this.fileValueList(3)
+				this.condition.urgentLevel = this.fileValueList(4)
+				this.condition.changeId = this.fileValueList(5)
+				this.condition.reviewId = this.fileValueList(6)
+				this.condition.verifyManId = this.fileValueList(7)
+				this.condition.inspectManId = this.fileValueList(8)
+				this.condition.projectSn = this.condition.projectSn
+				this.condition.regionId = this.regionId
+
+				let that = this;
+				this.sendRequest({
+					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
+					method: 'post',
+					data: that.condition,
+					success: res => {
+						that.listData = []
+						that.listNum = res.result.page.total
+						let arr = JSON.parse(JSON.stringify(that.listData));
+						if (res.result.page.records.length > 0) {
+							let newArr = arr.concat(res.result.page.records);
+							if (res.result.page.records.length < 10) {
+								that.teach = false;
+							} else {
+								that.teach = true;
+							}
+							that.listData = newArr;
+						} else {
+							that.teach = false;
+						}
+					}
+				})
+				console.log('点击的参数数量 :{}', JSON.stringify(this.valueList))
+			},
+			fileValueList(type) {
+				for (var i = 0; i < this.valueList.length; i++) {
+					if (this.valueList[i].type == type) {
+						return this.valueList[i].value;
+					}
+				}
+				return null;
+			},
+			//搜索
+			handleInput(e) {
+				this.listData = []
+				this.inspectStartTime = ""
+				this.inspectEndTime = ""
+				this.condition.recordType = null
+				this.condition.level = null
+				this.condition.status = null
+				this.condition.urgentLevel = null
+				this.condition.changeId = null
+				this.condition.reviewId = null
+				this.condition.verifyManId = null
+				this.condition.inspectManId = null
+				this.condition.projectSn = this.condition.projectSn
+				this.condition.regionId = null
+				this.checkPointName = ""
+				this.chekItm = 0
+				this.chekItm2 = 0
+				this.chekItm3 = 0
+				this.chekItm4 = 0
+				this.chekItm5 = 0
+				this.chekItm6 = 0
+				this.chekItm7 = 0
+				this.chekItm8 = 0
+				this.condition.search = e.detail.value
+				let that = this;
+				// uni.showLoading({title: '加载中'})
+				this.sendRequest({
+					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
+					method: 'post',
+					data: that.condition,
+					success: res => {
+						console.log(res)
+						that.listNum = res.result.page.total
+						// uni.hideLoading()
+						let arr = JSON.parse(JSON.stringify(that.listData));
+						if (res.result.page.records.length > 0) {
+							let newArr = arr.concat(res.result.page.records);
+							if (res.result.page.records.length < 10) {
+								that.teach = false;
+							} else {
+								that.teach = true;
+							}
+							that.listData = newArr;
+						} else {
+							that.teach = false;
+						}
+					}
+				})
+			},
+			// 展开所有数据
+			expandItems(type) {
+				let netArr = [];
+				let sliceArr = this.items
+				if (type == 1) {
+					netArr.push({
+						name: '全部',
+						type: 5,
+						value: -1
+					})
+					sliceArr.forEach(s => {
+						netArr.push({
+							name: s.realName,
+							type: 5,
+							value: s.userId
+						})
+
+					})
+					this.displayedItems1 = netArr;
+					this.isExpanded1 = true;
+				} else if (type == 2) {
+					netArr.push({
+						name: '全部',
+						type: 6,
+						value: -1
+					})
+					sliceArr.forEach(s => {
+						netArr.push({
+							name: s.realName,
+							type: 6,
+							value: s.userId
+						})
+
+					})
+					this.displayedItems2 = netArr;
+					this.isExpanded2 = true;
+				} else if (type == 3) {
+					netArr.push({
+						name: '全部',
+						type: 7,
+						value: -1
+					})
+					sliceArr.forEach(s => {
+						netArr.push({
+							name: s.realName,
+							type: 7,
+							value: s.userId
+						})
+
+					})
+					this.displayedItems3 = netArr;
+					this.isExpanded3 = true;
+				} else {
+					netArr.push({
+						name: '全部',
+						type: 8,
+						value: -1
+					})
+					this.itemsList.forEach(s => {
+						netArr.push({
+							name: s.realName,
+							type: 8,
+							value: s.userId
+						})
+
+					})
+					this.displayedItems4 = netArr;
+					this.isExpanded4 = true;
+				}
+
+
+			},
+			// 收起数据，只显示前两个
+			collapseItems(type) {
+				let sliceArr = this.items.slice(0, 2);
+				let sliceArr2 = this.itemsList.slice(0, 2)
+				let netArr = [];
+				if (type == 1) {
+					netArr.push({
+						name: "全部",
+						type: 5,
+						value: -1
+					})
+					sliceArr.forEach(s => {
+						netArr.push({
+							name: s.realName,
+							type: 5,
+							value: s.userId
+						})
+
+					})
+					this.displayedItems1 = netArr;
+					this.isExpanded1 = false;
+				} else if (type == 2) {
+					netArr.push({
+						name: "全部",
+						type: 6,
+						value: -1
+					})
+					sliceArr.forEach(s => {
+						netArr.push({
+							name: s.realName,
+							type: 6,
+							value: s.userId
+						})
+
+					})
+					this.displayedItems2 = netArr;
+					this.isExpanded2 = false;
+				} else if (type == 3) {
+					netArr.push({
+						name: "全部",
+						type: 7,
+						value: -1
+					})
+					sliceArr.forEach(s => {
+						netArr.push({
+							name: s.realName,
+							type: 7,
+							value: s.userId
+						})
+
+					})
+					this.displayedItems3 = netArr;
+					this.isExpanded3 = false;
+				} else {
+					netArr.push({
+						name: "全部",
+						type: 8,
+						value: -1
+					})
+					sliceArr2.forEach(s => {
+						netArr.push({
+							name: s.realName,
+							type: 8,
+							value: s.userId
+						})
+
+					})
+					this.displayedItems4 = netArr;
+					this.isExpanded4 = false;
+				}
+			},
+			//筛选开始时间
+			bindPickerChangeStart(e, type) {
+
+				if (type == 'startTime') {
+					this.inspectStartTime = e.f3;
+				}
+				let userInfo = {
+					type: 9,
+					value: -1
+				}
+				this.searchItem(userInfo, 1)
+
+			},
+			//筛选结束时间
+			bindPickerChangeEnd(e, type) {
+				if (type == 'startTime') {
+					this.inspectEndTime = e.f3;
+				}
+				let userInfo = {
+					type: 10,
+					value: -1
+				}
+				this.searchItem(userInfo, 1)
+			},
+			//点击打开筛选
+			screenData() {
+				this.$refs.screenShow.open()
+
+				this.popupShow = true
+				// 默认显示前面2个数据
+				let sliceArr = this.items.slice(0, 2);
+				let sliceArr2 = this.itemsList.slice(0, 2)
+				this.condition.pageNo = 1;
+				this.condition.pageSize = 1000;
+				this.displayedItems1 = []
+				this.displayedItems2 = []
+				this.displayedItems3 = []
+				this.displayedItems4 = []
+
+				this.displayedItems1.push({
+					name: '全部',
+					type: 5,
+					value: -1
+				})
+				this.displayedItems2.push({
+					name: '全部',
+					type: 6,
+					value: -1
+				})
+				this.displayedItems3.push({
+					name: '全部',
+					type: 7,
+					value: -1
+				})
+				this.displayedItems4.push({
+					name: '全部',
+					type: 8,
+					value: -1
+				})
+				console.log("人员数组：", JSON.stringify(sliceArr))
+
+				sliceArr.forEach(s => {
+
+					this.displayedItems1.push({
+						name: s.realName,
+						type: 5,
+						value: s.userId
+					})
+					this.displayedItems2.push({
+						name: s.realName,
+						type: 6,
+						value: s.userId
+					})
+					this.displayedItems3.push({
+						name: s.realName,
+						type: 7,
+						value: s.userId
+					})
+				})
+				sliceArr2.forEach(v => {
+					this.displayedItems4.push({
+						name: v.realName,
+						type: 8,
+						value: v.userId
+					})
+				})
+
+
+			},
+			//获取检查人员列表
+			getPeopleData() {
+				this.sendRequest({
+					url: 'xmgl/systemUser/getSystemUserList',
+					method: 'post',
+					data: {
+						sn: this.condition.projectSn
+					},
+					success: res => {
+						if (res.code == 200) {
+							this.itemsList = res.result
+						}
+					}
+				})
+			}, //获取人员列表
+			getPeopleList() {
+				this.sendRequest({
+					url: 'xmgl/systemUser/getProjectChilderSystemUserList',
+					method: 'post',
+					data: {
+						projectSn: this.condition.projectSn
+					},
+					success: res => {
+						if (res.code == 200) {
+							this.items = res.result
+						}
+					}
+				})
+			},
+			//--------------------------------------
+			//确定选中--回显
+			checkPointBtn(val, type) {
+				if (type == 1) {
+
+					this.regionId = []
+					let arr = JSON.parse(JSON.stringify(val[0].parents));
+					let obj = {
+						id: val[0].id,
+						regionName: val[0].regionName
+					};
+
+					arr.push(obj);
+					this.regionId.push(obj.id)
+
+					//获取选中的字符串 名称
+					var regionName = arr.map(function(item, index) {
+						return item.regionName;
+					}).join("/");
+					this.checkPointName = regionName;
+					let userInfo = {
+						type: 11,
+						value: -1
+					}
+					this.searchItem(userInfo, 1)
+				}
+				// this.listData = [];
+				// this.getListData()
+			},
+			//获取检查部位 列表
+			getCheckPointList() {
+				this.sendRequest({
+					url: 'xmgl/qualityRegion/list',
+					method: 'post',
+					data: {
+						projectSn: this.condition.projectSn
+					},
+					success: res => {
+						if (res.code == 200) {
+							this.checkPointList = res.result;
+						}
+					}
+				})
+			},
+			//切换tab
+			changeTab(type) {
+				this.checkedTab = type;
+				this.condition.status = type;
+				this.condition.pageNo = 1;
+				this.condition.pageSize = 1000;
+				this.listData = [];
+				this.checkPointName = ''
+				this.regionId = []
+				this.getListData()
+			},
+			//获取列表数据
+			getListData() {
+				if (this.checkedTab == 2 || this.checkedTab == 5) {
+					this.condition.changeId = this.userInfo.userId
+					this.condition.reviewId = ''
+					this.condition.verifyManId = ''
+					this.condition.regionId = []
+				} else if (this.checkedTab == 3) {
+					this.condition.reviewId = this.userInfo.userId
+					this.condition.changeId = '';
+					this.condition.verifyManId = ''
+					this.condition.regionId = []
+				} else if (this.checkedTab == 4) {
+					this.condition.verifyManId = this.userInfo.userId
+					this.condition.changeId = '';
+					this.condition.reviewId = ''
+					this.condition.regionId = []
+				} else if (this.checkedTab == 6) {
+					this.condition.status = ''
+					this.condition.verifyManId = ''
+					this.condition.changeId = '';
+					this.condition.reviewId = ''
+					this.condition.regionId = this.regionId
+				} else if (this.checkedTab == 0) {
+					this.condition.status = ''
+					this.condition.verifyManId = ''
+					this.condition.changeId = '';
+					this.condition.reviewId = ''
+					this.condition.engineeringId = this.engineeringId
+					this.condition.recordType = 1
+					// this.condition.regionId = this.regionId
+				} else if (this.checkedTab == 9) {
+					this.condition.status = ''
+					this.condition.verifyManId = ''
+					this.condition.changeId = '';
+					this.condition.reviewId = ''
+					this.condition.recordType = 2
+					this.condition.engineeringId = this.engineeringId
+					// this.condition.regionId = this.regionId
+				} else {
+					this.condition.status = ''
+					this.condition.reviewId = '';
+					this.condition.changeId = '';
+					this.condition.verifyManId = ''
+					this.condition.regionId = ''
+
+				}
+				console.log('查询列表条件数据', this.checkedTab)
+				let that = this;
+				// uni.showLoading({title: '加载中'})
+				that.condition.type = that.workType
+				this.sendRequest({
+					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
+					method: 'post',
+					data: that.condition,
+					success: res => {
+						console.log(res)
+						that.listNum = res.result.page.total
+						// uni.hideLoading()
+						let arr = JSON.parse(JSON.stringify(that.listData));
+						if (res.result.page.records.length > 0) {
+							let newArr = arr.concat(res.result.page.records);
+							if (res.result.page.records.length < 10) {
+								that.teach = false;
+							} else {
+								that.teach = true;
+							}
+							that.listData = newArr;
+						} else {
+							that.teach = false;
+						}
+					}
+				})
+			},
+			goDetails(obj) {
+				// uni.navigateTo({
+				//   url: './details?id=' + id + '&type=' + this.checkedTab
+				// })
+				console.log("====================================");
+				console.log("====================================");
+				console.log("====================================");
+				uni.navigateTo({
+					url: '../../safeSame/details?id=' + obj.id + '&type=' + obj.status
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.line {
+		width: 100%;
+		height: 1px;
+		background-color: #ccc;
+		margin-top: 3%;
+	}
+
+	.screenDialog {
+		position: absolute;
+		// top: 11%;
+		height: 95%;
+		/* background: pink; */
+		background: white;
+		width: 100%;
+		border-radius: 20px;
+		margin-left: -4%;
+		background-color: white;
+		/* 设置为半透明的灰色 */
+		z-index: 9;
+		/* 设置一个较大的 z-index 值，保证遮罩层在最上层 */
+
+
+		.closeIcon {
+			float: right;
+			font-size: 25px;
+			color: gray;
+			margin-right: 3%;
+		}
+
+		.screenTitle {
+			text-align: center;
+			margin-top: 4%;
+			font-size: 18px;
+			font-weight: 500;
+		}
+
+		.screenContent {
+			height: 60%;
+			// width: 90%;
+			margin: -65% 0%;
+			overflow: scroll;
+			position: relative;
+			margin-top: 180%;
+			border-radius: 20px;
+			// margin-left: -4%;
+			background-color: white;
+			padding-left: 10%;
+
+			.titleItem {
+				font-size: 14px;
+
+				.regionText {
+					display: inline-block;
+					margin-left: 16%;
+					width: 190px;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
+				}
+			}
+		}
+
+		.screenItem {
+			display: flex;
+			flex-wrap: wrap;
+
+			.screenI {
+				width: 100px;
+				font-size: 12px;
+				height: 30px;
+				background: #f7f8fa;
+				border-radius: 15px;
+				text-align: center;
+				line-height: 30px;
+				color: gray;
+				margin: 5% 0;
+			}
+
+			.screenText {
+				width: 90px;
+				font-size: 12px;
+				height: 30px;
+				background: #f7f8fa;
+				border-radius: 15px;
+				text-align: center;
+				line-height: 30px;
+				color: #000;
+				margin: 5% 5% 5% 0%;
+			}
+
+			.active {
+				width: 90px;
+				font-size: 12px;
+				height: 30px;
+				background: #edf2fe;
+				border-radius: 15px;
+				text-align: center;
+				line-height: 30px;
+				color: #000;
+				margin: 5% 5% 5% 0%;
+				border: 1px solid #5181f6;
+			}
+
+			.screenTextClose {
+				width: 90px;
+				font-size: 12px;
+				height: 30px;
+				text-align: center;
+				line-height: 30px;
+				color: #000;
+				margin: 5% 5% 5% 0%;
+			}
+		}
+
+		.footerBtn {
+			display: flex;
+			text-align: center;
+			line-height: 40px;
+			margin-top: 2%;
+			margin-left: 6%;
+
+			.foterLeft {
+				width: 43%;
+				background: #f6f7f8;
+				height: 40px;
+				border-top-left-radius: 20px;
+				border-bottom-left-radius: 20px;
+				color: #5181f6;
+			}
+
+			.foterRight {
+				width: 43%;
+				background: #5181f6;
+				height: 40px;
+				border-top-right-radius: 20px;
+				border-bottom-right-radius: 20px;
+				color: #fff;
+			}
+		}
+
+	}
+
+	.searchBox {
+		background-color: white;
+	}
+
+	.uni-form-item {
+		position: relative;
+		display: flex;
+		font-size: 14px;
+		/* .search-icon{
+			position: absolute;
+			top: 50%;
+			right: 50rpx;
+			transform: translateY(-50%);
+		} */
+	}
+
+	.uni-input {
+		border-radius: 20px;
+		margin: 10px 10px;
+		background-color: #f7f8fa;
+		height: 35px;
+		line-height: 30px;
+		padding: 0 20px;
+		font-size: 14px;
+		width: 70%;
+	}
+
+	.screen {
+		line-height: 50px;
+		color: gray;
+	}
+
+	.picker {
+		margin-bottom: 15px;
+		margin-left: 100px;
+		width: 164px;
+		border: 1px solid #ccc;
+		height: 30px;
+		border-radius: 10px;
+	}
+
+	.flex {
+		display: flex;
+		align-items: center;
+	}
+
+	.flex2 {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.tab {
+		width: 100%;
+		height: 45px;
+		text-align: center;
+		box-shadow: 0 0 10px rgba(194, 194, 194, 0.5);
+	}
+
+	.tabType {
+		// width: 33%;
+		width: 50%;
+		line-height: 43px;
+		border-bottom: 1px solid rgba(194, 194, 194, 0.2);
+
+	}
+
+	.checkedTab {
+		color: #4181FE;
+		border-bottom: 2px solid #4181FE;
+
+	}
+
+	.noCheckTab {
+		padding-bottom: 2px;
+	}
+
+	.content {
+		padding: 0px 30rpx 0;
+		box-sizing: border-box;
+		width: 100%;
+	}
+
+	.item {
+		height: 160px;
+		width: 100%;
+		padding: 12px 30rpx;
+		box-sizing: border-box;
+		box-shadow: 0 0 10px rgba(194, 194, 194, 0.5);
+		border-radius: 4px;
+		margin-bottom: 15px;
+		color: rgba(51, 51, 51, 1);
+		font-size: 32rpx;
+		font-family: PingFangSC-Medium;
+
+
+	}
+
+	.rightStatus {
+		float: right;
+		font-size: 12px;
+		margin-top: -18px;
+		width: 60px;
+		height: 20px;
+		text-align: center;
+		border-radius: 10px;
+		color: #fff;
+		line-height: 18px;
+	}
+
+	.item_title {
+		font-weight: 600;
+		margin-bottom: 2px;
+	}
+
+	.item_content {
+		width: 100%;
+		font-size: 28rpx;
+		color: rgba(51, 51, 51, 1);
+		font-family: PingFangSC-Regular;
+		line-height: 28px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		color: #999;
+
+	}
+
+	.item_info {
+		font-size: 26rpx;
+		line-height: 24px;
+		font-family: PingFangSC-Regular;
+		color: #999;
+	}
+
+	.state {
+		padding: 0px 8px;
+		color: #fff;
+		box-sizing: border-box;
+		border-radius: 30px;
+		font-size: 24rpx;
+	}
+
+	.bg1 {
+		background-color: rgba(245, 166, 35, 1);
+		box-shadow: 0px 2px 0px rgba(242, 76, 50, 0.28);
+	}
+
+	.bg2 {
+		background-color: rgba(88, 86, 214, 1);
+		box-shadow: 0px 2px 0px rgba(87, 81, 217, 0.28);
+	}
+
+	.bg3 {
+		background-color: rgba(238, 94, 94, 1);
+		box-shadow: 0px 2px 0px rgba(236, 92, 98, 0.28);
+	}
+
+	.bg4 {
+		background-color: rgba(76, 217, 100, 1);
+		box-shadow: 0px 2px 0px rgba(68, 219, 94, 0.28);
+	}
+
+	.noData {
+		text-align: center;
+		font-size: 32rpx;
+		margin-top: 120px;
+		color: #bed0fb;
+	}
+
+	.noDataImg {
+		width: 125px;
+		height: 98px;
+	}
+
+	::v-deep .tki-tree-cnt {
+		z-index: 99999;
+		border-radius: 20px;
+	}
+
+	::v-deep .tki-tree-bar {
+		border-top-left-radius: 20px;
+		border-top-right-radius: 20px;
+	}
+
+	::v-deep .placeholder {
+		padding-left: 40px;
+	}
+
+	.popupShow {
+		overflow: hidden;
+		// position: fixed;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/safeMesure.vue b/pages/projectEnd/specialOperations/fireWork - 副本/safeMesure.vue
new file mode 100644
index 00000000..3579d01a
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/safeMesure.vue	
@@ -0,0 +1,95 @@
+<template>
+	<view class="safe-mesure">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				安全措施
+			</view>
+		</headers>
+		<view class="safe-mesure-container">
+			<view class="safe-mesure-header">
+				<view class="header-left">安全措施</view>
+				<view class="header-right">是否涉及</view>
+			</view>
+			<view class="safe-mesure-list">
+				<view class="safe-mesure-item">
+					<view class="item-left">
+						1.动火设备内部构件清洗干净,蒸汽吹扫或水洗、置换合格,达到动火条件
+					</view>
+					<view class="item-right" style="color: green;">是</view>
+				</view>
+				<view class="safe-mesure-item">
+					<view class="item-left">
+						2.与动火设备相连接的所有管线已断开,加盲板()块,未采取水封或仅关闭阀的方式代替盲板
+					</view>
+					<view class="item-right" style="color: red;">否</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+.safe-mesure{
+	min-height: 100%;
+	background: #F6F6F6;
+	.fixedheader{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 2;
+	}
+	.safe-mesure-container{
+		margin-top: 88rpx;
+		padding: 0 20rpx;
+		// background-color: darkred;
+		.safe-mesure-header{
+			display: flex;
+			// justify-content: space-between;
+			margin-top: 10rpx;
+			line-height: 80rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #81818c;
+			.header-left{
+				width: 65%;
+				display: flex;
+				justify-content: center;
+			}
+			.header-right{
+				width: 35%;
+				display: flex;
+				justify-content: center;
+			}
+		}
+		.safe-mesure-list{
+			.safe-mesure-item{
+				display: flex;
+				// justify-content: space-between;
+				margin-top: 15rpx;
+				// line-height: 40rpx;
+				.item-left{
+					width: 65%;
+				}
+				.item-right{
+					width: 35%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+				
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/side.vue b/pages/projectEnd/specialOperations/fireWork - 副本/side.vue
new file mode 100644
index 00000000..c9f3a397
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/side.vue	
@@ -0,0 +1,145 @@
+<template>
+	<view class="control">
+		<!-- <view class="control-h2 flex j-between a-center">
+			进度记录
+			<view class="control-total">0/10</view>
+		</view> -->
+		<view class="control-list" v-if="listData && listData.length>0">
+			<view class="control-item" v-for="(item,index) in listData" :key="index">
+				<view class="item-title b-bottom">
+					{{item.sideStationAddr}}
+				</view>
+				<view class="item-select-box b-bottom" :class="{'b-bottom': item.imageUrl}">
+					<view class="item-content">旁站记录：{{item.buildSituation}}</view>
+				</view>
+				<view class="item-img" v-if="item.imageUrl">
+					现场照片
+					<view class="img-wrap flex a-center">
+						<view class="imgBox" v-for="(item,index) in item.imageUrl.split(',')" :key="index">
+							<image :src="url_config+'image/'+item" class="img"
+								@click="previewImage(url_config+'image/'+item)"></image>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<view class="no-data" v-else>
+			<image class="img" src="/static/noData.png"></image>
+			<text class="txt">暂无数据</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:['detailId'],
+		data(){
+			return{
+				listData:[]
+			}
+		},
+		created(){
+			this.initData()
+		},
+		methods:{
+			previewImage(url) {
+				uni.previewImage({
+					urls: [url]
+				})
+			},
+			initData(){
+				this.sendRequest({
+					url:'xmgl/dangerousEngineeringSideStation/selectList',
+					method:'post',
+					data: {
+						engineeringId: this.detailId,
+						type:2,
+					},
+					success:res=>{
+						uni.hideLoading()
+						if(res.code==200){
+							this.listData = res.result
+							console.log(res)
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.control{
+		padding-top: 20rpx;
+		padding-bottom: 40rpx;
+		.flex{
+			display: flex;
+		}
+		.j-between{
+			justify-content: space-between;
+		}
+		.a-center{
+			align-items: center;
+		}
+		.b-bottom{
+			border-bottom: 1px solid #F6F6F6;
+		}
+		.control-h2{
+			font-size: 14px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			background: rgba(255,255,255,0.5);
+		}
+		.control-list{
+			font-size: 14px;
+			.control-item{
+				padding: 0 20rpx;
+				margin-bottom: 20rpx;
+				background: #fff;
+				.item-title{
+					font-weight: 600;
+					height: 72rpx;
+					line-height: 72rpx;
+				}
+			}
+			.item-select-box{
+				padding: 30rpx 0;
+				.item-content{
+					width: 100%;
+				}
+				
+			}
+			.img-wrap{
+				margin-top: 20rpx;
+				flex-wrap: wrap;
+			}
+			.item-img{
+				padding: 30rpx 0;
+				.imgBox{
+					width: 100rpx;
+					height: 100rpx;
+					margin-left: 20rpx;
+					.img{
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+		.no-data{
+			text-align: center;
+			.img{
+				display: block;
+				height: 200rpx;
+				width: 200rpx;
+				margin: 0 auto;
+				margin-top: 60rpx;
+				margin-bottom: 60rpx;
+			}
+			.txt{
+				color: #C0C4CC;
+			}
+		}
+	}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/work.vue b/pages/projectEnd/specialOperations/fireWork - 副本/work.vue
new file mode 100644
index 00000000..b78d82f6
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/work.vue	
@@ -0,0 +1,211 @@
+<template>
+	<view class="dangerbig-list">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				动火作业
+			</view>
+			
+		</headers>
+		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
+			<view class="list" v-if="workList && workList.length>0">
+				<view class="list-item" v-for="(item,index) in workList" :key="index" @click="checkItem(item)">
+					<view class="list-title">
+						<!-- 未销项 -->
+						<view>
+							<!-- <text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text> -->
+							动火地点和动火部位：{{item.fireLocationAndFirePart}}
+						</view>
+						<!-- <view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3}">
+							{{item.engineeringState == 2 ? "在施" : item.engineeringState == 3 ? "已完工" : ""}}
+						</view> -->
+						<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
+							{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}
+						</view> -->
+					</view>
+					<view class="list-content">
+						<view class="list-info">
+							<!-- 类别：{{item.engineeringTypeName}} -->
+							动火人：{{item.firemanName}}
+							<!-- <view class="info-status" v-if="item.issuperdanger">超危</view> -->
+						</view>
+					</view>
+				</view>
+				<view class="loadMoreBox" v-if="isLoadMore">
+					<uni-load-more :status="loadStatus" iconType="auto"></uni-load-more>
+				</view>
+			</view>
+			<view class="no-data" v-else>
+				<image class="img" src="/static/noData.png"></image>
+				<text class="txt">暂无数据</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				statusBarHeight: 0,
+				pageNo: 1,
+				pageSize: 10,
+				projectSn: "",
+				listData:[],
+				isLoadMore: false,
+				loadStatus: 'more',
+				workList: [],
+			}
+		},
+		onShow(){
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
+			this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn
+		},
+		onLoad(){
+			this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn
+			// this.initData()
+			this.getWorkList()
+		},
+		onReachBottom() {
+			console.log(1)
+			if(!this.isLoadMore){  //此处判断，上锁，防止重复请求
+				this.isLoadMore=true
+				this.pageNo+=1
+				this.getWorkList()
+			}
+		},
+		onPullDownRefresh() {
+			console.log(2)
+			this.pageNo=1
+			this.listData=[]
+			this.getWorkList()
+		},
+		methods:{
+			getWorkList(){
+				let data = {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					projectSn: this.projectSn
+				}
+				this.sendRequest({
+					url:'xmgl/xzSpecialOperationFireSafety/page',
+					method:'get',
+					data:data,
+					success:res=>{
+						uni.hideLoading()
+						if(res.code==200){
+						console.log("workList======================",res)
+							// this.listData = res.result.records
+							// this.workList=this.workList.concat(res.result)
+							this.workList=this.workList.concat(res.result.records)
+							if(res.result.records.length<this.pageSize){  //判断接口返回数据量小于请求数据量，则表示此为最后一页
+								  this.isLoadMore=true                                             
+								  this.loadStatus='nomore'
+							}else{
+								  this.isLoadMore=false
+								  // that.loadStatus='more'
+							}
+							uni.stopPullDownRefresh()
+						}
+					}
+				})
+			},
+			
+			checkItem(val){
+				console.log(val)
+				uni.navigateTo({
+					url:'./detail?id='+val.id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.dangerbig-list{
+	min-height: 100%;
+	background: #F6F6F6;
+	.fixedheader{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 2;
+		.headerName{
+			z-index: 1;
+		}
+	}
+	
+	.list{
+		padding:20rpx 0;
+		.list-item{
+			background: #fff;
+			margin-bottom: 20rpx;
+			.list-title{
+				padding: 20rpx;
+				border-bottom: 2px solid #F6F6F6;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.tag{
+					background: #F0AD4E;
+					color: #fff;
+					padding: 4rpx 8rpx;
+					font-size: 12px;
+					margin-right: 20rpx;
+					margin-left: -20rpx;
+					height: 32rpx;
+				}
+				.status1{
+					background: #F0AD4E;
+					color: #fff;
+					padding: 4rpx 8rpx;
+					font-size: 12px;
+				}
+				.status2{
+					background: #ccc;
+					color: #fff;
+					padding: 4rpx 8rpx;
+					font-size: 12px;
+				}
+			}
+			.list-info{
+				display: flex;
+				padding: 20rpx;
+				font-size: 14px;
+			}
+			.info-status{
+				padding:0 10rpx;
+				border: 1px solid #DD524D;
+				border-radius: 6rpx;
+				color: #DD524D;
+				margin-left: 10rpx;
+			}
+		}
+	}
+	.btn{
+		height: 96rpx;
+		width: 100%;
+		line-height: 96rpx;
+		text-align: center;
+		background: #4181FE;
+		color: #fff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+	}
+	.no-data{
+		text-align: center;
+		.img{
+			display: block;
+			height: 200rpx;
+			width: 200rpx;
+			margin: 0 auto;
+			margin-top: 60rpx;
+			margin-bottom: 60rpx;
+		}
+		.txt{
+			color: #C0C4CC;
+		}
+	}
+}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/workFinally.vue b/pages/projectEnd/specialOperations/fireWork - 副本/workFinally.vue
new file mode 100644
index 00000000..1eb35c4e
--- /dev/null
+++ b/pages/projectEnd/specialOperations/fireWork - 副本/workFinally.vue	
@@ -0,0 +1,92 @@
+<template>
+	<view class="danger-project">
+		<view class="" v-if="finallyCheckList.length > 0">
+			<view class="finally" v-for="item in finallyCheckList" :key="item.id">
+				<view style="padding:10px;">
+					<text style="font-weight: bold;">动火作业</text>
+					<!-- {{item.engineeringName}} -->
+				</view>
+				<view style="padding:10px;">
+					<text style="font-weight: bold;">验收时间：</text>{{item.planTime}}
+				</view>
+				<view style="padding:10px;">
+					<text style="font-weight: bold;">验收人：</text>{{item.acceptanceUserName}}
+				</view>
+				<view style="padding:10px;">
+					<text style="font-weight: bold;" v-if="item.acceptanceResult === null || item.acceptanceResult === undefined">验收结果：待确认</text>
+					<text style="font-weight: bold;" v-if="item.acceptanceResult === 1">验收结果：合格</text>
+					<text style="font-weight: bold;" v-if="item.acceptanceResult === 2">验收结果：不合格</text>
+				</view>
+			</view>
+		</view>
+		<view class="no-data" v-else>
+			<image class="img" src="/static/noData.png"></image>
+			<text class="txt">暂无数据</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:['detailId','detailData'],
+		data() {
+			return {
+				finallyCheckList: [],
+			};
+		},
+		created() {
+			this.initData()
+		},
+		onLoad(val) {
+		},
+		onShow() {
+			
+		},
+		methods:{
+			initData(){
+				let engineeringId = this.detailId
+				this.sendRequest({
+					url:'xmgl/xzDangerousEngineeringAcceptance/list',
+					method:'get',
+					data:{
+						engineeringId: this.detailId,
+						projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
+						type: 2
+					},
+					success:res=>{
+						uni.hideLoading()
+						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
+						this.finallyCheckList = res.result;
+					}
+				})
+			},
+			sendMessage(val){
+				this.$emit('message', val);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.danger-project{	
+	.finally{
+		background-color: #fff;
+		height: 150px;
+		margin: 10px;
+	}
+	.no-data{
+		text-align: center;
+		.img{
+			display: block;
+			height: 200rpx;
+			width: 200rpx;
+			margin: 0 auto;
+			margin-top: 60rpx;
+			margin-bottom: 60rpx;
+		}
+		.txt{
+			color: #C0C4CC;
+		}
+	}
+}
+</style>
diff --git a/pages/projectEnd/specialOperations/fireWork/addSide.vue b/pages/projectEnd/specialOperations/fireWork/addSide.vue
index 1cfe1132..4881eb60 100644
--- a/pages/projectEnd/specialOperations/fireWork/addSide.vue
+++ b/pages/projectEnd/specialOperations/fireWork/addSide.vue
@@ -164,7 +164,7 @@
 					buildSituation: this.formData.buildSituation,
 					dangerousEngineeringId: this.formData.dangerousEngineeringId,
 					createUser: JSON.parse(uni.getStorageSync('userInfo')).userId,
-					type:2
+					type: 2
 				}
 				let arr = []
 				this.formData.imgFileList.forEach(item=>{
diff --git a/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue b/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue
index 77b51522..e8c57fbd 100644
--- a/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue
+++ b/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue
@@ -144,7 +144,7 @@
 					acceptanceUnitId: this.enterpriseId,
 					acceptanceUserId: this.acceptancePerson.userId,
 					planTime: this.planTime,
-					type:2
+					type: 2
 				}
 				console.log(data);
 				if(!data.acceptanceUnitId){
diff --git a/pages/projectEnd/specialOperations/fireWork/check.vue b/pages/projectEnd/specialOperations/fireWork/check.vue
index 996308f0..4917d094 100644
--- a/pages/projectEnd/specialOperations/fireWork/check.vue
+++ b/pages/projectEnd/specialOperations/fireWork/check.vue
@@ -246,7 +246,7 @@
 					acceptanceResult: this.formData.acceptanceResult,	//验收结果
 					acceptanceDesc: this.formData.acceptanceDescribe,	//验收描述
 					photo: this.formData.imgFileList[0].url,
-					type:2
+					type: 2
 				}
 				// data.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId;
 				// let arr = []
diff --git a/pages/projectEnd/specialOperations/fireWork/checkList.vue b/pages/projectEnd/specialOperations/fireWork/checkList.vue
index a85e8e9d..010ca541 100644
--- a/pages/projectEnd/specialOperations/fireWork/checkList.vue
+++ b/pages/projectEnd/specialOperations/fireWork/checkList.vue
@@ -61,7 +61,7 @@
 					data:{
 						projectSn: this.projectSn,
 						acceptanceUserId: this.userInfo.userId,
-						type:2
+						type: 2
 					},
 					success:res=>{
 						uni.hideLoading()
diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue
index a511c578..84fd5483 100644
--- a/pages/projectEnd/specialOperations/fireWork/detail.vue
+++ b/pages/projectEnd/specialOperations/fireWork/detail.vue
@@ -222,7 +222,7 @@
 					data:{
 						engineeringId: this.detailData.id,
 						projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
-						type:2
+						type: 2
 					},
 					success:res=>{
 						uni.hideLoading()
diff --git a/pages/projectEnd/specialOperations/fireWork/plan.vue b/pages/projectEnd/specialOperations/fireWork/plan.vue
index 77a2d7c7..88e6fd10 100644
--- a/pages/projectEnd/specialOperations/fireWork/plan.vue
+++ b/pages/projectEnd/specialOperations/fireWork/plan.vue
@@ -52,7 +52,10 @@
 				this.sendRequest({
 					url:'xmgl/dangerousEngineeringProgressRecord/list',
 					method:'post',
-					data: {engineeringId: this.detailId,type: 2},
+					data: {
+						engineeringId: this.detailId,
+						type: 2,
+					},
 					success:res=>{
 						uni.hideLoading()
 						if(res.code==200){
diff --git a/pages/projectEnd/specialOperations/fireWork/safeList.vue b/pages/projectEnd/specialOperations/fireWork/safeList.vue
index ad22a21b..24c3ce4e 100644
--- a/pages/projectEnd/specialOperations/fireWork/safeList.vue
+++ b/pages/projectEnd/specialOperations/fireWork/safeList.vue
@@ -376,7 +376,7 @@
 			this.engineeringId = option.engineeringId
 			// console.log(JSON.parse(uni.getStorageSync('userInfo')))
 			this.getCheckPointList();
-			this.workType = option.type
+			this.workType = Number(option.type)
 		},
 		onShow() {
 			this.listData = [];
@@ -951,7 +951,7 @@
 				console.log('查询列表条件数据', this.checkedTab)
 				let that = this;
 				// uni.showLoading({title: '加载中'})
-				that.condition.type = Number(that.workType)
+				that.condition.type = that.workType
 				this.sendRequest({
 					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
 					method: 'post',
diff --git a/pages/projectEnd/specialOperations/fireWork/side.vue b/pages/projectEnd/specialOperations/fireWork/side.vue
index 537c4a1c..c9f3a397 100644
--- a/pages/projectEnd/specialOperations/fireWork/side.vue
+++ b/pages/projectEnd/specialOperations/fireWork/side.vue
@@ -52,7 +52,10 @@
 				this.sendRequest({
 					url:'xmgl/dangerousEngineeringSideStation/selectList',
 					method:'post',
-					data: {engineeringId: this.detailId,type:2},
+					data: {
+						engineeringId: this.detailId,
+						type:2,
+					},
 					success:res=>{
 						uni.hideLoading()
 						if(res.code==200){
diff --git a/pages/projectEnd/specialOperations/fireWork/work.vue b/pages/projectEnd/specialOperations/fireWork/work.vue
index 7e9e3443..b78d82f6 100644
--- a/pages/projectEnd/specialOperations/fireWork/work.vue
+++ b/pages/projectEnd/specialOperations/fireWork/work.vue
@@ -70,15 +70,13 @@
 			if(!this.isLoadMore){  //此处判断，上锁，防止重复请求
 				this.isLoadMore=true
 				this.pageNo+=1
-				// this.initData()
-			this.getWorkList()
+				this.getWorkList()
 			}
 		},
 		onPullDownRefresh() {
 			console.log(2)
 			this.pageNo=1
 			this.listData=[]
-			// this.initData()
 			this.getWorkList()
 		},
 		methods:{
@@ -117,35 +115,7 @@
 				uni.navigateTo({
 					url:'./detail?id='+val.id
 				})
-			},
-			// initData(){
-			// 	let data = {
-			// 		pageNo: this.pageNo,
-			// 		pageSize: this.pageSize,
-			// 		projectSn: this.projectSn
-			// 	}
-			// 	this.sendRequest({
-			// 		url:'xmgl/dangerousEngineeringRecord/list',
-			// 		method:'post',
-			// 		data:data,
-			// 		success:res=>{
-			// 			uni.hideLoading()
-			// 			if(res.code==200){
-			// 				// this.listData = res.result.records
-			// 				this.listData=this.listData.concat(res.result.records)
-			// 				if(res.result.records.length<this.pageSize){  //判断接口返回数据量小于请求数据量，则表示此为最后一页
-			// 					  this.isLoadMore=true                                             
-			// 					  this.loadStatus='nomore'
-			// 				}else{
-			// 					  this.isLoadMore=false
-			// 					  // that.loadStatus='more'
-			// 				}
-			// 				uni.stopPullDownRefresh()
-			// 			}
-			// 			console.log(res)
-			// 		}
-			// 	})
-			// },
+			}
 		}
 	}
 </script>
diff --git a/pages/projectEnd/specialOperations/fireWork/workFinally.vue b/pages/projectEnd/specialOperations/fireWork/workFinally.vue
index 6b76056a..1eb35c4e 100644
--- a/pages/projectEnd/specialOperations/fireWork/workFinally.vue
+++ b/pages/projectEnd/specialOperations/fireWork/workFinally.vue
@@ -51,7 +51,7 @@
 					data:{
 						engineeringId: this.detailId,
 						projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
-						type:2
+						type: 2
 					},
 					success:res=>{
 						uni.hideLoading()

From e2ba240c80e3124b02f1cb3dcfa270231ba616a2 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Thu, 16 May 2024 12:23:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectEnd/dangerBigProject/list/list.vue |    6 +-
 .../fireWork - 副本/addPlan.vue               |  333 -----
 .../fireWork - 副本/addSide.vue               |  337 -----
 .../fireWork - 副本/addWorkFinally.vue        |  375 -----
 .../fireWork - 副本/check.vue                 |  505 -------
 .../fireWork - 副本/checkList.vue             |  132 --
 .../fireWork - 副本/detail.vue                |  402 -----
 .../fireWork - 副本/plan.vue                  |  145 --
 .../fireWork - 副本/safe.vue                  |   62 -
 .../fireWork - 副本/safeList.vue              | 1329 -----------------
 .../fireWork - 副本/safeMesure.vue            |   95 --
 .../fireWork - 副本/side.vue                  |  145 --
 .../fireWork - 副本/work.vue                  |  211 ---
 .../fireWork - 副本/workFinally.vue           |   92 --
 .../specialOperations/fireWork/safeList.vue   |    2 +
 15 files changed, 7 insertions(+), 4164 deletions(-)
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/addPlan.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/addSide.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/addWorkFinally.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/check.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/checkList.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/detail.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/plan.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/safe.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/safeList.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/safeMesure.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/side.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/work.vue
 delete mode 100644 pages/projectEnd/specialOperations/fireWork - 副本/workFinally.vue

diff --git a/pages/projectEnd/dangerBigProject/list/list.vue b/pages/projectEnd/dangerBigProject/list/list.vue
index 78769ce9..9889b7a3 100644
--- a/pages/projectEnd/dangerBigProject/list/list.vue
+++ b/pages/projectEnd/dangerBigProject/list/list.vue
@@ -367,12 +367,14 @@
 				chekItm8: '',
 
 				engineeringId: '',
+				workType: ''
 			}
 		},
 		onLoad(option) {
 			this.condition.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
 			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.engineeringId = option.engineeringId
+			this.workType = Number(option.type)
 			// console.log(JSON.parse(uni.getStorageSync('userInfo')))
 			this.getCheckPointList();
 
@@ -503,6 +505,7 @@
 				this.condition.regionId = this.regionId
 
 				let that = this;
+				that.condition.type = that.workType
 				this.sendRequest({
 					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
 					method: 'post',
@@ -561,6 +564,7 @@
 				this.condition.search = e.detail.value
 				let that = this;
 				// uni.showLoading({title: '加载中'})
+				that.condition.type = that.workType
 				this.sendRequest({
 					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
 					method: 'post',
@@ -950,7 +954,7 @@
 				console.log('查询列表条件数据', this.checkedTab)
 				let that = this;
 				// uni.showLoading({title: '加载中'})
-				that.condition.type = 1
+				that.condition.type = that.workType
 				this.sendRequest({
 					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
 					method: 'post',
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/addPlan.vue b/pages/projectEnd/specialOperations/fireWork - 副本/addPlan.vue
deleted file mode 100644
index 2a456036..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/addPlan.vue	
+++ /dev/null
@@ -1,333 +0,0 @@
-<template>
-	<view class="addPlan">
-		<headers class="fixedheader" :themeType="true" :showBack="true">
-			<view class="headerName">
-				{{title}}
-			</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" :maxlength="22" type="text" :value="formData.dutyRegion" @blur="bindInputBlur" placeholder="请输入责任区域" />
-				</view>
-				<view class="form-item f-column b-bottom">
-					<view class="form-lable"><text class="tag">*</text>进度描述</view>
-					 <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.progressDescribe" placeholder="请输入进度描述" />
-					<view class="txt-length">{{textareaLengh}}/50</view>
-				</view>
-				<view class="form-item f-column">
-					<view class="form-lable"><text class="tag">*</text>现场照片</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>
-				
-			</view>
-		</view>
-		<view class="save-btn" @click="saveForm">保存</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data(){
-			return{
-				statusBarHeight: 0,
-				title: "新增进度记录",
-				formData:{
-					dutyRegion: "",
-					progressDescribe: "",
-					imgFileList:[],
-					engineeringId: "",
-					createUser: "",
-					createUserName: ""
-				},
-				textareaLengh: 0,
-			}
-		},
-		onShow(){
-			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
-			this.formData.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId;
-			this.formData.createUserName = JSON.parse(uni.getStorageSync('userInfo')).realName
-		},
-		onLoad(val){
-			this.formData.engineeringId = val.id
-		},
-		methods:{
-			bindTextAreaBlur(e){
-				console.log(e)
-				this.formData.progressDescribe = e.detail.value
-			},
-			bindInputBlur(e){
-				console.log(e)
-				this.formData.dutyRegion = 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(){
-				let data = {
-					type: 2,
-					dutyRegion: this.formData.dutyRegion,
-					progressDescribe: this.formData.progressDescribe,
-					engineeringId: this.formData.engineeringId,
-					createUser: this.formData.createUser,
-					createUserName: this.formData.createUserName
-				}
-				let arr = []
-				this.formData.imgFileList.forEach(item=>{
-					arr.push(item.url)
-				})
-				data.imageUrl = arr.join(',')
-				if(!data.dutyRegion){
-					uni.showToast({
-					    title: '请输入责任区域',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(!data.progressDescribe){
-					uni.showToast({
-					    title: '请输入进度描述',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(!data.imageUrl){
-					uni.showToast({
-					    title: '请上传图片',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				this.sendRequest({
-					url:'xmgl/dangerousEngineeringProgressRecord/add',
-					method:'post',
-					data: data,
-					success:res=>{
-						uni.hideLoading()
-						if(res.code==200){
-							uni.showToast({
-								title:'保存成功'
-							})
-							uni.navigateBack({})
-						}
-						console.log(res)
-					}
-				})
-				// console.log(data)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	
-.addPlan{
-	min-height: 100%;
-	background: #F6F6F6;
-	/deep/ .uni-input-wrapper{
-		font-size: 14px;
-	}
-	.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{
-				width: 57%;
-				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;
-				}
-			}
-			font-size: 14px;
-		}
-	}
-}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/addSide.vue b/pages/projectEnd/specialOperations/fireWork - 副本/addSide.vue
deleted file mode 100644
index 4881eb60..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/addSide.vue	
+++ /dev/null
@@ -1,337 +0,0 @@
-<template>
-	<view class="addPlan">
-		<headers class="fixedheader" :themeType="true" :showBack="true">
-			<view class="headerName">
-				{{title}}
-			</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"><text class="tag">*</text>旁站记录</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"><text class="tag">*</text>现场照片</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>
-				
-			</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)
-				if(!this.formData.sideStationAddr){
-					uni.showToast({
-						icon: 'none',
-						title: '请输入施工部位',
-						duration: 2000
-					})
-					return
-				}
-				if(!this.formData.buildSituation){
-					uni.showToast({
-						icon: 'none',
-						title: '请输入旁站记录',
-						duration: 2000
-					})
-					return
-				}
-				if(!this.formData.imgFileList.length > 0){
-					uni.showToast({
-						icon: 'none',
-						title: '请上传图片',
-						duration: 2000
-					})
-					return
-				}
-				let data = {
-					sideStationAddr: this.formData.sideStationAddr,
-					buildSituation: this.formData.buildSituation,
-					dangerousEngineeringId: this.formData.dangerousEngineeringId,
-					createUser: JSON.parse(uni.getStorageSync('userInfo')).userId,
-					type: 2
-				}
-				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;
-				/deep/ .uni-input-placeholder{
-					font-size: 14px;
-				}
-			}
-		}
-		.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;
-				}
-			}
-			/deep/ .uni-textarea-placeholder{
-				font-size: 14px;
-			}
-		}
-	}
-}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/addWorkFinally.vue b/pages/projectEnd/specialOperations/fireWork - 副本/addWorkFinally.vue
deleted file mode 100644
index e8c57fbd..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/addWorkFinally.vue	
+++ /dev/null
@@ -1,375 +0,0 @@
-<template>
-	<view class="addPlan">
-		<headers class="fixedheader" :themeType="true" :showBack="true">
-			<view class="headerName">
-				{{title}}
-			</view>
-		</headers>
-		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
-			<view class="plan-form">
-				<view class="form-item b-bottom">
-					<view class="form-lable">动火作业</view>
-					<!-- <view class="">{{engineeringName}}</view> -->
-				</view>
-				<view class="form-item b-bottom">
-					<view class="form-lable"><text class="tag">*</text>验收单位</view>
-					<picker @change="bindPickerChangeEnterprise" :value="enterpriseIndex" range-key="enterpriseName" :range="enterpriseInfoList">
-						<view style="display: flex;align-items: center;">
-							<view class="uni-input" style="margin-right: 10px;">{{enterpriseInfoList[enterpriseIndex] ? enterpriseInfoList[enterpriseIndex].enterpriseName : ""}}</view>
-							<uni-icons2 type="arrowright" size="20"></uni-icons2>
-						</view>
-					</picker>
-				</view>
-				<view class="form-item b-bottom">
-					<view class="form-lable"><text class="tag">*</text>验收人</view>
-					<picker @change="bindPickerChangePerson" :value="acceptanceIndex" range-key="workerName" :range="acceptancePersonList">
-						<view style="display: flex;align-items: center;">
-							<view class="uni-input" style="margin-right: 10px;">{{acceptancePersonList[acceptanceIndex] ? acceptancePersonList[acceptanceIndex].workerName : ""}}</view>
-							<uni-icons2 type="arrowright" size="20"></uni-icons2>
-						</view>
-					</picker>
-				</view>
-				<view class="form-item b-bottom">
-					<view class="form-lable"><text class="tag">*</text>验收时间</view>
-					<dateTimePicker :placeholder="'请选择验收时间'" :disabled="isDisabled"
-					  :start="getNowTime()" :fields="'minute'" :default-value="planTime"
-					  @change="bindPickerChange($event,'planTime')"
-					  class="form-content">
-					  <view class="uni-input">
-					    <!-- <text>{{addForm.inspectTime}}</text> -->
-					  	<uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" />
-					  </view>
-					</dateTimePicker>
-				</view>
-			</view>
-		</view>
-		<view class="save-btn" @click="saveForm">提交验收申请</view>
-	</view>
-</template>
-
-<script>
-	import dateTimePicker from '@/components/dateTimePicker/index.vue'
-	import { computed } from "vue";
-	export default {
-		components:{
-			dateTimePicker
-		},
-		data(){
-			return{
-				engineeringId: '',
-				//验收人相关属性
-				acceptanceIndex: '',
-				acceptancePerson: '',
-				acceptancePersonList: [],
-				
-				//验收单位相关属性
-				enterpriseId: '',
-				enterpriseIndex: '',
-				enterpriseInfoList: [],
-				
-				projectSn: '',
-				isDisabled: false,
-				planTime: '',
-				
-				statusBarHeight: 0,
-				// title: "下发验证任务",
-				title: "验收申请",
-				inspectTime:'',
-				
-				userInfo: {}
-			}
-		},
-		created() {
-			// this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn
-		},
-		onShow(){
-			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
-		},
-		onLoad(val){
-			console.log("========================");
-			console.log(val);
-			console.log("========================");
-			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn
-			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-			this.engineeringId = val.id
-			this.engineeringName = val.name
-			this.getEnterpriseInfoList()
-		},
-		watch:{
-			enterpriseId(newVal,oldVal){
-				if(newVal !== oldVal) {
-					this.sendRequest({
-						// url:'xmgl/enterpriseInfo/list',
-						url:'xmgl/systemUser/getProjectChilderSystemUserList',
-						method:'post',
-						data:{
-							enterpriseId: this.enterpriseId,
-							projectSn: this.projectSn,
-						},
-						success:res=>{
-							uni.hideLoading()
-							this.acceptancePersonList = res.result
-							console.log(this.acceptancePersonList);
-						}
-					})
-				}
-			}
-		},
-		methods:{
-			getEnterpriseInfoList(){
-				this.sendRequest({
-					url:'xmgl/enterpriseInfo/list',
-					method:'post',
-					data:{
-						// engineeringId: this.detailId,
-						projectSn: this.projectSn,
-						// projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
-					},
-					success:res=>{
-						uni.hideLoading()
-						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
-						this.enterpriseInfoList = res.result;
-					}
-				})
-			},
-			
-			saveForm(){
-				let data = {
-					projectSn: this.projectSn,
-					engineeringId: this.engineeringId,	//危大工程Id
-					//申请验收相关属性
-					// applyAcceptanceUnitId: this.userInfo.userEnterpriseId,	//申请验收单位id
-					// applyAcceptanceUserId: this.userInfo.userId,	//申请验收人id
-					//验收相关属性
-					acceptanceUnitId: this.enterpriseId,
-					acceptanceUserId: this.acceptancePerson.userId,
-					planTime: this.planTime,
-					type: 2
-				}
-				console.log(data);
-				if(!data.acceptanceUnitId){
-					uni.showToast({
-					    title: '请选择验收单位',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(!data.acceptanceUserId){
-					uni.showToast({
-					    title: '请选择验收人',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(!data.planTime){
-					uni.showToast({
-					    title: '请选择验收时间',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				console.log("=====================================addform",data)
-				console.log("=====================================userInfo",this.userInfo)
-				this.sendRequest({
-					url:'xmgl/xzDangerousEngineeringAcceptance/add',
-					method:'post',
-					data: data,
-					success:res=>{
-						uni.hideLoading()
-						if(res.code==200){
-							uni.showToast({
-								title:'保存成功'
-							})
-							uni.navigateBack({})
-						}
-						console.log(res)
-					}
-				})
-			},
-			
-			
-			bindPickerChange(e){
-				this.planTime = e.f3
-			},
-			bindPickerChangePerson(e){
-				this.acceptanceIndex = e.target.value
-				this.acceptancePerson = this.acceptancePersonList[e.target.value]
-			},
-			bindPickerChangeEnterprise(e){
-				this.enterpriseIndex = e.target.value
-				this.enterpriseId = this.enterpriseInfoList[e.target.value].id
-			},
-			getNowTime() {
-				let dateTime
-				let yy = new Date().getFullYear()
-				let mm = new Date().getMonth() + 1
-				let dd = new Date().getDate()
-				let hh = new Date().getHours()
-				let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
-				let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
-				dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
-				console.log(dateTime)
-				return dateTime
-			}
-		}
-	}
-</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;
-			align-items: center;
-			background: #fff;
-			.form-lable{
-				white-space: nowrap;
-				.tag{
-					color: #DD524D;
-				}
-			}
-			.from-input{
-				text-align: right;
-			}
-			.form-result{
-				.form-radio{
-					display: flex;
-					margin-left: 30rpx;
-					border: 1px solid #E5E5E5;
-					padding: 0;
-					border-radius: 12rpx;
-					overflow: hidden;
-					li{
-						list-style: none;
-						font-size: 14px;
-						background: #EEEEEE;
-						text-align: center;
-						width: 156rpx;
-						padding: 12rpx 0;
-					}
-					.active-radio{
-						background: #2b8df3;
-						color: #fff;
-					}
-				}
-			}
-		}
-		.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;
-				}
-			}
-		}
-		.a-none{
-			align-items: initial;
-		}
-	}
-}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/check.vue b/pages/projectEnd/specialOperations/fireWork - 副本/check.vue
deleted file mode 100644
index 4917d094..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/check.vue	
+++ /dev/null
@@ -1,505 +0,0 @@
-<template>
-	<view class="addPlan">
-		<headers class="fixedheader" :themeType="true" :showBack="true">
-			<view class="headerName">
-				{{title}}
-			</view>
-		</headers>
-		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
-			<view class="plan-form">
-				<view style="background-color: #fff;border-bottom: 10px solid #068de8;padding:10px 10px 15px 10px">
-					<!-- <view class="backlogMargin">危大工程名称：{{checkRecord.engineeringName}}</view> -->
-					<view class="backlogMargin">动火作业</view>
-					<view class="backlogMargin">计划执行时间：{{checkRecord.planTime}}</view>
-					<view class="backlogMargin">申请验收单位：{{checkRecord.applyAcceptanceUnitName}}</view>
-					<view class="backlogMargin">申请验收人：{{checkRecord.applyAcceptanceUserName}}</view>
-				</view>
-				
-				<view class="form-item b-bottom" style="justify-content: flex-start;">
-					<view class="form-lable"><text class="tag">*</text>验收结果</view>
-					<view class="form-result" v-if="checkRecord.acceptanceResult !== 1 && checkRecord.acceptanceResult !== 2">
-						<ul class="form-radio">
-							<li :class="{'active-radio': formData.acceptanceResult == 1}" @click="checkRadio(1)">合格</li>
-							<li :class="{'active-radio': formData.acceptanceResult == 2}" @click="checkRadio(2)">不合格</li>
-						</ul>
-					</view>
-					<view class="form-result" v-else>
-						<ul class="form-radio">
-							<li :class="{'active-radio': checkRecord.acceptanceResult == 1}" @click="checkRadio(1)">合格</li>
-							<li :class="{'active-radio': checkRecord.acceptanceResult == 2}" @click="checkRadio(2)">不合格</li>
-						</ul>
-					</view>
-				</view>
-				
-				<view class="form-item f-column b-bottom a-none" v-if="checkRecord.acceptanceResult !== 1 && checkRecord.acceptanceResult !== 2">
-					<view class="form-lable"><text class="tag">*</text>验收描述</view>
-					<textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50"
-						:value="formData.acceptanceDescribe" placeholder="请输入验收描述" />
-					<view class="txt-length">{{textareaLengh}}/50</view>
-				</view>
-				<view class="form-item f-column b-bottom a-none" v-else>
-					<view class="form-lable"><text class="tag">*</text>验收描述</view>
-					<textarea class="form-textarea" maxlength="50" :disabled="true"
-						:value="checkRecord.acceptanceDesc" placeholder="请输入验收描述" />
-				</view>
-				
-				<view class="form-item f-column a-none">
-					<view class="form-lable"><text class="tag">*</text>现场照片</view>
-					<view class="uni-form-input imgBox_wrap" v-if="checkRecord.acceptanceResult !== 1 && checkRecord.acceptanceResult !== 2">
-						<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="" v-else>
-						<view class="imgBox">
-							<image :src="url_config+'image/'+checkRecord.photo" class="img"
-								@click="previewImage(url_config+'image/'+item.url)"></image>
-						</view>
-					</view>
-				</view>
-
-			</view>
-		</view>
-		<view class="save-btn" v-if="checkRecord.acceptanceResult !== 1 && checkRecord.acceptanceResult !== 2" @click="saveForm">确 认</view>
-		<!-- <u-popup :show="isPopupVisible" @close="closePopup" @open="isPopupVisible === true" z-index="9999">
-			<view class="slot-content">
-				弹窗内容
-				这里是弹窗的内容
-				<u-button @click="closePopup">关闭弹窗</u-button>
-			</view>
-		</u-popup> -->
-		
-		
-		<view class="dialog-container" v-if="unitDialog" @click="unitDialog=false">
-		<!-- <view class="dialog-container" v-if="unitDialog"> -->
-			<view class="dialog-content">
-				<view class="text-tip">
-					提示：最终验收通过后，将闭合该动火作业计划，任何人不能再进行操作！
-				</view>
-				<view class="confirm-btn" @click="confirmClose">关闭</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				unitDialog: false,
-				checkRecord: {},	//验收记录
-				
-				statusBarHeight: 0,
-				isPopupVisible: true,
-				title: "新增验收记录",
-				formData: {
-					acceptanceRegion: "",
-					acceptanceDescribe: "",
-					imgFileList: [],
-					acceptanceResult: 1,
-					acceptanceType: "",
-					dangerousEngineeringId: ""
-				},
-				textareaLengh: 0,
-				typeIndex: "",
-				typeList: [{
-					id: 1,
-					name: '施工条件验收'
-				}, {
-					id: 2,
-					name: '危大工程验收'
-				}]
-			}
-		},
-		onShow() {
-			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
-		},
-		onLoad(val) {
-			// this.formData.dangerousEngineeringId = val.id
-			this.checkRecord = JSON.parse(decodeURIComponent(val.checkRecord));
-			console.log("===============onload===================");
-			console.log(this.checkRecord);
-			console.log("===============onload===================");
-		},
-		methods: {
-			checkRadio(val) {
-				this.formData.acceptanceResult = val
-			},
-			bindTextAreaBlur(e) {
-				console.log(e)
-				this.formData.acceptanceDescribe = e.detail.value
-			},
-			bindInputBlur(e) {
-				console.log(e)
-				this.formData.acceptanceRegion = 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)
-				// this.isPopupVisible = true
-				
-				if(!this.formData.acceptanceResult){
-					uni.showToast({
-					    title: '请选择结果',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(!this.formData.acceptanceDescribe){
-					uni.showToast({
-					    title: '请输入验收描述',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(!this.formData.imgFileList[0]){
-					uni.showToast({
-					    title: '请上传现场照片',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(this.formData.acceptanceResult === 1){
-					this.unitDialog = true
-				}else{
-					this.confirmClose()
-				}
-			},
-			confirmClose(){
-				// this.unitDialog = true
-				let data = {
-					id: this.checkRecord.id,
-					acceptanceResult: this.formData.acceptanceResult,	//验收结果
-					acceptanceDesc: this.formData.acceptanceDescribe,	//验收描述
-					photo: this.formData.imgFileList[0].url,
-					type: 2
-				}
-				// data.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId;
-				// let arr = []
-				// this.formData.imgFileList.forEach(item=>{
-				// 	arr.push(item.url)
-				// })
-				// data.imageUrl = arr.join(',')
-				// console.log(data)
-				this.sendRequest({
-					url:'xmgl/xzDangerousEngineeringAcceptance/edit',
-					method:'post',
-					data: data,
-					success:res=>{
-						uni.hideLoading()
-						if(res.code==200){
-							uni.showToast({
-								title:'保存成功'
-							})
-							this.unitDialog = false
-							uni.navigateBack({})
-						}
-						console.log(res)
-					}
-				})
-			},
-			bindPickerChange(e) {
-				this.typeIndex = e.target.value
-				this.formData.acceptanceType = this.typeList[e.target.value].id
-			},
-			closePopup() {
-				this.isPopupVisible = false
-			}
-		}
-	}
-</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;
-				align-items: center;
-				background: #fff;
-
-				.form-lable {
-					white-space: nowrap;
-
-					.tag {
-						color: #DD524D;
-					}
-				}
-
-				.from-input {
-					text-align: right;
-				}
-
-				.form-result {
-					.form-radio {
-						display: flex;
-						margin-left: 30rpx;
-						border: 1px solid #E5E5E5;
-						padding: 0;
-						border-radius: 12rpx;
-						overflow: hidden;
-
-						li {
-							list-style: none;
-							font-size: 14px;
-							background: #EEEEEE;
-							text-align: center;
-							width: 156rpx;
-							padding: 12rpx 0;
-						}
-
-						.active-radio {
-							background: #2b8df3;
-							color: #fff;
-						}
-					}
-				}
-			}
-
-			.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;
-					}
-				}
-			}
-
-			.a-none {
-				align-items: initial;
-			}
-		}
-	}
-
-	.backlogMargin {
-		margin-bottom: 15px;
-	}
-	.dialog-container {
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 111;
-		background-color: rgba(0, 0, 0, 0.5);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		.dialog-content{
-			// padding: 10px 10px;
-			width: 80%;
-			height: 400rpx;
-			background-color: #fff;
-			// line-height: 32px;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			.text-tip{
-				font-size: 14px;
-				width: 93%;
-				height: 70%;
-				// position: absolute;
-				// background-color: darkred;
-			}
-			.confirm-btn{
-				width: auto;
-				height: 15%;
-				color: #fff;
-				background-color: #2b8df3;
-				display: flex;
-				align-items: center;
-				padding: 0 5px;
-				border-radius: 5px;
-			}
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/checkList.vue b/pages/projectEnd/specialOperations/fireWork - 副本/checkList.vue
deleted file mode 100644
index 010ca541..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/checkList.vue	
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-	<view class="addPlanss">
-		<headers class="fixedheader" :themeType="true" :showBack="true">
-			<view class="headerName">
-				{{title}}
-			</view>
-		</headers>
-		<view class="backlogList-admin" v-for="item in listData" :key="item.id" @click="jobTrial(item)">
-			<view class="backlogList backlogMargin">
-				<span>
-					<!-- 危大工程名称：{{item.engineeringName}} -->
-					动火作业
-				</span>
-				<span class="backlogList-span" v-if="!item.acceptanceResult">待确认</span>
-				<span class="backlogList-span" v-if="item.acceptanceResult === 1">合格</span>
-				<span class="backlogList-span" v-if="item.acceptanceResult === 2">不合格</span>
-			</view>
-			<view class="backlogMargin">
-					计划执行时间：{{item.planTime}}
-			</view>
-			<view class="backlogMargin">
-					申请验收单位：{{item.applyAcceptanceUnitName}}
-			</view>
-			<view class="backlogMargin">
-					申请验收人：{{item.applyAcceptanceUserName}}
-			</view>
-		</view>
-		<view class="no-data"  v-if="listData.length === 0">
-			<image class="img" src="/static/noData.png"></image>
-			<text class="txt">暂无数据</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				title: "查看待办",
-				listData: [],
-				projectSn: '',
-				userInfo: {},
-			};
-		},
-		created() {
-			
-		},
-		onLoad() {
-			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn
-			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-			this.initData()
-		},
-		onShow() {
-			this.initData()
-		},
-		methods:{
-			initData(){
-				this.sendRequest({
-					url:'xmgl/xzDangerousEngineeringAcceptance/list',
-					method:'get',
-					data:{
-						projectSn: this.projectSn,
-						acceptanceUserId: this.userInfo.userId,
-						type: 2
-					},
-					success:res=>{
-						uni.hideLoading()
-						this.listData = res.result
-					}
-				})
-			},
-			jobTrial(item){
-				console.log('sssssss');
-				let checkRecord = {
-					id: item.id,
-					engineeringName: item.engineeringName,
-					planTime: item.planTime,
-					applyAcceptanceUnitName: item.applyAcceptanceUnitName,
-					applyAcceptanceUserName: item.applyAcceptanceUserName
-				}
-				checkRecord = item
-				uni.navigateTo({
-					url:'./check?checkRecord='+encodeURIComponent(JSON.stringify(checkRecord))
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.addPlanss {
-		height: 100%;
-		background-color: #f6f6f6;
-	}
-
-	.backlogList-admin {
-		margin: 10px;
-		background-color: #fff;
-		height: 160px;
-		padding: 15px;
-
-		.backlogList {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			.backlogList-span{
-				padding: 3px 5px;
-				border: 1px solid #ccc;
-				color: #d17b00;
-				border-radius: 3px;
-			}
-		}
-	}
-	.no-data{
-		text-align: center;
-		.img{
-			display: block;
-			height: 200rpx;
-			width: 200rpx;
-			margin: 0 auto;
-			margin-top: 60rpx;
-			margin-bottom: 60rpx;
-		}
-		.txt{
-			color: #C0C4CC;
-		}
-	}
-	
-	.backlogMargin{
-		margin-bottom: 15px;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/detail.vue b/pages/projectEnd/specialOperations/fireWork - 副本/detail.vue
deleted file mode 100644
index 84fd5483..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/detail.vue	
+++ /dev/null
@@ -1,402 +0,0 @@
-<template>
-	<view class="dangerbig-details">
-		<headers class="fixedheader" :themeType="true" :showBack="true">
-			<view class="headerName">
-				动火作业详情
-			</view>
-		</headers>
-		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
-			<view class="detail-content">
-					<view class="list">
-						<view class="list-info">
-							动火人：<text class="detail-data">{{detailData.firemanName}}</text>
-						</view>
-						<view class="list-info">
-							动火方式：<text class="detail-data">{{detailData.hotMethod}}</text>
-						</view>
-						<view class="list-info">
-							动火实施时间：<text class="detail-data">{{detailData.hotWorkExecutionBeginTime+'-'+detailData.hotWorkExecutionEndTime}}</text>
-						</view>
-						<view class="list-info">
-							动火地点和动火部位：<text class="detail-data">{{detailData.fireLocationAndFirePart}}</text>
-						</view>
-						<view class="" v-if="isShow">
-							<view class="list-info">
-								作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
-							</view>
-							<view class="list-info">
-								作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
-							</view>
-							<view class="list-info">
-								动火作业级别：<text class="detail-data">{{detailData.hotWorkLevel}}</text>
-							</view>
-							<view class="list-info">
-								作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
-							</view>
-							<view class="list-info">
-								作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
-							</view>
-							<view class="list-info">
-								作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
-							</view>
-							<view class="list-info">
-								关联的其他特殊作业：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
-							</view>
-							<view class="list-info">
-								证书编号：<text class="detail-data">{{detailData.certificateNo}}</text>
-							</view>
-							<view class="list-info">
-								安全作业票编号：<text class="detail-data">{{detailData.safetyWorkTicketCode}}</text>
-							</view>
-							<view class="list-info">
-								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
-							</view>
-							<view class="safe-mesure">
-								<view class="safe-btn" @click="goSafeMesure">安全措施</view>
-							</view>
-							<view class="table-info" style="">
-								<uni-table emptyText="暂无更多数据" class="uni-table-font">
-									<uni-td class="uni-td-font" style="background-color: #eaeaea" align="center">
-										<uni-tr>气体取样分析时间</uni-tr>
-										<uni-tr>代表性气体</uni-tr>
-										<uni-tr>分析结果/%</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr class="uni-tr-font">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr style="">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr style="">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</uni-tr>
-									</uni-td>
-								</uni-table>
-							</view>
-						</view>
-						
-						<view v-if="COMPANY != 'longguang'" class="more-btn" @click="isShow=!isShow">
-							{{isShow ? "收起详情":"展开详情"}}
-							<uni-icons :type="isShow ? 'arrowup':'arrowdown'"></uni-icons>
-						</view>
-					</view>
-
-					<view class="detail-nav" v-if="COMPANY != 'longguang'">
-						<scroll-view class="scrollx-wrap" scroll-x>
-							<view class="nav-list">
-								<view class="nav-item"
-									:class="{'active-nav': activeIndex == item.id}"
-									v-for="(item,index) in navList" :key="index"
-									@click="checkNav(item)">
-									{{item.name}}
-								</view>
-							</view>
-						</scroll-view>
-						<view class="detail-wrap">
-							<plan ref="list" v-if="componentName == 'plan'" :detailId="detailId" :info="detailData"></plan>
-							<safe ref="list" v-if="componentName == 'safe'" :detailId="detailId" :info="detailData"></safe>
-							<side ref="list" v-if="componentName == 'side'" :detailId="detailId" :info="detailData"></side>
-							<workFinally ref="list" v-if="componentName =='workFinally'" :detailId="detailId" :info="detailData" ></workFinally>
-						</view>
-					</view>
-					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
-					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
-					@click="addForm">
-						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
-						<uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons>
-						<span>+</span>
-					</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import plan from './plan.vue'
-	import safe from './safe.vue'
-	import side from './side.vue'
-	import workFinally from './workFinally.vue'
-	
-	export default {
-		components:{
-			plan,
-			safe,
-			side,
-			workFinally,
-		},
-		data(){
-			return{
-				statusBarHeight: 0,
-				isShow: false,
-				componentName: "plan",
-				navList:[{
-					id: 1,
-					name: "当前进度"
-				},{
-					id: 2,
-					name: "安全检查"
-				},{
-					id: 3,
-					name: "施工旁站"
-				},{
-					id: 4,
-					name: "最终验收"
-				}],
-				activeIndex: 1,
-				detailId: "",
-				detailData:{},
-				isShowBtn: null,
-			}
-		},
-		onReachBottom() {
-			console.log(1,this.$refs['list'])
-		},
-		onPullDownRefresh() {
-			console.log(2)
-		},
-		onShow(){
-			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
-			// this.initData()
-			this.getWork()
-			let that = this;
-			setTimeout(function(){
-				console.log(that.$refs,777)
-				console.log(that.$refs.listBox,777)
-				if(that.$refs['list'] && that.$refs['list'].initData){
-					console.log(777888)
-					that.$refs['list'].initData()
-				}
-			},200)
-		},
-		onLoad(val){
-			this.detailId = val.id
-		},
-		mounted() {
-		},
-		methods:{
-			getWork(){
-				this.sendRequest({
-					url:'xmgl/xzSpecialOperationFireSafety/queryById',
-					method:'get',
-					data:{id:this.detailId},
-					success:res=>{
-						uni.hideLoading()
-						// if(res.code==200){
-						// 	this.listData = res.result.records
-						// }
-						this.detailData =  res.result
-						// let str = '';
-						// if(res.result.chooseTypeDescribeList){
-						// 	this.detailData.describeName
-						// 	res.result.chooseTypeDescribeList.map((item,index) => {
-						// 		if(index == res.result.chooseTypeDescribeList.length - 1){
-						// 			str = str + item.describeName
-						// 		} else {
-						// 			str = str + item.describeName + ','
-						// 		}
-						// 	})
-						// 	console.log(str,123456789)
-						// 	this.detailData.describeName = str;
-						// }
-						this.getApply()
-					}
-				})
-			},
-			goSafeMesure(){
-				uni.navigateTo({
-					url: "./safeMesure"
-				})
-			},
-			getApply(){
-				console.log("=====================================================detail");
-				console.log(this.detailData);
-				this.sendRequest({
-					url:'xmgl/xzDangerousEngineeringAcceptance/list',
-					method:'get',
-					data:{
-						engineeringId: this.detailData.id,
-						projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
-						type: 2
-					},
-					success:res=>{
-						uni.hideLoading()
-						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
-						let result = res.result
-						if(res.result.length>0){
-							if(res.result[0].acceptanceResult === null) this.isShowBtn = false
-							if(res.result[0].acceptanceResult === 1) this.isShowBtn = false
-							if(res.result[0].acceptanceResult === 2) this.isShowBtn = true
-						}else{
-							this.isShowBtn = true
-						}
-					}
-				})
-			},
-			checkNav(val){
-				this.activeIndex = val.id
-				if(val.id == 1){
-					this.componentName = "plan"
-				} else if(val.id == 2){
-					this.componentName = "safe"
-				} else if(val.id == 3){
-					this.componentName = "side"
-				} else if(val.id == 4){
-					this.componentName = "workFinally"
-				}
-			},
-			addForm(){
-				if(this.activeIndex == 1){
-					uni.navigateTo({
-						url:'./addPlan?id='+this.detailId
-					})
-				} else if(this.activeIndex == 2){
-					if(uni.getStorageSync('dangerData')){
-						uni.removeStorageSync('dangerData');
-					}
-					if(uni.getStorageSync('detailData')){
-						uni.removeStorageSync('detailData');
-					}
-					uni.navigateTo({
-						// url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck'
-						url:'../../safeSame/addIssue?type=2&engineeringId='+this.detailId + '&moduleType=safeCheck'
-					})
-				} else if(this.activeIndex == 3){
-					uni.navigateTo({
-						url:'./addSide?id='+this.detailId
-					})
-				} else if(this.activeIndex == 4){
-					if(this.isShowBtn){
-						uni.navigateTo({
-							url:'./addWorkFinally?id='+this.detailId+'&name='+this.detailData.engineeringName
-						})
-					}else{
-						uni.showToast({
-							title: '请勿重复操作',
-							icon: "none",
-							duration: 2000
-						});
-					}
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.safe-mesure{
-	width: 100%;
-	height: 100rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	background-color: #fff;
-	.safe-btn{
-		text-align: center;
-		width: 80%;
-		line-height: 70rpx;
-		// background-color: darkred;
-		border: 4rpx solid #2b8df3;
-		color: #2b8df3;
-		border-radius: 20rpx;
-		font-weight: bold;
-	}
-}
-.table-info{
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	background-color: #fff;
-	.uni-table-font{
-		margin: 0 5rpx;
-		// width: 95%;
-		box-shadow: 0rpx 0rpx 0rpx 2rpx darkgray;
-		.uni-td-font{
-			width: 25%;
-			font-size: 18rpx;
-			border: 1rpx solid lightgray;
-			.uni-tr-font{
-				border: 1rpx solid black;
-			}
-		}
-		
-	}
-}
-.dangerbig-details{
-	min-height: 100%;
-	background: #F6F6F6;
-	.fixedheader{
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		z-index: 2;
-	}
-	.detail-content{
-		padding-top: 20rpx;
-	}
-	.list{
-		margin-bottom: 20rpx;
-	}
-	.list-info{
-		background: #fff;
-		border-bottom: 1px solid #F6F6F6;
-		font-size: 26rpx;
-		padding: 20rpx;
-	}
-	.more-btn{
-		text-align: center;
-		font-size: 14px;
-		height: 50rpx;
-		background: #F1F7FE;
-		line-height: 50rpx;
-	}
-	.nav-list{
-		display: flex;
-		height: 80rpx;
-		align-items: center;
-		padding: 0 20rpx;
-		.nav-item{
-			width: 25%;
-			text-align: center;
-			white-space: nowrap;
-			padding: 0 20rpx;
-			height: 80rpx;
-			box-sizing: border-box;
-			line-height: 80rpx;
-			font-size: 14px;
-		}
-		.active-nav{
-			border-bottom: 2px solid #4396E7;
-		}
-	}
-	.detail-nav{
-		width: 100%;
-	}
-	.scrollx-wrap{
-		width: 100%;
-		background: #fff;
-	}
-	.add-btn{
-		background: #4181FE;
-		width: 96rpx;
-		height: 96rpx;
-		border-radius: 50%;
-		text-align: center;
-		line-height: 96rpx;
-		position: fixed;
-		bottom: 40rpx;
-		right: 40rpx;
-		span{
-			font-size: 30px;
-			    line-height: 45px;
-			    color: #fff;
-		}
-	}
-}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/plan.vue b/pages/projectEnd/specialOperations/fireWork - 副本/plan.vue
deleted file mode 100644
index 88e6fd10..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/plan.vue	
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-	<view class="control">
-		<!-- <view class="control-h2 flex j-between a-center">
-			进度记录
-			<view class="control-total">0/10</view>
-		</view> -->
-		<view class="control-list" v-if="listData && listData.length>0">
-			<view class="control-item" v-for="(item,index) in listData" :key="index">
-				<view class="item-title b-bottom">
-					{{item.dutyRegion}}
-				</view>
-				<view class="item-select-box" :class="{'b-bottom': item.imageUrl}">
-					<view class="item-content">进度描述：{{item.progressDescribe}}</view>
-				</view>
-				<view class="item-img" v-if="item.imageUrl">
-					现场照片
-					<view class="img-wrap flex a-center">
-						<view class="imgBox" v-for="(item,index) in item.imageUrl.split(',')" :key="index">
-							<image :src="url_config+'image/'+item" class="img"
-								@click="previewImage(url_config+'image/'+item)"></image>
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
-		<view class="no-data" v-else>
-			<image class="img" src="/static/noData.png"></image>
-			<text class="txt">暂无数据</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props:["detailId"],
-		data(){
-			return{
-				listData:[]
-			}
-		},
-		created() {
-				this.initData()
-		},
-		methods:{
-			previewImage(url) {
-				uni.previewImage({
-					urls: [url]
-				})
-			},
-			initData(){
-				this.sendRequest({
-					url:'xmgl/dangerousEngineeringProgressRecord/list',
-					method:'post',
-					data: {
-						engineeringId: this.detailId,
-						type: 2,
-					},
-					success:res=>{
-						uni.hideLoading()
-						if(res.code==200){
-							this.listData = res.result
-							console.log(res)
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.control{
-		padding-top: 20rpx;
-		padding-bottom: 40rpx;
-		.flex{
-			display: flex;
-		}
-		.j-between{
-			justify-content: space-between;
-		}
-		.a-center{
-			align-items: center;
-		}
-		.b-bottom{
-			border-bottom: 1px solid #F6F6F6;
-		}
-		.control-h2{
-			font-size: 14px;
-			height: 60rpx;
-			padding: 0 20rpx;
-			background: rgba(255,255,255,0.5);
-		}
-		.control-list{
-			font-size: 14px;
-			.control-item{
-				padding: 0 20rpx;
-				margin-bottom: 20rpx;
-				background: #fff;
-				.item-title{
-					font-weight: 600;
-					height: 72rpx;
-					line-height: 72rpx;
-				}
-			}
-			.item-select-box{
-				padding: 30rpx 0;
-				.item-content{
-					width: 100%;
-				}
-				
-			}
-			.img-wrap{
-				margin-top: 20rpx;
-				flex-wrap: wrap;
-			}
-			.item-img{
-				padding: 30rpx 0;
-				.imgBox{
-					width: 100rpx;
-					height: 100rpx;
-					margin-left: 20rpx;
-					.img{
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-		}
-		.no-data{
-			text-align: center;
-			.img{
-				display: block;
-				height: 200rpx;
-				width: 200rpx;
-				margin: 0 auto;
-				margin-top: 60rpx;
-				margin-bottom: 60rpx;
-			}
-			.txt{
-				color: #C0C4CC;
-			}
-		}
-	}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/safe.vue b/pages/projectEnd/specialOperations/fireWork - 副本/safe.vue
deleted file mode 100644
index 7df898b6..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/safe.vue	
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-	<view class="safe-list">
-		<view class="list-detail">
-			<view class="list-item" @click="previewData(1)">
-				<view>问题隐患&排查记录<text class="num"></text></view>
-				<uni-icons type="arrowright"></uni-icons>
-			</view>
-			<!-- <view class="list-item" @click="previewData(2)">
-				<view>排查记录<text class="num"></text></view>
-				<uni-icons type="arrowright"></uni-icons>
-			</view> -->
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props:['detailId'],
-		data(){
-			return{
-				
-			}
-		},
-		onLoad() {
-			console.log("==============safeLis,detailIdt===============");
-			console.log(this.detailId);
-			console.log("==============safeList,detailId===============");
-		},
-		methods:{
-			previewData(val){
-				if(val == 1){
-					uni.navigateTo({
-						// url:'../safeManage/dangerList?type=5&engineeringId='+this.detailId
-						url:"./safeList?type=2&engineeringId=" + this.detailId
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.safe-list{
-		padding-top: 20rpx;
-		height: 500rpx;
-		.list-detail{
-			background: #fff;
-			padding: 0 40rpx;
-			.list-item{
-				height: 96rpx;
-				border-bottom: 1px solid #F6F6F6;
-				line-height: 92rpx;
-				font-size: 14px;
-				display: flex;
-				justify-content: space-between;
-			}
-			.num{
-				margin-left: 40rpx;
-			}
-		}
-	}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/safeList.vue b/pages/projectEnd/specialOperations/fireWork - 副本/safeList.vue
deleted file mode 100644
index 24c3ce4e..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/safeList.vue	
+++ /dev/null
@@ -1,1329 +0,0 @@
-<template>
-	<view class="listPage" :class="{popupShow:popupShow}">
-		<headers :showBack="true">
-			<view class="headerName">
-				问题隐患&排查记录
-			</view>
-		</headers>
-		<view class="tab flex2">
-			<view class="tabType" @click="changeTab(0)" :class="checkedTab==0?'checkedTab':'noCheckTab'">问题隐患</view>
-			<view class="tabType" @click="changeTab(9)" :class="checkedTab==9?'checkedTab':'noCheckTab'">排查记录</view>
-			<!-- <view class="tabType" @click="changeTab(2)" :class="checkedTab==2?'checkedTab':'noCheckTab'">待整改</view>
-			<view class="tabType" @click="changeTab(3)" :class="checkedTab==3?'checkedTab':'noCheckTab'">待复查</view>
-			<view class="tabType" @click="changeTab(4)" :class="checkedTab==4?'checkedTab':'noCheckTab'">待核验</view> -->
-		</view>
-		<!-- <view class="searchBox" v-if="checkedTab==0"> -->
-		<view class="searchBox">
-			<form>
-				<view class="uni-form-item">
-					<input class="uni-input" name="searchName" v-model="condition.search" placeholder="搜索"
-						@input="handleInput" />
-					<view class="screen" @click="screenData">筛选</view>
-					<view class="screen" style="margin-top: 3px;
-                        margin-left: 5px;">
-						<image src="/static/screenIcon.png" style="width: 15px;height: 15px">
-						</image>
-					</view>
-				</view>
-			</form>
-		</view>
-		<view class="content">
-			<view class="item" v-if="listData.length>0" v-for="(item,index) in listData" :key="index"
-				@click="goDetails(item)">
-				<view class="item_title" v-if="item.recordType == 1 ">
-					<image src="/static/zlwtIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>安全问题
-				</view>
-				<view class="item_title" v-if="item.recordType == 2 ">
-					<image src="/static/pcjlIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>排查记录
-				</view>
-				<view v-if="item.status==2" class="rightStatus" style="background: #5181f6;">待整改</view>
-				<view v-if="item.status==3" class="rightStatus" style="background:#ff9810">待复查</view>
-				<view v-if="item.status==4" class="rightStatus" style="background:#6554d1">待核验</view>
-				<view v-if="item.status==5" class="rightStatus" style="background:#21c28e">合格</view>
-				<view v-if="item.status==6" class="rightStatus" style="background:#ccc">已撤回</view>
-				<view v-if="item.overTime == true && item.status != 6" class="rightStatus" style="background:#ea3941;margin-right: 10px;">超期
-				</view>
-				<view class="item_content">{{item.dangerItemContent}}</view>
-				<view class="item_content" style="margin: 15px 0px;">整改人: {{item.changeName}}</view>
-				<view class="item_info flex2">
-					<view class="name">检查人：{{item.inspectManName}}</view>
-					<view class="time">{{item.inspectTime}}</view>
-				</view>
-			</view>
-			<view class="noData" v-if="listData.length==0">
-				<image class="noDataImg" src="../../../../static/noData.png"></image>
-				<view>暂无数据</view>
-			</view>
-			<!-- 检查部位 -->
-			<tki-tree style="z-index: 9999;" ref="locationTree" @confirm="(val)=>checkPointBtn(val,1)" idKey='id'
-				:range="checkPointList" rangeKey="regionName" confirmColor="#4e8af7" :selectParent="true" />
-
-
-			<!-- 筛选条件弹框 -->
-			<uni-popup class="screenDialog" ref="screenShow" :show="popupShow">
-
-				<view class="screenContent">
-					<scroll-view style="height: 50%;" scroll-y>
-						<view class="closeIcon" @click="closeBtn">
-							×
-						</view>
-						<view class="screenTitle">
-							筛选条件
-						</view>
-
-						<view class="titleItem">检查时间</view>
-						<view class="screenItem">
-							<view class="screenI" style="width: 140px;position: relative;">
-								<dateTimePiccker v-if="inspectStartTime===''" :placeholder="startTime"
-									:start="startTime" fields="minute"
-									@change="bindPickerChangeStart($event,'startTime')" class="dateTimePiccker">
-								</dateTimePiccker>
-								<view v-else>{{inspectStartTime}}</view>
-								<view v-if="inspectStartTime !=''" @click="showTimePicker(1)"
-									style="position: absolute;top: -1vh;left: 34vw;font-size: 16px;">×</view>
-							</view>
-							<span style="color: gray;margin:6% 5px">一</span>
-							<view class="screenI" style="width: 140px;position: relative;">
-								<dateTimePiccker v-if="inspectEndTime===''" :placeholder="startTime" :start="startTime"
-									fields="minute" @change="bindPickerChangeEnd($event,'startTime')"
-									class="dateTimePiccker">
-								</dateTimePiccker>
-								<view v-else>{{inspectEndTime}}</view>
-								<view v-if="inspectEndTime !=''" @click="showTimePicker(2)"
-									style="position: absolute;top: -1vh;left: 34vw;font-size: 16px;">×</view>
-
-							</view>
-						</view>
-						<view class="titleItem">查询类型</view>
-						<view class="screenItem">
-							<view class="screenText" v-for="(item,index) in searchTypeList" :key="index"
-								@click="searchItem(item,index)" :class="{active:chekItm==index}">
-								{{item.name}}
-							</view>
-						</view>
-						<view class="titleItem">问题等级</view>
-						<view class="screenItem">
-							<view class="screenText" v-for="(item,index) in issueLevelList" :key="index"
-								@click="searchItem(item,index)" :class="{active:chekItm2==index}">
-								{{item.name}}
-							</view>
-						</view>
-						<view class="titleItem">状态</view>
-						<view class="screenItem">
-							<view class="screenText" v-for="(item,index) in statusList" :key="index"
-								@click="searchItem(item,index)" :class="{active:chekItm3==index}">
-								{{item.name}}
-							</view>
-						</view>
-						<view class="titleItem">紧急程度</view>
-						<view class="screenItem">
-							<view class="screenText" v-for="(item,index) in urgencyList" :key="index"
-								@click="searchItem(item,index)" :class="{active:chekItm4==index}">
-								{{item.name}}
-							</view>
-						</view>
-						<view class="titleItem">整改人</view>
-						<view class="screenItem">
-							<view v-for="(item, index) in displayedItems1" :key="index" class="screenText"
-								@click="searchItem(item,index)" :class="{active:chekItm5==index}">
-								{{ item.name }}
-							</view>
-							<view v-if="!isExpanded1" @click="expandItems(1)" class="screenText">
-								查看更多
-								<image src="/static/icon-down-ccc.png"
-									style="width: 10px;height: 5px;margin-left: 5px;">
-								</image>
-							</view>
-							<view v-else @click="collapseItems(1)" class="screenTextClose">
-								收起
-							</view>
-						</view>
-						<view class="titleItem">复查人</view>
-						<view class="screenItem">
-							<view v-for="(item, index) in displayedItems2" :key="index" class="screenText"
-								@click="searchItem(item,index)" :class="{active:chekItm6==index}">
-								{{ item.name }}
-							</view>
-							<view v-if="!isExpanded2" @click="expandItems(2)" class="screenText">
-								查看更多
-								<image src="/static/icon-down-ccc.png"
-									style="width: 10px;height: 5px;margin-left: 5px;">
-								</image>
-							</view>
-							<view v-else @click="collapseItems(2)" class="screenTextClose">
-								收起
-							</view>
-						</view>
-						<view class="titleItem">核验人</view>
-						<view class="screenItem">
-							<view v-for="(item, index) in displayedItems3" :key="index" class="screenText"
-								@click="searchItem(item,index)" :class="{active:chekItm7==index}">
-								{{ item.name }}
-							</view>
-							<view v-if="!isExpanded3" @click="expandItems(3)" class="screenText">
-								查看更多
-								<image src="/static/icon-down-ccc.png"
-									style="width: 10px;height: 5px;margin-left: 5px;">
-								</image>
-							</view>
-							<view v-else @click="collapseItems(3)" class="screenTextClose">
-								收起
-							</view>
-						</view>
-						<view class="titleItem">检查人</view>
-						<view class="screenItem">
-							<view v-for="(item, index) in displayedItems4" :key="index" class="screenText"
-								@click="searchItem(item,index)" :class="{active:chekItm8==index}">
-								{{ item.name }}
-							</view>
-							<view v-if="!isExpanded4" @click="expandItems(4)" class="screenText">
-								查看更多
-								<image src="/static/icon-down-ccc.png"
-									style="width: 10px;height: 5px;margin-left: 5px;">
-								</image>
-							</view>
-							<view v-else @click="collapseItems(4)" class="screenTextClose">
-								收起
-							</view>
-						</view>
-
-						<view class="titleItem">检查区域 <span class="regionText">
-								<picker @click="$refs.locationTree._show()" :disabled="true">
-									<view v-if="checkPointName==''" style="margin-left: 140px;color: gray;">
-										请选择
-									</view>
-									<view v-else>
-										<view style="width: 98%;text-align: center" class="ellipsis">{{checkPointName}}
-										</view>
-									</view>
-								</picker>
-							</span></span>
-							<image src="/static/icon-right-ccc.png"
-								style="width: 5px;height: 10px;display: inline-block;margin-bottom: 4px;"></image>
-						</view>
-						<view class="line"></view>
-
-						<view class="footerBtn">
-							<view class="foterLeft" @click="resettingBtn">
-								重置
-							</view>
-							<!-- <view class="foterRight" @click="screenShow=false">
-							完成
-						</view> -->
-							<view class="foterRight" @click="closeRed">
-								查看{{ listNum }}条记录
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-
-			</uni-popup>
-			<!-- 检查部位 -->
-			<!-- <tki-tree ref="locationTree" @confirm="(val)=>checkPointBtn(val,1)" idKey='id' :range="checkPointList"
-				rangeKey="regionName" confirmColor="#4e8af7" /> -->
-		</view>
-	</view>
-</template>
-
-<script>
-	import dateTimePiccker from '@/components/dateTimePicker/index.vue'
-
-	export default {
-		components: {
-			dateTimePiccker,
-		},
-		data() {
-			return {
-				popupShow: false,
-				startTime: '请选择日期',
-				searchTypeList: [{
-					name: '全部',
-					type: 1,
-					value: -1
-				}, {
-					name: '安全问题',
-					type: 1,
-					value: 1
-				}, {
-					name: '排查记录',
-					type: 1,
-					value: 2
-				}], //查询类型
-
-				issueLevelList: [{
-						name: '全部',
-						type: 2,
-						value: -1
-					},
-					{
-						name: '一级',
-						type: 2,
-						value: 1
-					},
-					{
-						name: '二级',
-						type: 2,
-						value: 2
-					},
-					{
-						name: '三级',
-						type: 2,
-						value: 3
-					}, {
-						name: '四级',
-						type: 2,
-						value: 4
-					}
-				], //问题等级
-				statusList: [{
-					name: '全部',
-					type: 3,
-					value: -1
-				}, {
-					name: '待整改',
-					type: 3,
-					value: 2
-				}, {
-					name: '待复查',
-					type: 3,
-					value: 3
-				}, {
-					name: '待核验',
-					type: 3,
-					value: 4
-				}, {
-					name: '合格',
-					type: 3,
-					value: 5
-				}, {
-					name: '已撤回',
-					type: 3,
-					value: 6
-				}], //状态
-				urgencyList: [{
-					name: '全部',
-					type: 4,
-					value: -1
-				}, {
-					name: '一般',
-					type: 4,
-					value: 1
-				}, {
-					name: '严重',
-					type: 4,
-					value: 2
-				}, {
-					name: '紧要',
-					type: 4,
-					value: 3
-				}], //紧急程度
-				items: [], //人员列表
-				itemsList: [], //检查人员
-				displayedItems1: [],
-				displayedItems2: [],
-				displayedItems3: [],
-				displayedItems4: [],
-				isExpanded1: false,
-				isExpanded2: false,
-				isExpanded3: false,
-				isExpanded4: false,
-				valueList: [],
-				listNum: 0,
-				params: {
-					year: true,
-					month: true,
-					day: true,
-					hour: false,
-					minute: false,
-					second: false
-				},
-				inspectStartTime: '', //开始
-				inspectEndTime: '', //结束
-				show: false,
-				screenShow: false,
-				//------------------------------------
-				checkPointList: [], //获取检查部位数据
-				checkPointName: '',
-				type: 1,
-				listData: [],
-				checkedTab: 0,
-				condition: {
-					pageNo: 1,
-					pageSize: 1000,
-					projectSn: "",
-					status: 2,
-					search: '', //搜索字段
-				},
-				teach: true,
-				userInfo: '',
-				regionId: [],
-				chekItm: '',
-				chekItm2: '',
-				chekItm3: '',
-				chekItm4: '',
-				chekItm5: '',
-				chekItm6: '',
-				chekItm7: '',
-				chekItm8: '',
-
-				engineeringId: '',
-				workType: '',
-			}
-		},
-		onLoad(option) {
-			this.condition.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
-			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-			this.engineeringId = option.engineeringId
-			// console.log(JSON.parse(uni.getStorageSync('userInfo')))
-			this.getCheckPointList();
-			this.workType = Number(option.type)
-		},
-		onShow() {
-			this.listData = [];
-			this.condition.pageNo = 1;
-			this.condition.pageSize = 1000;
-			this.getListData();
-			this.getPeopleList()
-			this.getPeopleData()
-		},
-		//上拉触底时间
-		onReachBottom() {
-			if (this.teach) {
-				this.condition.pageNo = this.condition.pageNo + 1;
-				// this.condition.pageNo = this.condition.pageNo;
-				this.getListData();
-			}
-		},
-		methods: {
-			//点击重新选择时间
-			showTimePicker(type) {
-				if (type == 1) {
-					this.inspectStartTime = '';
-
-				} else {
-					this.inspectEndTime = '';
-
-				}
-			},
-			//关闭筛选
-			closeBtn() {
-				this.$refs.screenShow.close()
-
-				this.popupShow = false;
-				this.resettingBtn()
-			},
-			//重置
-			resettingBtn() {
-				this.listData = []
-				this.inspectStartTime = ""
-				this.inspectEndTime = ""
-				this.condition.inspectStartTime = ''
-				this.condition.inspectEndTime = ''
-				this.condition.recordType = null
-				this.condition.level = null
-				this.condition.status = null
-				this.condition.urgentLevel = null
-				this.condition.changeId = null
-				this.condition.reviewId = null
-				this.condition.verifyManId = null
-				this.condition.inspectManId = null
-				this.condition.projectSn = this.condition.projectSn
-				this.condition.regionId = null
-				this.condition.pageNo = 1;
-				this.condition.pageSize = 1000;
-				this.checkPointName = ""
-				this.chekItm = 0
-				this.chekItm2 = 0
-				this.chekItm3 = 0
-				this.chekItm4 = 0
-				this.chekItm5 = 0
-				this.chekItm6 = 0
-				this.chekItm7 = 0
-				this.chekItm8 = 0
-				this.getListData()
-			},
-			closeRed() {
-				this.$refs.screenShow.close()
-
-				this.popupShow = false;
-			},
-			//点击筛选项
-			searchItem(item, index) {
-
-				if (item.type === 1) {
-					this.chekItm = index
-				}
-				if (item.type === 2) {
-					this.chekItm2 = index
-				}
-				if (item.type === 3) {
-					this.chekItm3 = index
-				}
-				if (item.type === 4) {
-					this.chekItm4 = index
-				}
-				if (item.type === 5) {
-					this.chekItm5 = index
-				}
-				if (item.type === 6) {
-					this.chekItm6 = index
-				}
-				if (item.type === 7) {
-					this.chekItm7 = index
-				}
-				if (item.type === 8) {
-					this.chekItm8 = index
-				}
-				if (item.value === -1) {
-					this.valueList = this.valueList.filter(v => v.type !== item.type)
-					console.log('过滤list :{}', this.valueList.length)
-				}
-				let isSet = true;
-
-				for (var i = 0; i < this.valueList.length; i++) {
-					if (this.valueList[i].type === item.type) {
-						this.valueList[i] = item;
-						isSet = false;
-					}
-				}
-				if (isSet && item.value !== -1) {
-					this.valueList.push(item)
-				}
-				//点击筛选查看数据
-				this.condition.inspectStartTime = this.inspectStartTime
-				this.condition.inspectEndTime = this.inspectEndTime
-				this.condition.recordType = this.fileValueList(1)
-				this.condition.level = this.fileValueList(2)
-				this.condition.status = this.fileValueList(3)
-				this.condition.urgentLevel = this.fileValueList(4)
-				this.condition.changeId = this.fileValueList(5)
-				this.condition.reviewId = this.fileValueList(6)
-				this.condition.verifyManId = this.fileValueList(7)
-				this.condition.inspectManId = this.fileValueList(8)
-				this.condition.projectSn = this.condition.projectSn
-				this.condition.regionId = this.regionId
-
-				let that = this;
-				this.sendRequest({
-					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
-					method: 'post',
-					data: that.condition,
-					success: res => {
-						that.listData = []
-						that.listNum = res.result.page.total
-						let arr = JSON.parse(JSON.stringify(that.listData));
-						if (res.result.page.records.length > 0) {
-							let newArr = arr.concat(res.result.page.records);
-							if (res.result.page.records.length < 10) {
-								that.teach = false;
-							} else {
-								that.teach = true;
-							}
-							that.listData = newArr;
-						} else {
-							that.teach = false;
-						}
-					}
-				})
-				console.log('点击的参数数量 :{}', JSON.stringify(this.valueList))
-			},
-			fileValueList(type) {
-				for (var i = 0; i < this.valueList.length; i++) {
-					if (this.valueList[i].type == type) {
-						return this.valueList[i].value;
-					}
-				}
-				return null;
-			},
-			//搜索
-			handleInput(e) {
-				this.listData = []
-				this.inspectStartTime = ""
-				this.inspectEndTime = ""
-				this.condition.recordType = null
-				this.condition.level = null
-				this.condition.status = null
-				this.condition.urgentLevel = null
-				this.condition.changeId = null
-				this.condition.reviewId = null
-				this.condition.verifyManId = null
-				this.condition.inspectManId = null
-				this.condition.projectSn = this.condition.projectSn
-				this.condition.regionId = null
-				this.checkPointName = ""
-				this.chekItm = 0
-				this.chekItm2 = 0
-				this.chekItm3 = 0
-				this.chekItm4 = 0
-				this.chekItm5 = 0
-				this.chekItm6 = 0
-				this.chekItm7 = 0
-				this.chekItm8 = 0
-				this.condition.search = e.detail.value
-				let that = this;
-				// uni.showLoading({title: '加载中'})
-				this.sendRequest({
-					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
-					method: 'post',
-					data: that.condition,
-					success: res => {
-						console.log(res)
-						that.listNum = res.result.page.total
-						// uni.hideLoading()
-						let arr = JSON.parse(JSON.stringify(that.listData));
-						if (res.result.page.records.length > 0) {
-							let newArr = arr.concat(res.result.page.records);
-							if (res.result.page.records.length < 10) {
-								that.teach = false;
-							} else {
-								that.teach = true;
-							}
-							that.listData = newArr;
-						} else {
-							that.teach = false;
-						}
-					}
-				})
-			},
-			// 展开所有数据
-			expandItems(type) {
-				let netArr = [];
-				let sliceArr = this.items
-				if (type == 1) {
-					netArr.push({
-						name: '全部',
-						type: 5,
-						value: -1
-					})
-					sliceArr.forEach(s => {
-						netArr.push({
-							name: s.realName,
-							type: 5,
-							value: s.userId
-						})
-
-					})
-					this.displayedItems1 = netArr;
-					this.isExpanded1 = true;
-				} else if (type == 2) {
-					netArr.push({
-						name: '全部',
-						type: 6,
-						value: -1
-					})
-					sliceArr.forEach(s => {
-						netArr.push({
-							name: s.realName,
-							type: 6,
-							value: s.userId
-						})
-
-					})
-					this.displayedItems2 = netArr;
-					this.isExpanded2 = true;
-				} else if (type == 3) {
-					netArr.push({
-						name: '全部',
-						type: 7,
-						value: -1
-					})
-					sliceArr.forEach(s => {
-						netArr.push({
-							name: s.realName,
-							type: 7,
-							value: s.userId
-						})
-
-					})
-					this.displayedItems3 = netArr;
-					this.isExpanded3 = true;
-				} else {
-					netArr.push({
-						name: '全部',
-						type: 8,
-						value: -1
-					})
-					this.itemsList.forEach(s => {
-						netArr.push({
-							name: s.realName,
-							type: 8,
-							value: s.userId
-						})
-
-					})
-					this.displayedItems4 = netArr;
-					this.isExpanded4 = true;
-				}
-
-
-			},
-			// 收起数据，只显示前两个
-			collapseItems(type) {
-				let sliceArr = this.items.slice(0, 2);
-				let sliceArr2 = this.itemsList.slice(0, 2)
-				let netArr = [];
-				if (type == 1) {
-					netArr.push({
-						name: "全部",
-						type: 5,
-						value: -1
-					})
-					sliceArr.forEach(s => {
-						netArr.push({
-							name: s.realName,
-							type: 5,
-							value: s.userId
-						})
-
-					})
-					this.displayedItems1 = netArr;
-					this.isExpanded1 = false;
-				} else if (type == 2) {
-					netArr.push({
-						name: "全部",
-						type: 6,
-						value: -1
-					})
-					sliceArr.forEach(s => {
-						netArr.push({
-							name: s.realName,
-							type: 6,
-							value: s.userId
-						})
-
-					})
-					this.displayedItems2 = netArr;
-					this.isExpanded2 = false;
-				} else if (type == 3) {
-					netArr.push({
-						name: "全部",
-						type: 7,
-						value: -1
-					})
-					sliceArr.forEach(s => {
-						netArr.push({
-							name: s.realName,
-							type: 7,
-							value: s.userId
-						})
-
-					})
-					this.displayedItems3 = netArr;
-					this.isExpanded3 = false;
-				} else {
-					netArr.push({
-						name: "全部",
-						type: 8,
-						value: -1
-					})
-					sliceArr2.forEach(s => {
-						netArr.push({
-							name: s.realName,
-							type: 8,
-							value: s.userId
-						})
-
-					})
-					this.displayedItems4 = netArr;
-					this.isExpanded4 = false;
-				}
-			},
-			//筛选开始时间
-			bindPickerChangeStart(e, type) {
-
-				if (type == 'startTime') {
-					this.inspectStartTime = e.f3;
-				}
-				let userInfo = {
-					type: 9,
-					value: -1
-				}
-				this.searchItem(userInfo, 1)
-
-			},
-			//筛选结束时间
-			bindPickerChangeEnd(e, type) {
-				if (type == 'startTime') {
-					this.inspectEndTime = e.f3;
-				}
-				let userInfo = {
-					type: 10,
-					value: -1
-				}
-				this.searchItem(userInfo, 1)
-			},
-			//点击打开筛选
-			screenData() {
-				this.$refs.screenShow.open()
-
-				this.popupShow = true
-				// 默认显示前面2个数据
-				let sliceArr = this.items.slice(0, 2);
-				let sliceArr2 = this.itemsList.slice(0, 2)
-				this.condition.pageNo = 1;
-				this.condition.pageSize = 1000;
-				this.displayedItems1 = []
-				this.displayedItems2 = []
-				this.displayedItems3 = []
-				this.displayedItems4 = []
-
-				this.displayedItems1.push({
-					name: '全部',
-					type: 5,
-					value: -1
-				})
-				this.displayedItems2.push({
-					name: '全部',
-					type: 6,
-					value: -1
-				})
-				this.displayedItems3.push({
-					name: '全部',
-					type: 7,
-					value: -1
-				})
-				this.displayedItems4.push({
-					name: '全部',
-					type: 8,
-					value: -1
-				})
-				console.log("人员数组：", JSON.stringify(sliceArr))
-
-				sliceArr.forEach(s => {
-
-					this.displayedItems1.push({
-						name: s.realName,
-						type: 5,
-						value: s.userId
-					})
-					this.displayedItems2.push({
-						name: s.realName,
-						type: 6,
-						value: s.userId
-					})
-					this.displayedItems3.push({
-						name: s.realName,
-						type: 7,
-						value: s.userId
-					})
-				})
-				sliceArr2.forEach(v => {
-					this.displayedItems4.push({
-						name: v.realName,
-						type: 8,
-						value: v.userId
-					})
-				})
-
-
-			},
-			//获取检查人员列表
-			getPeopleData() {
-				this.sendRequest({
-					url: 'xmgl/systemUser/getSystemUserList',
-					method: 'post',
-					data: {
-						sn: this.condition.projectSn
-					},
-					success: res => {
-						if (res.code == 200) {
-							this.itemsList = res.result
-						}
-					}
-				})
-			}, //获取人员列表
-			getPeopleList() {
-				this.sendRequest({
-					url: 'xmgl/systemUser/getProjectChilderSystemUserList',
-					method: 'post',
-					data: {
-						projectSn: this.condition.projectSn
-					},
-					success: res => {
-						if (res.code == 200) {
-							this.items = res.result
-						}
-					}
-				})
-			},
-			//--------------------------------------
-			//确定选中--回显
-			checkPointBtn(val, type) {
-				if (type == 1) {
-
-					this.regionId = []
-					let arr = JSON.parse(JSON.stringify(val[0].parents));
-					let obj = {
-						id: val[0].id,
-						regionName: val[0].regionName
-					};
-
-					arr.push(obj);
-					this.regionId.push(obj.id)
-
-					//获取选中的字符串 名称
-					var regionName = arr.map(function(item, index) {
-						return item.regionName;
-					}).join("/");
-					this.checkPointName = regionName;
-					let userInfo = {
-						type: 11,
-						value: -1
-					}
-					this.searchItem(userInfo, 1)
-				}
-				// this.listData = [];
-				// this.getListData()
-			},
-			//获取检查部位 列表
-			getCheckPointList() {
-				this.sendRequest({
-					url: 'xmgl/qualityRegion/list',
-					method: 'post',
-					data: {
-						projectSn: this.condition.projectSn
-					},
-					success: res => {
-						if (res.code == 200) {
-							this.checkPointList = res.result;
-						}
-					}
-				})
-			},
-			//切换tab
-			changeTab(type) {
-				this.checkedTab = type;
-				this.condition.status = type;
-				this.condition.pageNo = 1;
-				this.condition.pageSize = 1000;
-				this.listData = [];
-				this.checkPointName = ''
-				this.regionId = []
-				this.getListData()
-			},
-			//获取列表数据
-			getListData() {
-				if (this.checkedTab == 2 || this.checkedTab == 5) {
-					this.condition.changeId = this.userInfo.userId
-					this.condition.reviewId = ''
-					this.condition.verifyManId = ''
-					this.condition.regionId = []
-				} else if (this.checkedTab == 3) {
-					this.condition.reviewId = this.userInfo.userId
-					this.condition.changeId = '';
-					this.condition.verifyManId = ''
-					this.condition.regionId = []
-				} else if (this.checkedTab == 4) {
-					this.condition.verifyManId = this.userInfo.userId
-					this.condition.changeId = '';
-					this.condition.reviewId = ''
-					this.condition.regionId = []
-				} else if (this.checkedTab == 6) {
-					this.condition.status = ''
-					this.condition.verifyManId = ''
-					this.condition.changeId = '';
-					this.condition.reviewId = ''
-					this.condition.regionId = this.regionId
-				} else if (this.checkedTab == 0) {
-					this.condition.status = ''
-					this.condition.verifyManId = ''
-					this.condition.changeId = '';
-					this.condition.reviewId = ''
-					this.condition.engineeringId = this.engineeringId
-					this.condition.recordType = 1
-					// this.condition.regionId = this.regionId
-				} else if (this.checkedTab == 9) {
-					this.condition.status = ''
-					this.condition.verifyManId = ''
-					this.condition.changeId = '';
-					this.condition.reviewId = ''
-					this.condition.recordType = 2
-					this.condition.engineeringId = this.engineeringId
-					// this.condition.regionId = this.regionId
-				} else {
-					this.condition.status = ''
-					this.condition.reviewId = '';
-					this.condition.changeId = '';
-					this.condition.verifyManId = ''
-					this.condition.regionId = ''
-
-				}
-				console.log('查询列表条件数据', this.checkedTab)
-				let that = this;
-				// uni.showLoading({title: '加载中'})
-				that.condition.type = that.workType
-				this.sendRequest({
-					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
-					method: 'post',
-					data: that.condition,
-					success: res => {
-						console.log(res)
-						that.listNum = res.result.page.total
-						// uni.hideLoading()
-						let arr = JSON.parse(JSON.stringify(that.listData));
-						if (res.result.page.records.length > 0) {
-							let newArr = arr.concat(res.result.page.records);
-							if (res.result.page.records.length < 10) {
-								that.teach = false;
-							} else {
-								that.teach = true;
-							}
-							that.listData = newArr;
-						} else {
-							that.teach = false;
-						}
-					}
-				})
-			},
-			goDetails(obj) {
-				// uni.navigateTo({
-				//   url: './details?id=' + id + '&type=' + this.checkedTab
-				// })
-				console.log("====================================");
-				console.log("====================================");
-				console.log("====================================");
-				uni.navigateTo({
-					url: '../../safeSame/details?id=' + obj.id + '&type=' + obj.status
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.line {
-		width: 100%;
-		height: 1px;
-		background-color: #ccc;
-		margin-top: 3%;
-	}
-
-	.screenDialog {
-		position: absolute;
-		// top: 11%;
-		height: 95%;
-		/* background: pink; */
-		background: white;
-		width: 100%;
-		border-radius: 20px;
-		margin-left: -4%;
-		background-color: white;
-		/* 设置为半透明的灰色 */
-		z-index: 9;
-		/* 设置一个较大的 z-index 值，保证遮罩层在最上层 */
-
-
-		.closeIcon {
-			float: right;
-			font-size: 25px;
-			color: gray;
-			margin-right: 3%;
-		}
-
-		.screenTitle {
-			text-align: center;
-			margin-top: 4%;
-			font-size: 18px;
-			font-weight: 500;
-		}
-
-		.screenContent {
-			height: 60%;
-			// width: 90%;
-			margin: -65% 0%;
-			overflow: scroll;
-			position: relative;
-			margin-top: 180%;
-			border-radius: 20px;
-			// margin-left: -4%;
-			background-color: white;
-			padding-left: 10%;
-
-			.titleItem {
-				font-size: 14px;
-
-				.regionText {
-					display: inline-block;
-					margin-left: 16%;
-					width: 190px;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-				}
-			}
-		}
-
-		.screenItem {
-			display: flex;
-			flex-wrap: wrap;
-
-			.screenI {
-				width: 100px;
-				font-size: 12px;
-				height: 30px;
-				background: #f7f8fa;
-				border-radius: 15px;
-				text-align: center;
-				line-height: 30px;
-				color: gray;
-				margin: 5% 0;
-			}
-
-			.screenText {
-				width: 90px;
-				font-size: 12px;
-				height: 30px;
-				background: #f7f8fa;
-				border-radius: 15px;
-				text-align: center;
-				line-height: 30px;
-				color: #000;
-				margin: 5% 5% 5% 0%;
-			}
-
-			.active {
-				width: 90px;
-				font-size: 12px;
-				height: 30px;
-				background: #edf2fe;
-				border-radius: 15px;
-				text-align: center;
-				line-height: 30px;
-				color: #000;
-				margin: 5% 5% 5% 0%;
-				border: 1px solid #5181f6;
-			}
-
-			.screenTextClose {
-				width: 90px;
-				font-size: 12px;
-				height: 30px;
-				text-align: center;
-				line-height: 30px;
-				color: #000;
-				margin: 5% 5% 5% 0%;
-			}
-		}
-
-		.footerBtn {
-			display: flex;
-			text-align: center;
-			line-height: 40px;
-			margin-top: 2%;
-			margin-left: 6%;
-
-			.foterLeft {
-				width: 43%;
-				background: #f6f7f8;
-				height: 40px;
-				border-top-left-radius: 20px;
-				border-bottom-left-radius: 20px;
-				color: #5181f6;
-			}
-
-			.foterRight {
-				width: 43%;
-				background: #5181f6;
-				height: 40px;
-				border-top-right-radius: 20px;
-				border-bottom-right-radius: 20px;
-				color: #fff;
-			}
-		}
-
-	}
-
-	.searchBox {
-		background-color: white;
-	}
-
-	.uni-form-item {
-		position: relative;
-		display: flex;
-		font-size: 14px;
-		/* .search-icon{
-			position: absolute;
-			top: 50%;
-			right: 50rpx;
-			transform: translateY(-50%);
-		} */
-	}
-
-	.uni-input {
-		border-radius: 20px;
-		margin: 10px 10px;
-		background-color: #f7f8fa;
-		height: 35px;
-		line-height: 30px;
-		padding: 0 20px;
-		font-size: 14px;
-		width: 70%;
-	}
-
-	.screen {
-		line-height: 50px;
-		color: gray;
-	}
-
-	.picker {
-		margin-bottom: 15px;
-		margin-left: 100px;
-		width: 164px;
-		border: 1px solid #ccc;
-		height: 30px;
-		border-radius: 10px;
-	}
-
-	.flex {
-		display: flex;
-		align-items: center;
-	}
-
-	.flex2 {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.tab {
-		width: 100%;
-		height: 45px;
-		text-align: center;
-		box-shadow: 0 0 10px rgba(194, 194, 194, 0.5);
-	}
-
-	.tabType {
-		// width: 33%;
-		width: 50%;
-		line-height: 43px;
-		border-bottom: 1px solid rgba(194, 194, 194, 0.2);
-
-	}
-
-	.checkedTab {
-		color: #4181FE;
-		border-bottom: 2px solid #4181FE;
-
-	}
-
-	.noCheckTab {
-		padding-bottom: 2px;
-	}
-
-	.content {
-		padding: 0px 30rpx 0;
-		box-sizing: border-box;
-		width: 100%;
-	}
-
-	.item {
-		height: 160px;
-		width: 100%;
-		padding: 12px 30rpx;
-		box-sizing: border-box;
-		box-shadow: 0 0 10px rgba(194, 194, 194, 0.5);
-		border-radius: 4px;
-		margin-bottom: 15px;
-		color: rgba(51, 51, 51, 1);
-		font-size: 32rpx;
-		font-family: PingFangSC-Medium;
-
-
-	}
-
-	.rightStatus {
-		float: right;
-		font-size: 12px;
-		margin-top: -18px;
-		width: 60px;
-		height: 20px;
-		text-align: center;
-		border-radius: 10px;
-		color: #fff;
-		line-height: 18px;
-	}
-
-	.item_title {
-		font-weight: 600;
-		margin-bottom: 2px;
-	}
-
-	.item_content {
-		width: 100%;
-		font-size: 28rpx;
-		color: rgba(51, 51, 51, 1);
-		font-family: PingFangSC-Regular;
-		line-height: 28px;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-		color: #999;
-
-	}
-
-	.item_info {
-		font-size: 26rpx;
-		line-height: 24px;
-		font-family: PingFangSC-Regular;
-		color: #999;
-	}
-
-	.state {
-		padding: 0px 8px;
-		color: #fff;
-		box-sizing: border-box;
-		border-radius: 30px;
-		font-size: 24rpx;
-	}
-
-	.bg1 {
-		background-color: rgba(245, 166, 35, 1);
-		box-shadow: 0px 2px 0px rgba(242, 76, 50, 0.28);
-	}
-
-	.bg2 {
-		background-color: rgba(88, 86, 214, 1);
-		box-shadow: 0px 2px 0px rgba(87, 81, 217, 0.28);
-	}
-
-	.bg3 {
-		background-color: rgba(238, 94, 94, 1);
-		box-shadow: 0px 2px 0px rgba(236, 92, 98, 0.28);
-	}
-
-	.bg4 {
-		background-color: rgba(76, 217, 100, 1);
-		box-shadow: 0px 2px 0px rgba(68, 219, 94, 0.28);
-	}
-
-	.noData {
-		text-align: center;
-		font-size: 32rpx;
-		margin-top: 120px;
-		color: #bed0fb;
-	}
-
-	.noDataImg {
-		width: 125px;
-		height: 98px;
-	}
-
-	::v-deep .tki-tree-cnt {
-		z-index: 99999;
-		border-radius: 20px;
-	}
-
-	::v-deep .tki-tree-bar {
-		border-top-left-radius: 20px;
-		border-top-right-radius: 20px;
-	}
-
-	::v-deep .placeholder {
-		padding-left: 40px;
-	}
-
-	.popupShow {
-		overflow: hidden;
-		// position: fixed;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/safeMesure.vue b/pages/projectEnd/specialOperations/fireWork - 副本/safeMesure.vue
deleted file mode 100644
index 3579d01a..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/safeMesure.vue	
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-	<view class="safe-mesure">
-		<headers class="fixedheader" :themeType="true" :showBack="true">
-			<view class="headerName">
-				安全措施
-			</view>
-		</headers>
-		<view class="safe-mesure-container">
-			<view class="safe-mesure-header">
-				<view class="header-left">安全措施</view>
-				<view class="header-right">是否涉及</view>
-			</view>
-			<view class="safe-mesure-list">
-				<view class="safe-mesure-item">
-					<view class="item-left">
-						1.动火设备内部构件清洗干净,蒸汽吹扫或水洗、置换合格,达到动火条件
-					</view>
-					<view class="item-right" style="color: green;">是</view>
-				</view>
-				<view class="safe-mesure-item">
-					<view class="item-left">
-						2.与动火设备相连接的所有管线已断开,加盲板()块,未采取水封或仅关闭阀的方式代替盲板
-					</view>
-					<view class="item-right" style="color: red;">否</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-.safe-mesure{
-	min-height: 100%;
-	background: #F6F6F6;
-	.fixedheader{
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		z-index: 2;
-	}
-	.safe-mesure-container{
-		margin-top: 88rpx;
-		padding: 0 20rpx;
-		// background-color: darkred;
-		.safe-mesure-header{
-			display: flex;
-			// justify-content: space-between;
-			margin-top: 10rpx;
-			line-height: 80rpx;
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #81818c;
-			.header-left{
-				width: 65%;
-				display: flex;
-				justify-content: center;
-			}
-			.header-right{
-				width: 35%;
-				display: flex;
-				justify-content: center;
-			}
-		}
-		.safe-mesure-list{
-			.safe-mesure-item{
-				display: flex;
-				// justify-content: space-between;
-				margin-top: 15rpx;
-				// line-height: 40rpx;
-				.item-left{
-					width: 65%;
-				}
-				.item-right{
-					width: 35%;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-				}
-				
-			}
-		}
-	}
-}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/side.vue b/pages/projectEnd/specialOperations/fireWork - 副本/side.vue
deleted file mode 100644
index c9f3a397..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/side.vue	
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-	<view class="control">
-		<!-- <view class="control-h2 flex j-between a-center">
-			进度记录
-			<view class="control-total">0/10</view>
-		</view> -->
-		<view class="control-list" v-if="listData && listData.length>0">
-			<view class="control-item" v-for="(item,index) in listData" :key="index">
-				<view class="item-title b-bottom">
-					{{item.sideStationAddr}}
-				</view>
-				<view class="item-select-box b-bottom" :class="{'b-bottom': item.imageUrl}">
-					<view class="item-content">旁站记录：{{item.buildSituation}}</view>
-				</view>
-				<view class="item-img" v-if="item.imageUrl">
-					现场照片
-					<view class="img-wrap flex a-center">
-						<view class="imgBox" v-for="(item,index) in item.imageUrl.split(',')" :key="index">
-							<image :src="url_config+'image/'+item" class="img"
-								@click="previewImage(url_config+'image/'+item)"></image>
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
-		<view class="no-data" v-else>
-			<image class="img" src="/static/noData.png"></image>
-			<text class="txt">暂无数据</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props:['detailId'],
-		data(){
-			return{
-				listData:[]
-			}
-		},
-		created(){
-			this.initData()
-		},
-		methods:{
-			previewImage(url) {
-				uni.previewImage({
-					urls: [url]
-				})
-			},
-			initData(){
-				this.sendRequest({
-					url:'xmgl/dangerousEngineeringSideStation/selectList',
-					method:'post',
-					data: {
-						engineeringId: this.detailId,
-						type:2,
-					},
-					success:res=>{
-						uni.hideLoading()
-						if(res.code==200){
-							this.listData = res.result
-							console.log(res)
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.control{
-		padding-top: 20rpx;
-		padding-bottom: 40rpx;
-		.flex{
-			display: flex;
-		}
-		.j-between{
-			justify-content: space-between;
-		}
-		.a-center{
-			align-items: center;
-		}
-		.b-bottom{
-			border-bottom: 1px solid #F6F6F6;
-		}
-		.control-h2{
-			font-size: 14px;
-			height: 60rpx;
-			padding: 0 20rpx;
-			background: rgba(255,255,255,0.5);
-		}
-		.control-list{
-			font-size: 14px;
-			.control-item{
-				padding: 0 20rpx;
-				margin-bottom: 20rpx;
-				background: #fff;
-				.item-title{
-					font-weight: 600;
-					height: 72rpx;
-					line-height: 72rpx;
-				}
-			}
-			.item-select-box{
-				padding: 30rpx 0;
-				.item-content{
-					width: 100%;
-				}
-				
-			}
-			.img-wrap{
-				margin-top: 20rpx;
-				flex-wrap: wrap;
-			}
-			.item-img{
-				padding: 30rpx 0;
-				.imgBox{
-					width: 100rpx;
-					height: 100rpx;
-					margin-left: 20rpx;
-					.img{
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-		}
-		.no-data{
-			text-align: center;
-			.img{
-				display: block;
-				height: 200rpx;
-				width: 200rpx;
-				margin: 0 auto;
-				margin-top: 60rpx;
-				margin-bottom: 60rpx;
-			}
-			.txt{
-				color: #C0C4CC;
-			}
-		}
-	}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/work.vue b/pages/projectEnd/specialOperations/fireWork - 副本/work.vue
deleted file mode 100644
index b78d82f6..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/work.vue	
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-	<view class="dangerbig-list">
-		<headers class="fixedheader" :themeType="true" :showBack="true">
-			<view class="headerName">
-				动火作业
-			</view>
-			
-		</headers>
-		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
-			<view class="list" v-if="workList && workList.length>0">
-				<view class="list-item" v-for="(item,index) in workList" :key="index" @click="checkItem(item)">
-					<view class="list-title">
-						<!-- 未销项 -->
-						<view>
-							<!-- <text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text> -->
-							动火地点和动火部位：{{item.fireLocationAndFirePart}}
-						</view>
-						<!-- <view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3}">
-							{{item.engineeringState == 2 ? "在施" : item.engineeringState == 3 ? "已完工" : ""}}
-						</view> -->
-						<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
-							{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}
-						</view> -->
-					</view>
-					<view class="list-content">
-						<view class="list-info">
-							<!-- 类别：{{item.engineeringTypeName}} -->
-							动火人：{{item.firemanName}}
-							<!-- <view class="info-status" v-if="item.issuperdanger">超危</view> -->
-						</view>
-					</view>
-				</view>
-				<view class="loadMoreBox" v-if="isLoadMore">
-					<uni-load-more :status="loadStatus" iconType="auto"></uni-load-more>
-				</view>
-			</view>
-			<view class="no-data" v-else>
-				<image class="img" src="/static/noData.png"></image>
-				<text class="txt">暂无数据</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data(){
-			return{
-				statusBarHeight: 0,
-				pageNo: 1,
-				pageSize: 10,
-				projectSn: "",
-				listData:[],
-				isLoadMore: false,
-				loadStatus: 'more',
-				workList: [],
-			}
-		},
-		onShow(){
-			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
-			this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn
-		},
-		onLoad(){
-			this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn
-			// this.initData()
-			this.getWorkList()
-		},
-		onReachBottom() {
-			console.log(1)
-			if(!this.isLoadMore){  //此处判断，上锁，防止重复请求
-				this.isLoadMore=true
-				this.pageNo+=1
-				this.getWorkList()
-			}
-		},
-		onPullDownRefresh() {
-			console.log(2)
-			this.pageNo=1
-			this.listData=[]
-			this.getWorkList()
-		},
-		methods:{
-			getWorkList(){
-				let data = {
-					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-					projectSn: this.projectSn
-				}
-				this.sendRequest({
-					url:'xmgl/xzSpecialOperationFireSafety/page',
-					method:'get',
-					data:data,
-					success:res=>{
-						uni.hideLoading()
-						if(res.code==200){
-						console.log("workList======================",res)
-							// this.listData = res.result.records
-							// this.workList=this.workList.concat(res.result)
-							this.workList=this.workList.concat(res.result.records)
-							if(res.result.records.length<this.pageSize){  //判断接口返回数据量小于请求数据量，则表示此为最后一页
-								  this.isLoadMore=true                                             
-								  this.loadStatus='nomore'
-							}else{
-								  this.isLoadMore=false
-								  // that.loadStatus='more'
-							}
-							uni.stopPullDownRefresh()
-						}
-					}
-				})
-			},
-			
-			checkItem(val){
-				console.log(val)
-				uni.navigateTo({
-					url:'./detail?id='+val.id
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.dangerbig-list{
-	min-height: 100%;
-	background: #F6F6F6;
-	.fixedheader{
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		z-index: 2;
-		.headerName{
-			z-index: 1;
-		}
-	}
-	
-	.list{
-		padding:20rpx 0;
-		.list-item{
-			background: #fff;
-			margin-bottom: 20rpx;
-			.list-title{
-				padding: 20rpx;
-				border-bottom: 2px solid #F6F6F6;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				.tag{
-					background: #F0AD4E;
-					color: #fff;
-					padding: 4rpx 8rpx;
-					font-size: 12px;
-					margin-right: 20rpx;
-					margin-left: -20rpx;
-					height: 32rpx;
-				}
-				.status1{
-					background: #F0AD4E;
-					color: #fff;
-					padding: 4rpx 8rpx;
-					font-size: 12px;
-				}
-				.status2{
-					background: #ccc;
-					color: #fff;
-					padding: 4rpx 8rpx;
-					font-size: 12px;
-				}
-			}
-			.list-info{
-				display: flex;
-				padding: 20rpx;
-				font-size: 14px;
-			}
-			.info-status{
-				padding:0 10rpx;
-				border: 1px solid #DD524D;
-				border-radius: 6rpx;
-				color: #DD524D;
-				margin-left: 10rpx;
-			}
-		}
-	}
-	.btn{
-		height: 96rpx;
-		width: 100%;
-		line-height: 96rpx;
-		text-align: center;
-		background: #4181FE;
-		color: #fff;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-	}
-	.no-data{
-		text-align: center;
-		.img{
-			display: block;
-			height: 200rpx;
-			width: 200rpx;
-			margin: 0 auto;
-			margin-top: 60rpx;
-			margin-bottom: 60rpx;
-		}
-		.txt{
-			color: #C0C4CC;
-		}
-	}
-}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork - 副本/workFinally.vue b/pages/projectEnd/specialOperations/fireWork - 副本/workFinally.vue
deleted file mode 100644
index 1eb35c4e..00000000
--- a/pages/projectEnd/specialOperations/fireWork - 副本/workFinally.vue	
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-	<view class="danger-project">
-		<view class="" v-if="finallyCheckList.length > 0">
-			<view class="finally" v-for="item in finallyCheckList" :key="item.id">
-				<view style="padding:10px;">
-					<text style="font-weight: bold;">动火作业</text>
-					<!-- {{item.engineeringName}} -->
-				</view>
-				<view style="padding:10px;">
-					<text style="font-weight: bold;">验收时间：</text>{{item.planTime}}
-				</view>
-				<view style="padding:10px;">
-					<text style="font-weight: bold;">验收人：</text>{{item.acceptanceUserName}}
-				</view>
-				<view style="padding:10px;">
-					<text style="font-weight: bold;" v-if="item.acceptanceResult === null || item.acceptanceResult === undefined">验收结果：待确认</text>
-					<text style="font-weight: bold;" v-if="item.acceptanceResult === 1">验收结果：合格</text>
-					<text style="font-weight: bold;" v-if="item.acceptanceResult === 2">验收结果：不合格</text>
-				</view>
-			</view>
-		</view>
-		<view class="no-data" v-else>
-			<image class="img" src="/static/noData.png"></image>
-			<text class="txt">暂无数据</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props:['detailId','detailData'],
-		data() {
-			return {
-				finallyCheckList: [],
-			};
-		},
-		created() {
-			this.initData()
-		},
-		onLoad(val) {
-		},
-		onShow() {
-			
-		},
-		methods:{
-			initData(){
-				let engineeringId = this.detailId
-				this.sendRequest({
-					url:'xmgl/xzDangerousEngineeringAcceptance/list',
-					method:'get',
-					data:{
-						engineeringId: this.detailId,
-						projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
-						type: 2
-					},
-					success:res=>{
-						uni.hideLoading()
-						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
-						this.finallyCheckList = res.result;
-					}
-				})
-			},
-			sendMessage(val){
-				this.$emit('message', val);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-.danger-project{	
-	.finally{
-		background-color: #fff;
-		height: 150px;
-		margin: 10px;
-	}
-	.no-data{
-		text-align: center;
-		.img{
-			display: block;
-			height: 200rpx;
-			width: 200rpx;
-			margin: 0 auto;
-			margin-top: 60rpx;
-			margin-bottom: 60rpx;
-		}
-		.txt{
-			color: #C0C4CC;
-		}
-	}
-}
-</style>
diff --git a/pages/projectEnd/specialOperations/fireWork/safeList.vue b/pages/projectEnd/specialOperations/fireWork/safeList.vue
index 24c3ce4e..f50a9927 100644
--- a/pages/projectEnd/specialOperations/fireWork/safeList.vue
+++ b/pages/projectEnd/specialOperations/fireWork/safeList.vue
@@ -504,6 +504,7 @@
 				this.condition.regionId = this.regionId
 
 				let that = this;
+				that.condition.type = that.workType
 				this.sendRequest({
 					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
 					method: 'post',
@@ -562,6 +563,7 @@
 				this.condition.search = e.detail.value
 				let that = this;
 				// uni.showLoading({title: '加载中'})
+				that.condition.type = that.workType
 				this.sendRequest({
 					url: 'xmgl/xzSecurityQualityInspectionRecord/list',
 					method: 'post',