修改bug

pages.json

@@ -705,7 +705,7 @@
 			}, {
 				"path": "fire/check_inspection/inspect_detail/inspect_detail",
 				"style": {
-					"navigationBarTitleText": "主动检查详情",
+					"navigationBarTitleText": "",
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false
 				}

pagesA/fire/check_inspection/check_inspection.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="uni-container uni-container-bg">
+		<view class="example container" :style="'height: ' + (screenHeight - 75) + 'px'">
 		<!-- 下拉框 -->
 		<view class="u-page__tag-item" style="margin-bottom: 26upx;width: 700upx;border-bottom: 2px solid #55cbbf;">
 			<u-form>
@@ -58,6 +59,7 @@
 				</view>
 			</uni-card>
 		</view>
+			</view>
 		<!-- 扫码弹出层 -->
 		<u-popup :show="maShow" :round="10" @close="maShow=false">
 			<view v-if="insTypeData!=''">
@@ -324,6 +326,7 @@
 		},
 		data() {
 			return {
+				screenHeight: this.$screenHeight,
 				// ----扫码选择隐患
 				showPopupDanger: false,
 				choiceDanger: getDictDatas(DICT_TYPE.DANGER_TYPE),
@@ -465,7 +468,7 @@
 			// ----扫码选择隐患
 			qrScanOpen() {},
 			async getInspect() {
-				const res = await getInspectInfo(1, 999)
+				const res = await getInspectInfo({pageNo:1,pageSize:100})
 				this.ManualData = res.data.list
 				this.actionsManual = res.data.list.filter(obj => obj.inspType !== 'fpd').map(obj => {
 					return {
@@ -1262,6 +1265,7 @@
 	//隐患弹框
 	/deep/.u-popup__content {
 		overflow-y: auto;
+		height: 90vh;
 	}
 
 	.text-xl {
@@ -1278,7 +1282,11 @@
 		margin-bottom: 100rpx;
 
 	}
-	// /deep/.u-action-sheet {
-	// 	overflow-y: auto;
-	// }
+	.example {
+		overflow-y: auto;
+	}
+	
+	/deep/.u-action-sheet {
+		overflow-y: auto;
+	}
 </style>

pagesA/fire/fire_device/add_device/add_device.vue

@@ -17,12 +17,12 @@
 					<u-form-item label="所在位置	" prop="fpdLocal">
 						<u-input v-model="formData.fpdLocal" placeholder="请输入所在位置" />
 					</u-form-item>
-					<u-form-item label="设备状态" @click="
+		<!-- 			<u-form-item label="设备状态" @click="
 							showSex4 = true;
 							hideKeyboard();
 						">
 						<u--input v-model="fpdStatus" disabled disabledColor="#ffffff" placeholder="请选择设备状态"></u--input>
-					</u-form-item>
+					</u-form-item> -->
 
 					<u-form-item label="所属建筑">
 						<u-input v-model="formData.buildingId" placeholder="请输入所属建筑" />

pagesA/fire/fire_device/edit_device/edit_device.vue

@@ -21,12 +21,12 @@
 						<img :src="formData.fpdQcode" alt="设施二维码" style='width: 300upx;height: 300upx;'>
 					</u-form-item>
 
-					<u-form-item label="设备状态" @click="
+<!-- 					<u-form-item label="设备状态" @click="
 							showSex4 = true;
 							hideKeyboard();
 						">
 						<u--input v-model="fpdStatus" disabled disabledColor="#ffffff" placeholder="请选择设备状态"></u--input>
-					</u-form-item>
+					</u-form-item> -->
 
 					<u-form-item label="所在位置	" prop="fpdLocal">
 						<u-input v-model="formData.fpdLocal" placeholder="请输入所在位置" />
@@ -34,7 +34,7 @@
 					<u-form-item label="所属建筑	">
 						<u-input v-model="formData.buildingId" placeholder="请输入所属建筑" />
 					</u-form-item>
-					<u-form-item label="设施类别" prop="formData.fpdType" @click="
+					<u-form-item label="设施类别" prop="fpdType" @click="
 							showSex = true;
 							hideKeyboard();
 						">
@@ -134,7 +134,9 @@
 				formData: {
 					status: '0',
 					orgName: '',
-					picVOList: []
+					picVOList: [],
+					fpdTypeName:'',
+					fpdType:''
 				},
 				fileList1: [],
 				// 用于显示下拉确认内容，不作为提交
@@ -148,7 +150,7 @@
 						trigger: ['blur', 'change']
 					},
 
-				}
+				},
 			};
 		},
 		computed: {},
@@ -183,6 +185,15 @@
 				this.formData = res.data
 				that.formData.orgName = res.data.orgDO.orgName
 
+				this.actions2.map(i => {
+					console.log(res.data,'iiiiiiiiiiiii');
+					if (res.data.fpdType == i.id) {
+						this.formData.fpdTypeName = i.name
+						this.formData.fpdType=i.id
+					}
+				})
+
+
 			})
 
 			// const eventChannel = this.getOpenerEventChannel();
