修改bug

pagesA/fire/check_active/add_check/add_check.vue

@@ -120,7 +120,7 @@
 					<u-search placeholder="请输入检查项" v-model="keyword" bgColor="#edf6f9" borderColor="#4cb2b6"
 						:show-action="false"></u-search>
 				</view> -->
-				<view class="popup-button">
+				<view class="popup-button heigthButton">
 					<uni-row>
 						<uni-col :span='12'>
 							<u-button shape="circle" type="primary" color="#4CB2B6" text="确定" @click="checkboxConfirm">
@@ -133,8 +133,8 @@
 						</uni-col>
 					</uni-row>
 				</view>
-				<view class="page-body" :style="'height:' +(height-80) + 'px'">
-					<scroll-view class="nav-left" scroll-y :style="'height:' + (height-100) + 'px'"
+				<view class="page-body" :style="'height:' +(height-wheight -80) + 'px'">
+					<scroll-view class="nav-left" scroll-y :style="'height:' + (height-wheight -80) + 'px'"
 						:scroll-top="scrollLeftTop" scroll-with-animation>
 						<view class="nav-left-item" :class="index == categoryActive ? 'active' : ''"
 							v-for="(item, index) in list" @click="categoryClickMain(index,item)" :key="index">
@@ -142,7 +142,7 @@
 						</view>
 					</scroll-view>
 					<scroll-view class="nav-right" scroll-y :scroll-top="scrollTop" @scroll="scroll"
-						:style="'height:' + height + 'px'" scroll-with-animation>
+						:style="'height:' +(height-wheight -140) + 'px'" scroll-with-animation>
 						<view v-for="(item, index) in list" :key="index" class="box">
 							<view style="height: 60rpx;font-size: 32rpx;color:#000;font-weight: 600;padding: 25rpx;">
 								{{item.label}}
@@ -164,7 +164,7 @@
 
 			<!-- 多选closeable closeOnClickOverlay--点击遮罩层不可关闭所属部门的弹出内容选中 ，选择部门-->
 			<u-popup :show="checkboxShow3" :round="10" @close="checkboxShow3=false" style="position: relative;">
-				<view class="popup-button">
+				<view class="popup-button heigthButton">
 					<uni-row>
 						<uni-col :span='12'>
 							<u-button shape="circle" type="primary" color="#4CB2B6" text="确定" @click="checkboxConfirm3">
@@ -177,8 +177,8 @@
 						</uni-col>
 					</uni-row>
 				</view>
-				<view class="page-body" :style="'height:' + height + 'px'">
-					<scroll-view class="nav-left" scroll-y :style="'height:' + height + 'px'"
+				<view class="page-body" :style="'height:' + (height - wheight- 80) + 'px'">
+					<scroll-view class="nav-left" scroll-y :style="'height:' + (height-80) + 'px'"
 						:scroll-top="scrollLeftTop" scroll-with-animation>
 						<view class="nav-left-item" :class="index == categoryActive ? 'active' : ''"
 							v-for="(item, index) in list3Jia" @click="categoryClickMain(index,item)" :key="index">
@@ -186,7 +186,7 @@
 						</view>
 					</scroll-view>
 					<scroll-view class="nav-right" scroll-y :scroll-top="scrollTop" @scroll="scroll"
-						:style="'height:' + height + 'px'" scroll-with-animation>
+						:style="'height:' +( height-140) + 'px'" scroll-with-animation>
 						<view v-for="(item, index) in list3Jia" :key="index" class="box">
 							<view style="height: 60rpx;font-size: 32rpx;color:#000;font-weight: 600;padding: 25rpx;">
 								{{ `单位${item.id}` }}
@@ -240,6 +240,7 @@
 	export default {
 		data() {
 			return {
+				wheight: '',
 				keyword: '',
 				list3Jia: [{
 					name: '测试部门'
@@ -404,6 +405,7 @@
 
 		},
 		onReady() {
+		
 			// this.checkedTotal3(this.pageNo)  部门
 			this.checkedTotal(this.pageNo)
 			this.getData(this.pageNo)
@@ -976,6 +978,7 @@
 	}
 
 	.nav-left-item {
+		padding: 0px 12px;
 		height: 150rpx;
 		border-right: solid 1px #f1f1f1;
 		border-bottom: solid 1px #f1f1f1;
@@ -1097,16 +1100,18 @@
 	}
 
 	.popup-button {
-		width: 100%;
+		width: 75%;
 		position: absolute;
-		left: 0;
-		bottom: 84rpx;
+		left: 25%;
+		bottom: 40rpx;
 		z-index: 9999;
+		background-color: #fff;
 	}
 
-	.zan-cun,
-	/deep/ .uni-row {
+		
+	.zan-cun{
 		margin-top: 200rpx;
+		
 	}
 
 	.u-page__tag-item {

pagesA/fire/check_active/check_implement/check_implement.vue

@@ -155,7 +155,8 @@
 					@click="checkImplementConfirm">
 					<!-- 立即处理改为暂存了 -->
 				</u-button>
-				<u-button shape="circle" type="primary" color="#4CB2B6" text="生成隐患" @click="checkImplementRelease">
+				<u-button shape="circle" type="primary" color="#4CB2B6" text="完成任务"
+					@click="checkImplementRelease">
 				</u-button>
 			</div>
 		</view>
@@ -359,7 +360,7 @@
 				qrcodeShow: false,
 				qrcodeResault: '等待扫码...',
 				onDecodeIndex: '',
-
+				submitButton: '完成任务',
 			}
 		},
 		watch: {
@@ -393,8 +394,8 @@
 
 				if (that.newtableDatas && that.newtableDatas[0][option.broadId]) { //获取本地缓存的数据
 					that.tableData = that.newtableDatas[0][option.broadId]
-					that.tableData.map(i=>i.choiceDanger=that.choiceDanger)
-					console.log(that.tableData,'that.tableData');
+					that.tableData.map(i => i.choiceDanger = that.choiceDanger)
+					console.log(that.tableData, 'that.tableData');
 					that.insTypeData = uni.getStorageSync('insTypeData')
 
 				} else {
@@ -522,10 +523,11 @@
 								that.$modal.msgSuccess('扫码成功')
 							}, 200)
 							that.checkTableDataId = checkTableDataIds
+
 						}
 
 					},
-					fail: () => {
+					fail: (err) => {
 						that.$modal.msgError('未识别到二维码，请重新尝试！')
 					}
 				})
@@ -534,7 +536,11 @@
 			// #ifdef H5
 			// H5相机相关函数
 			onDecode(qrcodeVal) {
-				this.$modal.msgSuccess('扫码成功', qrcodeVal)
+				try {
+					let result = JSON.parse(qrcodeVal);
+				} catch (error) {
+					return this.$modal.alert('无法解析二维码内容');
+				}
 				this.qrcodeResault = qrcodeVal
 				let result = JSON.parse(qrcodeVal)
 				this.tableData[this.onDecodeIndex].qrcodeShow = false
@@ -553,9 +559,6 @@
 						that.insTypeData.map(i => i.attUrl = [])
 					}
 				})