@@ -202,12 +213,6 @@
 				that.fpdStatus = '有问题'
 			}
 
-			// 根据传递过来的数据,显示设施类别的状态
-			if (that.formData.fpdType == 1) {
-				that.formData.fpdTypeName = '设备类型1'
-			} else if (that.formData.fpdType == 2) {
-				that.formData.fpdTypeName = '设备类型2'
-			}
 			// 获取单位id
 			getOrgId({
 				pageNo: this.pageNo,
@@ -276,7 +281,7 @@
 													console.log(that.formData
 														.picVOList,
 														'that.formData.picVOList'
-														);
+													);
 													that.$forceUpdate();
 													// // 返回的url
 												},
@@ -346,7 +351,7 @@
 			sexSelect2(e) {
 				console.log('e: ', e);
 				this.formData.fpdTypeName = e.label;
-				this.formData.fpdType = e.value;
+				this.formData.fpdType = e.id;
 				console.log(this.formData.fpdType);
 			},
 			// 设备状态
@@ -587,6 +592,7 @@
 	.example {
 		overflow-y: auto;
 	}
+
 	/deep/.u-action-sheet {
 		overflow-y: auto;
 		height: 1000rpx;

pagesA/fire/fire_device/index.vue

@@ -224,7 +224,6 @@
 					height: 50, // 设置预览图片的高度
 				});
 				const authSetting = await uni.getSetting();
-				console.log(authSetting, 'authSetting');
 				if (authSetting[1].authSetting['scope.writePhotosAlbum'] === false) {
 					uni.showModal({
 						title: '提示',

pagesA/fire/fire_station/edit_fireStation/edit_fireStation.vue

@@ -19,16 +19,7 @@
 							placeholder="请输入所属区县"></u-textarea>
 					</u-form-item>
 
-					<u-form-item label="建站日期" prop="builtOn">
-						<!-- <u-button
-							customStyle="background-color: #4cb2b6;"
-							plain
-							shape="circle"
-							size="small"
-							color="#fff"
-							@click="unitTime = true"
-							:text="formData.builtOn"
-						></u-button> -->
+					<u-form-item label="建站日期">
 						<uni-datetime-picker :show="unitTime" v-model="formData.builtOn" mode="date" closeOnClickOverlay
 							@confirm="ActiveUnitTime" @cancel="unitTime = false" @change="changetime"
 							@close="unitTime = false"></uni-datetime-picker>
@@ -109,7 +100,6 @@
 				formData: {
 					status: '0',
 					File: [],
-					builtOn: ''
 				},
 				// 自定义表单校验规则
 				customRules: {
@@ -202,13 +192,13 @@
 						// 因为需要提交的数据和绑定的数据不一样，所以要转换
 						this.formData['status'] = 0;
 						// this.formData.alarmTel=this.formData.alarm_tel
-						// this.formData.builtOn=this.formData.built_on
 						// this.formData.fireMoto=this.formData.fire_moto
 						// this.formData.foamCar=this.formData.foam_car
 						// this.formData.microName=this.formData.micro_name
 						// this.formData.waterTanker=this.formData.water_tanker
-						this.formData.builtOn = new Date(this.formData.builtOn).getTime()
-						console.log(this.formData);
+						if(!this.formData.builtOn){
+							this.formData.builtOn=null
+						}
 						var jsdata = JSON.stringify(this.formData);
 						updateStation(jsdata).then(response => {
 							console.log('response.data.msg,', response.data);

pagesA/fire/hidden_trouble/index.vue

@@ -234,7 +234,7 @@
 						</u--input>
 					</u-form-item>
 					<u-form-item label="复查人员:" @click="
-						showOrg = true;
+						showOrg = true;showHandleTime = false
 						hideKeyboard()">
 						<u-input border="none" disabled v-model="reviewFromdata.receiverName" style="padding:18rpx"
 							placeholder="请选择复查人员"></u-input>

pagesB/fire/fireSpecial/addSpecial/index.vue

@@ -106,8 +106,6 @@
 					numberCode: '',
 					idcardno: '',
 					empGender: '',
-					empBirthday: '',
-					issueDate: '',
 					att:'',
 					attId:[]
 				},