-				setTimeout(() => {
-					that.$modal.msgSuccess('扫码成功')
-				}, 200)
 			},
 			onInit(promise) { //未使用
 				promise
@@ -572,11 +575,13 @@
 
 			},
 			closeImage(item, val, k) { //删除图片
-				console.log(item, 'iii');
-				if (item.fpdType) {
+				console.log(item, 'iii', k, this.insTypeData, this.tableData);
+				if (item.fpdType == 'fpd') {
 					this.insTypeData[k].attUrl.splice(val, 1)
+				} else {
+					this.tableData[k].attUrl.splice(val, 1)
 				}
-				this.tableData[k].attUrl.splice(val, 1)
+
 				that.$forceUpdate();
 			},
 			goDetail() { //去详情
@@ -614,7 +619,6 @@
 			},
 			checkImplementRelease() { //提交发布
 				this.shuJu()
-
 				this.saveImplement.inspectList.map((i) => { //提交数据组装
 					if (i.inspType == 'fpd') {
 						i.hisFpdCreateReqVOList.map(k => {
@@ -677,43 +681,45 @@
 						return;
 					}
 				})
-				// this.saveImplement.inspectList.map((i, index) => {
-				// 	if (i.inspType != 'fpd') {
-				// 		i.inspectResultList.map((k, indexs) => {
-				// 			if (i.attUrl.length == 0) {
-				// 				if (k.isNormal == 1 && k.subValue == 0 && !this.yilou) return this.show3 =
-				// 					true
-				// 			}
-				// 		})
-				// 	} else if (i.inspType == 'fpd' && i.hisFpdCreateReqVOList.length == 0) {
-				// 		return this.show4 = true
-				// 	}
-				// })
+				// console.log(this.saveImplement, '消防设备和消防设施');  屏蔽未检查校验2
+				this.saveImplement.inspectList.map((i, index) => {
+					if (i.inspType != 'fpd') { //有不正常的必须拍照 
+						i.inspectResultList.map((k, indexs) => {
+							if (i.attUrl.length == 0) {
+								if (k.isNormal == 1 && k.subValue == 0 && !this.yilou) return this.show3 =
+									true
+							}
+						})
+					} else if (i.inspType == 'fpd' && i.hisFpdCreateReqVOList.length == 0) {
+						return this.show4 = true
+					}
+				})
 				// console.log(this.saveImplement, '消防设备和消防设施');  屏蔽未检查校验2
 				//检查拍照是否有遗漏没有勾选的-----------
-				// if (!this.show && !this.show3 && !this.show4) {屏蔽未检查校验2
-				if (!this.show) {
-					// 巡查未完成判断
-					console.log(this.saveImplement, '1111111111111111');
-					checkSubmitRelease(JSON.stringify(this.saveImplement)).then(response => {
-						if (response.data) {
-							uni.showToast({
-								title: '提交成功',
-								icon: 'none',
-								duration: 2000
-							})
-							const table = uni.getStorageSync('tableData')
-							delete table[this.saveImplement.broadId] //保存时删除掉保存的那一项再保存
-							uni.setStorageSync('tableData', table)
-							setTimeout(() => {
-								uni.redirectTo({
-									url: `/pagesA/fire/check_active/index?current=1&type=${this.type}`
-								});
-							}, 1000)
-						} else {
-							this.$modal.msgError('提交失败')
-						}
-					})
+				if (!this.show && !this.show3 && !this.show4) { //屏蔽未检查校验2
+					if (!this.show) {
+						// 巡查未完成判断
+						console.log(this.saveImplement, '1111111111111111');
+						// checkSubmitRelease(JSON.stringify(this.saveImplement)).then(response => {
+						// 	if (response.data) {
+						// 		uni.showToast({
+						// 			title: '提交成功',
+						// 			icon: 'none',
+						// 			duration: 2000
+						// 		})
+						// 		const table = uni.getStorageSync('tableData')
+						// 		delete table[this.saveImplement.broadId] //保存时删除掉保存的那一项再保存
+						// 		uni.setStorageSync('tableData', table)
+						// 		setTimeout(() => {
+						// 			uni.redirectTo({
+						// 				url: `/pagesA/fire/check_active/index?current=1&type=${this.type}`
+						// 			});
+						// 		}, 1000)
+						// 	} else {
+						// 		this.$modal.msgError('提交失败')
+						// 	}
+						// })
+					}
 				}
 			},
 			shuJu() {
@@ -893,7 +899,6 @@
 				// ----扫码选择隐患
 				if (items.isNormal == 0 && items.subValue == 1) {
 					this.show5 = true; // 显示描述框
-					console.log();
 					// this.insTypeData.choiceDanger.map(i => i.checkedListDanger = [])
 				} else {
 					this.show5 = false; // 显示描述框
@@ -951,7 +956,7 @@
 				}
 				// ----扫码选择隐患
 				this.description2 = ''
-				this.show5=false
+				this.show5 = false
 				// this.tableData.map((i) => { //这一段不用放开，以前是用于消防设备扫多个码统计数据展示的
 				// 	if (i.id = fpdId) {
 				// 		let isNormalZero=new Array(i.inspectResultList.length)  //新建数组用来放isNormal为1和不为1处理后的分别的数组
@@ -981,7 +986,7 @@
 			//拍照上传
 			photoUpload(val) {
 				let pictures = [];
-				let that = this;
+				var that = this;
 				uni.chooseImage({
 					sourceType: ['camera'], //实现拍照
 					count: 3,
@@ -1025,9 +1030,8 @@
 													let imgUrl = JSON.parse(res
 														.data)
 													// that.imageList.push(imgUrl.data)
-													if (!val.fpdType) {
-														console.log(that.tableData,
-															'!val.fpdType');
+													if (!val.fpdType || val
+														.inspType != 'fpd') {
 														that.tableData.map((i,
 															index) => {
 															if (val.id == i
@@ -1056,9 +1060,9 @@
 													that.$forceUpdate();
 													// // 返回的url
 												},
-												fail: () => {
+												fail: (err) => {
 													that.loading = false
-													this.$modal.msg(err)
+													this.$modal.msg(err.msg)
 												}
 											})
 											// // 保存到本地

pagesA/fire/drill/drill_details/drill_details.vue

@@ -44,11 +44,11 @@
 			</u--form>
 		</view>
 		<uni-row class="heigthButton">
-			<u-button v-if="historyView" @click="gotoDrill()" shape="circle" size="large" color="#4cb2b6" style="width: 60%;"
-				text="返回"></u-button>
-			<u-button v-else @click="gotoEditDrill(formData)" shape="circle" size="large" color="#4cb2b6" style="width: 60%;"
-				text="修改信息"></u-button>
-		   
+			<u-button v-if="historyView" @click="gotoDrill()" shape="circle" size="large" color="#4cb2b6"
+				style="width: 60%;" text="返回"></u-button>
+			<u-button v-else @click="gotoEditDrill(formData)" shape="circle" size="large" color="#4cb2b6"
+				style="width: 60%;" text="修改信息"></u-button>
+
 		</uni-row>
 	</view>
 </template>
@@ -68,7 +68,7 @@
 				},
 				screenHeight: this.$screenHeight,
 				wheight: '',
-				historyView:false
+				historyView: false
 			};
 		},
 		mounted() {
@@ -77,8 +77,8 @@
 			}).exec()
 		},
 		onLoad: function(option) {
-			if(option.historyView=='historyView'){
-				this.historyView=true
+			if (option.historyView == 'historyView') {
+				this.historyView = true
 			}
 			that = this
 			var data = option.id;
@@ -100,7 +100,7 @@
 				console.log(attId, 'sdf');
 				downSee(attId)
 			},
-			gotoDrill(){
+			gotoDrill() {
 				uni.navigateBack()
 			},
 			// 传递当前页面数据到 ‘修改信息’
@@ -161,4 +161,7 @@
 		color: #274647;
 		font-weight: 600;
 	}
+	.example{
+		overflow-y: auto;
+	}
 </style>

pagesA/fire/fire_inspetItem/add-street/streetCzfpczl.vue

@@ -73,7 +73,7 @@
 			</u-button>
 		</view>
 		<!-- 加载中 -->
-		<isLodingModel></isLodingModel>
+		<!-- <isLodingModel></isLodingModel> -->
 	</view>
 </template>
 

pagesA/fire/hidden_trouble/index.vue

@@ -1,10 +1,11 @@
 <template>
 	<view class="  uni-container uni-container-bg">
-		<view class="uni-padding-wrap uni-common-mt">
-			<uni-segmented-control :current="current" :values="items" style-type="text" active-color="rgb(25, 146, 148)"
-				@clickItem="onClickItem" />
-		</view>
-		<!-- 		<uni-row class="demo-uni-row align-center flex padding-tb-sm" :gutter="20" width="100%">
+		<view class="example container" :style="'height: ' + (screenHeight - wheight - 10) + 'px'">
+			<view class="uni-padding-wrap uni-common-mt">
+				<uni-segmented-control :current="current" :values="items" style-type="text"
+					active-color="rgb(25, 146, 148)" @clickItem="onClickItem" />
+			</view>
+			<!-- 		<uni-row class="demo-uni-row align-center flex padding-tb-sm" :gutter="20" width="100%">
 			<uni-col :span="12" class="flex flex-direction-row ">
 				<text class="text-Width">开始时间：</text>
 				<u-button customStyle="color: #2563EB;" plain shape="circle" size="small" color="#2563EB"
@@ -24,8 +25,8 @@
 				</u-datetime-picker>
 			</uni-col>
 		</uni-row> -->
-		<!-- 搜索 -->
-		<!-- <uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
+			<!-- 搜索 -->
+			<!-- <uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
 			<view class="" style="display: flex; align-items: center;">
 				<uni-col :span="22">
 					<view class="u-page__tag-item">
@@ -38,146 +39,152 @@
 				</uni-col>
 			</view>
 		</uni-row> -->
-		<view v-if="current == 0">
-			<view class="" style="margin-bottom: 100rpx;">
-				<u-list @scrolltolower="scrolltolower">
-					<u-list-item v-for="(item, index) in tableData" :key="index" link>
-						<uni-row>
-							<uni-col :span="2">
-								<view class="" style="position: absolute;top: 0rpx;">
-									<image :src="item.checked ?zhengchang:moren" class="tupian"
-										@click="listItemChecked(item,index)">
-									</image>
-								</view>
-							</uni-col>
-							<uni-col :span="22">
-								<view class="">
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="18" class="text-xl font-weight-700">{{item.insp_name}}</uni-col>
-										<uni-col :span="6" class="text-xl font-weight-700">
-											<u-button size="mini" :color="'#ed7d31'">
-												未确认
-											</u-button>
-										</uni-col>
-									</uni-row>
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="24" class="text-2cut text-grey1   ">{{item.description}}
-										</uni-col>
-									</uni-row>
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="18" class="text-cut text-grey1">巡查时间：{{item.inspect_time}}</uni-col>
-										<uni-col :span="6" class="justify-end flex ">
-											<!-- 	<u-button size="small"
+			<view v-if="current == 0">
+				<view class="" style="margin-bottom: 100rpx;">
+					<u-list @scrolltolower="scrolltolower">
+						<u-list-item v-for="(item, index) in tableData" :key="index" link>
+							<uni-row>
+								<uni-col :span="2">
+									<view class="" style="position: absolute;top: 0rpx;">
+										<image :src="item.checked ?zhengchang:moren" class="tupian"
+											@click="listItemChecked(item,index)">
+										</image>
+									</view>
+								</uni-col>
+								<uni-col :span="22">
+									<view class="">
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="18"
+												class="text-xl font-weight-700">{{item.insp_name}}</uni-col>
+											<uni-col :span="6" class="text-xl font-weight-700">
+												<u-button size="mini" :color="'#ed7d31'">
+													未确认
+												</u-button>
+											</uni-col>
+										</uni-row>
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="24" class="text-2cut text-grey1   ">{{item.description}}
+											</uni-col>
+										</uni-row>
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="18"
+												class="text-cut text-grey1">巡查时间：{{item.inspect_time}}</uni-col>
+											<uni-col :span="6" class="justify-end flex ">
+												<!-- 	<u-button size="small"
 							:color="item.status==='0'||item.status==='3'?'red':item.status==='1'?'green':'blue'"
 							style="width: 160rpx;">{{statusListTran(item.status)}}</u-button> -->
-											<u-button size="small" color="rgb(25, 146, 148)" style="width: 160rpx;"
-												@click.native="onClick(item)">查看详情</u-button>
-										</uni-col>
-									</uni-row>
-								</view>
-							</uni-col>
-						</uni-row>
-					</u-list-item>
-				</u-list>
+												<u-button size="small" color="rgb(25, 146, 148)" style="width: 160rpx;"
+													@click.native="onClick(item)">查看详情</u-button>
+											</uni-col>
+										</uni-row>
+									</view>
+								</uni-col>
+							</uni-row>
+						</u-list-item>
+					</u-list>
+				</view>
+				<view class="review-button heigthButton">
+					<u-button size="small" color="rgb(25, 146, 148)" :customStyle="btnGetCode" style="width: 280rpx;"
+						@click.native="sureBtn">确认</u-button>
+				</view>
 			</view>
-			<view class="review-button">
-				<u-button size="small" color="rgb(25, 146, 148)" :customStyle="btnGetCode" style="width: 280rpx;"
-					@click.native="sureBtn">确认</u-button>
-			</view>
-		</view>
-		<view v-else-if="current == 1">
-			<view class="" style="margin-bottom: 100rpx;">
-				<u-list @scrolltolower="scrolltolower">
-					<u-list-item v-for="(item, index) in tableData" :key="index" link>
-						<uni-row>
-							<uni-col :span="2">
-								<view class="" style="position: absolute;top: 0rpx;">
-									<image :src="item.checked ?zhengchang:moren" class="tupian"
-										@click="listItemChecked(item,index)">
-									</image>
-								</view>
-							</uni-col>
-							<uni-col :span="22">
-								<view class="">
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="18" class="text-xl font-weight-700">{{item.insp_name}}</uni-col>
-										<uni-col :span="6" class="text-xl font-weight-700">
-											<u-button size="mini" color="#ed7d31">
-												未处理
-											</u-button>
-										</uni-col>
-									</uni-row>
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="24" class="text-2cut text-grey1   ">{{item.description}}
-										</uni-col>
-									</uni-row>
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="18" class="text-cut text-grey1">巡查时间：{{item.inspect_time}}
-										</uni-col>
-										<uni-col :span="6" class="justify-end flex ">
-											<!-- 	<u-button size="small"
+			<view v-else-if="current == 1">
+				<view class="" style="margin-bottom: 100rpx;">
+					<u-list @scrolltolower="scrolltolower">
+						<u-list-item v-for="(item, index) in tableData" :key="index" link>
+							<uni-row>
+								<uni-col :span="2">
+									<view class="" style="position: absolute;top: 0rpx;">
+										<image :src="item.checked ?zhengchang:moren" class="tupian"
+											@click="listItemChecked(item,index)">
+										</image>
+									</view>
+								</uni-col>
+								<uni-col :span="22">
+									<view class="">
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="18"
+												class="text-xl font-weight-700">{{item.insp_name}}</uni-col>
+											<uni-col :span="6" class="text-xl font-weight-700">
+												<u-button size="mini" color="#ed7d31">
+													未处理
+												</u-button>
+											</uni-col>
+										</uni-row>
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="24" class="text-2cut text-grey1   ">{{item.description}}
+											</uni-col>
+										</uni-row>
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="18" class="text-cut text-grey1">巡查时间：{{item.inspect_time}}
+											</uni-col>
+											<uni-col :span="6" class="justify-end flex ">
+												<!-- 	<u-button size="small"
 							:color="item.status==='0'||item.status==='3'?'red':item.status==='1'?'green':'blue'"
 							style="width: 160rpx;">{{statusListTran(item.status)}}</u-button> -->
-											<u-button size="small" color="rgb(25, 146, 148)" style="width: 160rpx;"
-												@click.native="onClick(item)">查看详情</u-button>
-										</uni-col>
-									</uni-row>
-								</view>
-							</uni-col>
-						</uni-row>
-					</u-list-item>
-				</u-list>
-			</view>
-			<view class="review-button">
-				<u-button size="small" color="rgb(25, 146, 148)" :customStyle="btnGetCode" style="width: 280rpx;"
-					@click.native="reviewBtn">复 查</u-button>
+												<u-button size="small" color="rgb(25, 146, 148)" style="width: 160rpx;"
+													@click.native="onClick(item)">查看详情</u-button>
+											</uni-col>
+										</uni-row>
+									</view>
+								</uni-col>
+							</uni-row>
+						</u-list-item>
+					</u-list>
+				</view>
+				<view class="review-button heigthButton">
+					<u-button size="small" color="rgb(25, 146, 148)" :customStyle="btnGetCode" style="width: 280rpx;"
+						@click.native="reviewBtn">复 查</u-button>
+				</view>
 			</view>
-		</view>
 
-		<view v-else-if="current == 2">
-			<view class="" style="margin-bottom: 100rpx;">
-				<u-list @scrolltolower="scrolltolower">
-					<u-list-item v-for="(item, index) in tableData" :key="index" link>
-						<uni-row>
-							<!-- <uni-col :span="2">
+			<view v-else-if="current == 2">
+				<view class="" style="margin-bottom: 100rpx;">
+					<u-list @scrolltolower="scrolltolower">
+						<u-list-item v-for="(item, index) in tableData" :key="index" link>
+							<uni-row>
+								<!-- <uni-col :span="2">
 								<view class="" style="position: absolute;top: 0rpx;" v-if="item.denger_status==0">
 									<image :src="item.checked ?zhengchang:moren" class="tupian"
 										@click="listItemChecked(item,index)">
 									</image>
 								</view>
 							</uni-col> -->
-							<uni-col :span="22">
-								<view class="">
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="18" class="text-xl font-weight-700">{{item.insp_name}}</uni-col>
-										<uni-col :span="6" class="text-xl font-weight-700">
-											<!-- <u-button size="mini" :color="item.denger_status=='0'?'#ed7d31':'#aace99'">
+								<uni-col :span="22">
+									<view class="">
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="18"
+												class="text-xl font-weight-700">{{item.insp_name}}</uni-col>
+											<uni-col :span="6" class="text-xl font-weight-700">
+												<!-- <u-button size="mini" :color="item.denger_status=='0'?'#ed7d31':'#aace99'">
 												{{ item.denger_status=='0'?'未处理':'已处理'}}
 											</u-button> -->
-											<u-button size="mini" color="#aace99">
-												已处理
-											</u-button>
-										</uni-col>
-									</uni-row>
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="24" class="text-2cut text-grey1   ">{{item.description}}
-										</uni-col>
-									</uni-row>
-									<uni-row class="demo-uni-row  " :gutter="20" width="100%">
-										<uni-col :span="18" class="text-cut text-grey1">巡查时间：{{item.inspect_time}}</uni-col>
-										<uni-col :span="6" class="justify-end flex ">
-											<!-- 	<u-button size="small"
+												<u-button size="mini" color="#aace99">
+													已处理
+												</u-button>
+											</uni-col>
+										</uni-row>
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="24" class="text-2cut text-grey1   ">{{item.description}}
+											</uni-col>
+										</uni-row>
+										<uni-row class="demo-uni-row  " :gutter="20" width="100%">
+											<uni-col :span="18"
+												class="text-cut text-grey1">巡查时间：{{item.inspect_time}}</uni-col>
+											<uni-col :span="6" class="justify-end flex ">
+												<!-- 	<u-button size="small"
 							:color="item.status==='0'||item.status==='3'?'red':item.status==='1'?'green':'blue'"
 							style="width: 160rpx;">{{statusListTran(item.status)}}</u-button> -->
-											<u-button size="small" color="rgb(25, 146, 148)" style="width: 160rpx;"
-												@click.native="onClick(item)">查看详情</u-button>
-										</uni-col>
-									</uni-row>
-								</view>
-							</uni-col>
-						</uni-row>
-					</u-list-item>
-				</u-list>
+												<u-button size="small" color="rgb(25, 146, 148)" style="width: 160rpx;"
+													@click.native="onClick(item)">查看详情</u-button>
+											</uni-col>
+										</uni-row>
+									</view>
+								</uni-col>
+							</uni-row>
+						</u-list-item>
+					</u-list>
+				</view>
 			</view>
 		</view>
 		<!-- 搜索框 -->
@@ -273,18 +280,20 @@
 		shijianc
 	} from '@/utils/common.js'
 	import config from '@/config'
-	const baseUrlImg=config.baseUrlImg
+	const baseUrlImg = config.baseUrlImg
 	export default {
 		components: {
 			swiperl
 		},
 		data() {
 			return {
-				items: ['隐患确认','待复查',  '已处理'],
+				screenHeight: this.$screenHeight,
+				wheight: '',
+				items: ['隐患确认', '待复查', '已处理'],
 				current: 0,
 				moren: `${baseUrlImg}/checkActive/moren.png`, //默认图片
 				zhengchang: `${baseUrlImg}/checkActive/zhengchang.png`,
-				photograph:`${baseUrlImg}/checkActive/photograph.png`,
+				photograph: `${baseUrlImg}/checkActive/photograph.png`,
 				btnGetCode: {
 					width: '280rpx', // 注意驼峰命名，并且值必须用引号包括，因为这是对象 
 				},
@@ -341,7 +350,7 @@
 					receiver: "",
 					sender: 0,
 					isReport: "",
-					receiverName:""
+					receiverName: ""
 				},
 				isReportList: [{
 					value: 0,
@@ -382,13 +391,18 @@
 				},
 			}
 		},
-		onReady() {},
 		// 在 vue页面，向起始页通过事件传递数据
 		onLoad: function(option) {
+
 			console.log("this.$store.state: ", this.$store.state);
 			console.log('DICT_TYPE', getDictDatas(DICT_TYPE.DENGER_HANDLE));
 		},
 		onShow() {
+			this.$nextTick(() => {
+				uni.createSelectorQuery().in(this).select('.heigthButton').boundingClientRect(data => {
+					this.wheight = data.height
+				}).exec()
+			})
 			this.tableData = []
 			this.getData(1)
 		},
@@ -414,9 +428,10 @@
 				deep: true, // 重点
 			},
 		},
-		methods: {		
-			cancelClick(){
-				this.showOrg=false	
+		methods: {
+			cancelClick() {
+				this.list5=[]
+				this.showOrg = false
 				this.showreview = false
 			},
 			// tab头部点击
@@ -425,8 +440,8 @@
 					this.current = e.currentIndex;
 				}
 				this.queryParams.dengerStatus = e.currentIndex == 2 ? 2 : (e.currentIndex == 0 ? 0 : 1)
-				
-				this.tableData=[]
+
+				this.tableData = []
 				this.getData(1)
 				this.dangerIds = []
 			},
@@ -549,14 +564,14 @@
 				this.dangerIdStatus.dangerStatus = 1
 				this.dangerIdStatus.dangerIds = Array.from(new Set(this.dangerIds)) //去重
 				console.log(this.dangerIdStatus, 'this.dangerIdStatusthis.dangerIdStatus');
-					batchSetDangerStatus(JSON.stringify(this.dangerIdStatus)).then(res => {
-						console.log(res, 'resresres');
-						if (res.data) {
-							this.current = 1
-							this.queryParams.dengerStatus = 1
-							this.getData(1)
-						}
-					})
+				batchSetDangerStatus(JSON.stringify(this.dangerIdStatus)).then(res => {
+					console.log(res, 'resresres');
+					if (res.data) {
+						this.current = 1
+						this.queryParams.dengerStatus = 1
+						this.getData(1)
+					}
+				})
 
 			},
 			reviewBtn() {
@@ -629,8 +644,9 @@
 					dangeRreview(this.reviewFromdata).then(response => {
 						if (response.data) this.$modal.msgSuccess('修改成功')
 						this.showreview = false
-						this.list5=[]
+						this.list5 = []
 						this.restReviewform()
+						this.tableData = []
 						this.getData(1)
 					});
 				}).catch(errors => {
@@ -688,9 +704,20 @@
 		display: flex;
 		align-items: center;
 	}
+
+	/deep/.u-action-sheet {
+		overflow-y: auto;
+		height: 1000rpx;
+		background-color: #fff;
+	}
+
 	/deep/.u-action-sheet {
 		overflow-y: auto;
 		height: 1000rpx;
 		background-color: #fff;
 	}
-</style>
+
+	.example {
+		overflow-y: auto;
+	}
+</style>

pagesA/fire/hidden_trouble/trouble_details/trouble_details.vue

@@ -7,13 +7,13 @@
 	<view class="  uni-container">
 		<view class=" flex  flex-direction width100">
 			<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-			<u--form ref="uForm" :model="formData" labelPosition="left" labelWidth="80" labelAlign="left">
+			<u--form ref="uForm" :model="formData" labelPosition="left" labelWidth="90" labelAlign="left">
 				<view class="" >
 					<u-form-item label="检查项名称" prop="name" ref="item1">
 						<text class="text-1cut padding-sm">{{formData.inspName}}</text>
 					</u-form-item>
-					<u-form-item label="检查日期" prop="time" ref="item1">
-						<text class="text-1cut padding-sm"> {{formData.time}} </text>
+					<u-form-item label="检查日期" prop="inspectTime" ref="item1">
+						<text class="text-1cut padding-sm"> {{formData.inspectTime}} </text>
 					</u-form-item>
 					<u-form-item label="检查内容" prop="description" ref="item1">
 						<text class="  padding-sm"> {{formData.description}}</text>
@@ -131,7 +131,7 @@
 				}).then(response => {
 					console.log(response);
 					// 为数据赋值：通过展开运算符的形式，进行新旧数据的拼接 
-					this.formData = response.data ? response.data : {}
+					this.formData = response.data ? response.data : {},
 					this.loading = false;
 				});
 			}, 

pagesA/fire/unit_info/org_report/org_report.vue

@@ -164,7 +164,7 @@
 			},
 			/** 搜索按钮操作 */
 			handleQuery() {
-				 if (this.queryParams.reportDate.length&&this.queryParams.reportDate.indexOf(":") === -1) {
+				 if (this.queryParams.reportDate.length&&this.queryParams.reportDate[0].indexOf(":") == -1) {
 				     this.queryParams.reportDate[0]=this.queryParams.reportDate[0]+' 00:00:00'
 				     this.queryParams.reportDate[1]=this.queryParams.reportDate[1]+' 23:59:59'
 				    }

pagesA/fire/unit_info/unit_info_details/unit_info_details.vue

@@ -122,6 +122,7 @@
 	import {
 		shijianc
 	} from '@/utils/common.js'
+	  import { parseTime } from "@/utils/ruoyi"
 	export default {
 		data() {
 			return {
@@ -154,7 +155,7 @@
 					})
 				})
 			});
-			that.getData(data);
+			// that.getData(data);
 			//单位类型 显示传递过来的选项  + 'px';
 
 		},
@@ -175,6 +176,9 @@
 				}).then(response => {
 					this.formData = response.data;
 					this.formData.sjxfgxdw = this.sjxfgxdwName
+					//时间戳转年月日
+					this.formData.qrsj=parseTime(this.formData.qrsj)
+					this.formData.qxsj=parseTime(this.formData.qxsj)
 					this.actions.map(i => {
 						if (this.formData.dwxz == i.value) {
 							this.formData.dwxzName = i.label

pagesB/fire/check_record/index.vue

@@ -1,6 +1,7 @@
 <template>
-	<view class="container uni-container uni-container-bg">
-<!-- 		<uni-section title="" padding style="background-color: #F5F7F9;">
+	<view class="uni-container uni-container-bg">
+		<view class="container">
+			<!-- 		<uni-section title="" padding style="background-color: #F5F7F9;">
 			<view class="example-body">
 				<view class="tag-view" style="display: flex;flex-wrap: wrap;">
 					<uni-tag style="margin: 5px;cursor: pointer;padding: 5px;" v-for="(item,index) in tagLabel"
@@ -9,68 +10,71 @@
 				</view>
 			</view>
 		</uni-section> -->
-		<view style="margin-bottom: 20rpx;">
-			<u-tabs :list="items" @click="onClickItem" activeStyle="color:#4CB2B6" inactiveStyle="color:#000"
-				:current="current" :scrollable="true" lineWidth="60" lineColor="#4CB2B6"></u-tabs>
-			<view style="height: 2rpx;background-color: #E5E5E5;margin-top: 10rpx;"></view>
-		</view>
-		<component :is="selectedTag" v-if="selectedTag!=''">
-		</component>
-		<view class="" v-else-if="fireInspection">
-			<u-list @scrolltolower="scrolltolower" v-if="tableData.length>0 && isLoaded">
-				<view class="top">
-					<view class="">
-						<u-search placeholder="请输入任务名称" bgColor="#edf6f9" borderColor="#4cb2b6" v-model="taskname"
-							:showAction="false"></u-search>
-						<view class="search-time">
-							<uni-datetime-picker v-model="kewords" type="daterange" @custom="changeLog" />
+			<view style="margin-bottom: 20rpx;">
+				<u-tabs :list="items" @click="onClickItem" activeStyle="color:#4CB2B6" inactiveStyle="color:#000"
+					:current="current" :scrollable="true" lineWidth="60" lineColor="#4CB2B6"></u-tabs>
+				<view style="height: 2rpx;background-color: #E5E5E5;margin-top: 10rpx;"></view>
+			</view>
+			<component :is="selectedTag" v-if="selectedTag!=''">
+			</component>
+			<view class="" v-else-if="fireInspection">
+				<u-list @scrolltolower="scrolltolower" v-if="tableData.length>0 && isLoaded">
+					<view class="top">
+						<view class="">
+							<u-search placeholder="请输入任务名称" bgColor="#edf6f9" borderColor="#4cb2b6" v-model="taskname"
+								:showAction="false"></u-search>
+							<view class="search-time">
+								<uni-datetime-picker v-model="kewords" type="daterange" @custom="changeLog" />
+							</view>
+						</view>
+						<view class="search-icon">
+							<u-icon name="search" color="#4CB2B6" size="42" @click="changeLog"></u-icon>
 						</view>
 					</view>
-					<view class="search-icon">
-						<u-icon name="search" color="#4CB2B6" size="42" @click="changeLog"></u-icon>
-					</view>
-				</view>
-				<u-list-item v-for="(item, index) in tableData" :key="index" @click.native="onClick(item)" link>
-					<uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
-						<uni-col :span="24" class="text-xl font-weight-700" v-if="my==''">{{ item.task_name }}</uni-col>
-						<!-- 	<u-badge v-if="item.isdenger==1" :value="1011" numberType="overflow" isDot
+					<u-list-item v-for="(item, index) in tableData" :key="index" @click.native="onClick(item)" link>
+						<uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
+							<uni-col :span="24" class="text-xl font-weight-700"
+								v-if="my==''">{{ item.task_name }}</uni-col>
+							<!-- 	<u-badge v-if="item.isdenger==1" :value="1011" numberType="overflow" isDot
 						customStyle="margin-right:40px" /> -->
-						<u-icon v-if="item.isdenger==1&&my==''" name="warning-fill" color="#ff5647" size="28"
-							customStyle="margin-right:20px"></u-icon>
-					</uni-row>
-					<uni-row class="demo-uni-row padding-bottom-sm" :gutter="20" width="100%">
-						<uni-col :span="24" class="text-cut text-grey1">任务介绍：{{ item.insp_name }}</uni-col>
-						<u-icon v-if="item.isdenger==1&&my!=''" name="warning-fill" color="#ff5647" size="28"
-							customStyle="margin-right:20px"></u-icon>
-					</uni-row>
-					<uni-row class="demo-uni-row padding-bottom-sm" :gutter="20" width="100%">
-						<uni-col :span="24" class="text-cut text-grey1">详情描述：{{ item.description }}</uni-col>
-					</uni-row>
-					<uni-row class="demo-uni-row padding-bottom-sm" :gutter="20" width="100%">
-						<uni-col :span="24" class="text-cut text-grey1">提交时间：{{ item.inspect_time}}</uni-col>
-						<!-- 	<uni-col :span="16" class="text-cut text-grey1">提交时间：{{ item.cutofftime }}</uni-col>
+							<u-icon v-if="item.isdenger==1&&my==''" name="warning-fill" color="#ff5647" size="28"
+								customStyle="margin-right:20px"></u-icon>
+						</uni-row>
+						<uni-row class="demo-uni-row padding-bottom-sm" :gutter="20" width="100%">
+							<uni-col :span="24" class="text-cut text-grey1">任务介绍：{{ item.insp_name }}</uni-col>
+							<u-icon v-if="item.isdenger==1&&my!=''" name="warning-fill" color="#ff5647" size="28"
+								customStyle="margin-right:20px"></u-icon>
+						</uni-row>
+						<uni-row class="demo-uni-row padding-bottom-sm" :gutter="20" width="100%">
+							<uni-col :span="24" class="text-cut text-grey1">详情描述：{{ item.description }}</uni-col>
+						</uni-row>
+						<uni-row class="demo-uni-row padding-bottom-sm" :gutter="20" width="100%">
+							<uni-col :span="24" class="text-cut text-grey1">提交时间：{{ item.inspect_time}}</uni-col>
+							<!-- 	<uni-col :span="16" class="text-cut text-grey1">提交时间：{{ item.cutofftime }}</uni-col>
 					<uni-col :span="8" class="justify-end flex ">
 						<u-button class="margin-right-sm" size="small" color="#4CB2B6" style="width: 160rpx; "
 							 > 查看 </u-button>
 						<u-button size="small" color="red" style="width: 160rpx;">删除</u-button>
 					</uni-col> -->
-					</uni-row>
-					<!-- <uni-row class="demo-uni-row padding-bottom-sm" :gutter="20" width="100%">
+						</uni-row>
+						<!-- <uni-row class="demo-uni-row padding-bottom-sm" :gutter="20" width="100%">
 					<uni-col :span="24" class="text-cut text-grey1"> 
 						<u-avatar-group :urls="item.url" size="35" gap="0.4" maxCount='5' @showMore="onClick(item)">
 						</u-avatar-group>
 					</uni-col>
 				</uni-row> -->
-				</u-list-item>
-			</u-list>
-			<view v-else-if="tableData.length==0 && isLoaded" style="text-align: center;">
-				<view class="text-gray" style="padding-top: 20px;">
-					<img :src="tan90" alt="暂无数据" />
+					</u-list-item>
+				</u-list>
+				<view v-else-if="tableData.length==0 && isLoaded" style="text-align: center;">
+					<view class="text-gray" style="padding-top: 20px;">
+						<img :src="tan90" alt="暂无数据" />
+					</view>
 				</view>
+				<!-- 加载中 -->
+				<isLodingModel></isLodingModel>
 			</view>
-			<!-- 加载中 -->
-			<isLodingModel></isLodingModel>
 		</view>
+
 	</view>
 </template>
 <script>
@@ -163,7 +167,7 @@
 				fireInspection: true,
 				clicKValue: 0, //点击的样式
 				selectedTag: '',
-				current:''
+				current: ''
 			};
 		},
 		watch: {
@@ -183,11 +187,11 @@
 		},
 
 		onShow() {
-				this.tableData = []
-				this.getData(1);
-				this.selectedTag =''
-				this.fireInspection =true
-				this.current=0
+			this.tableData = []
+			this.getData(1);
+			this.selectedTag = ''
+			this.fireInspection = true
+			this.current = 0
 		},
 
 		methods: {
@@ -200,29 +204,29 @@
 				switch (e.index) {
 					case 0:
 						this.fireInspection = true //消防检查结果
-						this.selectedTag=''
+						this.selectedTag = ''
 						break;
 					case 1:
 						this.drill = true //培训与演练
-						this.selectedTag='Drill'
+						this.selectedTag = 'Drill'
 						break;
 					case 2:
 						this.fireService = true //消防设施维护和检测
-						this.selectedTag='FpdDetection'
+						this.selectedTag = 'FpdDetection'
 						break;
 					case 3:
 						this.special = true //特种作业人员
-						this.selectedTag='FireSpecial'
+						this.selectedTag = 'FireSpecial'
 						break;
 					case 4:
 						this.hotApproval = true //动火审批
-						this.selectedTag='FireWork'
+						this.selectedTag = 'FireWork'
 						break;
 					default:
 						break;
 				}
-				console.log(this.current,'l');
-				
+				console.log(this.current, 'l');
+
 			},
 			setInverted(value, rotues) { //标签的点击事件
 				this.fireInspection = false;
@@ -235,19 +239,19 @@
 						this.fireInspection = true //消防检查结果
 						break;
 					case 1:
-					// 	this.drill = true //培训与演练
-					// 	break;
-					// case 2:
-					// 	this.fireService = true //消防设施维护和检测
-					// 	break;
-					// case 3:
-					// 	this.special = true //特种作业人员
-					// 	break;
-					// case 4:
-					// 	this.hotApproval = true //动火审批
-					// 	break;
-					// default:
-					// 	break;
+						// 	this.drill = true //培训与演练
+						// 	break;
+						// case 2:
+						// 	this.fireService = true //消防设施维护和检测
+						// 	break;
+						// case 3:
+						// 	this.special = true //特种作业人员
+						// 	break;
+						// case 4:
+						// 	this.hotApproval = true //动火审批
+						// 	break;
+						// default:
+						// 	break;
 				}
 				this.clicKValue = value
 				this.selectedTag = rotues;
@@ -278,7 +282,7 @@
 					pageSize: this.pageSize,
 					userId: this.$store.state.user.id,
 					inspectTime: this.kewords,
-					taskName: this.taskname
+					inspName: this.taskname
 				}
 				if (this.my == 'onlymy') {
 					getSelfInspecthisPage(formChuan).then(response => {