修改历史信息

pages.json

@@ -205,11 +205,6 @@
 					"navigationBarTitleText": "任务派遣"
 				}
 			}, {
-				"path": "fire/check_record/index",
-				"style": {
-					"navigationBarTitleText": "历史记录"
-				}
-			}, {
 				"path": "fire/check_tasks/index",
 				"style": {
 					"navigationBarTitleText": "检查任务管理"
@@ -361,12 +356,6 @@
 					"navigationStyle": "custom"
 				}
 			}, {
-				"path": "fire/check_record/personnel_record/personnel_record",
-				"style": {
-					"navigationBarTitleText": "人员记录查看",
-					"enablePullDownRefresh": false
-				}
-			}, {
 				"path": "fire/check_active/check_implement/check_implement",
 				"style": {
 					"navigationBarTitleText": "完成任务",
@@ -523,13 +512,6 @@
 					"enablePullDownRefresh": false
 				}
 			}, {
-				"path": "fire/check_record/picture/picture",
-				"style": {
-					"navigationBarTitleText": "历史记录详情",
-					"enablePullDownRefresh": false
-					// "navigationStyle": "custom"
-				}
-			}, {
 				"path": "fire/hidden_trouble/troble_treatment/troble_treatment",
 				"style": {
 					"navigationBarTitleText": "隐患处理",
@@ -933,31 +915,51 @@
 	}, {
 		"root": "pagesB",
 		"pages": [{
-			"path": "fire/fireSpecial/index",
-			"style": {
-				"navigationBarTitleText": "特种作业人员"
-			}
-		}, {
-			"path": "fire/fireWork/index",
-			"style": {
-				"navigationBarTitleText": "动火审批",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "fire/fireSpecial/addSpecial/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "fire/fireWork/addWork/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"path": "fire/fireSpecial/index",
+				"style": {
+					"navigationBarTitleText": "特种作业人员"
+				}
+			}, {
+				"path": "fire/fireWork/index",
+				"style": {
+					"navigationBarTitleText": "动火审批",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/fireSpecial/addSpecial/index",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/check_record/personnel_record/personnel_record",
+				"style": {
+					"navigationBarTitleText": "人员记录查看",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "fire/check_record/picture/picture",
+				"style": {
+					"navigationBarTitleText": "历史记录详情",
+					"enablePullDownRefresh": false
+					// "navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "fire/check_record/index",
+				"style": {
+					"navigationBarTitleText": "历史记录"
+				}
+			}, {
+				"path": "fire/fireWork/addWork/index",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
 			}
-
-		}]
+		]
 	}],
+	
 	"tabBar": {
 		"color": "#000000",
 		"selectedColor": "#000000",

pages/mine/index.vue

@@ -103,7 +103,7 @@
 			},
 			auditRecord() {
 				uni.navigateTo({
-					url:`/pagesA/fire/check_record/index?my=onlymy`
+					url:`/pagesB/fire/check_record/index?my=onlymy`
 				})
 			},
 			goInstuct(){

pagesA/fire/drill/drill_details/drill_details.vue

@@ -44,8 +44,11 @@
 			</u--form>
 		</view>
 		<uni-row class="heigthButton">
-			<u-button @click="gotoEditDrill(formData)" shape="circle" size="large" color="#4cb2b6" style="width: 60%;"
+			<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>
@@ -65,6 +68,7 @@
 				},
 				screenHeight: this.$screenHeight,
 				wheight: '',
+				historyView:false
 			};
 		},
 		mounted() {
@@ -73,6 +77,9 @@
 			}).exec()
 		},
 		onLoad: function(option) {
+			if(option.historyView=='historyView'){
+				this.historyView=true
+			}
 			that = this
 			var data = option.id;
 
@@ -93,6 +100,9 @@
 				console.log(attId, 'sdf');
 				downSee(attId)
 			},
+			gotoDrill(){
+				uni.navigateBack()
+			},
 			// 传递当前页面数据到 ‘修改信息’
 			gotoEditDrill(val) {
 				uni.navigateTo({

pagesA/fire/fpd_detection/detection_details/detection_details.vue

@@ -31,7 +31,9 @@
 			</u--form>
 		</view>
 		<uni-row class="heigthButton">
-			<u-button @click="gotoEditDetection(formData)" class="hBtn" shape="circle" size="large" color="#4cb2b6"
+			<u-button v-if="historyView" @click="gotoDetection()" class="hBtn" shape="circle" size="large"
+				color="#4cb2b6" style="width: 60%;" text="返回"></u-button>
+			<u-button v-else @click="gotoEditDetection(formData)" class="hBtn" shape="circle" size="large" color="#4cb2b6"
 				style="width: 60%;" text="修改信息"></u-button>
 		</uni-row>
 	</view>
@@ -63,6 +65,7 @@
 				wheight: '',
 				//当前id
 				thisId: '',
+				historyView: false
 			};
 		},
 		watch: {
@@ -121,7 +124,7 @@
 						});
 					});
 					uni.createSelectorQuery().in(this).select('.heigthButton').boundingClientRect(data => {
-						console.log('data',data);
+						console.log('data', data);
 						this.wheight = data.height
 					}).exec()
 					console.log('edit页面的val的值', this.formData);
@@ -130,7 +133,9 @@
 			}
 		},
 		onLoad: function(option) {
-
+			if (option.historyView == 'historyView') {
+				this.historyView = true
+			}
 			this.thisId = option.id
 			//获取当前表单数据
 			getFpdDetection(option.id).then(res => {
@@ -192,6 +197,9 @@
 		},
 
 		methods: {
+			gotoDetection() {
+				uni.navigateBack()
+			},
 			// 下载附件
 			down(attId) {
 				console.log(attId, 'sdf');

pagesA/fire/fpd_detection/fpd_detection.vue

@@ -124,6 +124,7 @@
 					detinspect: null,
 					detresult: null,
 				},
+				
 			}
 		},
 		methods: {

pagesA/fire/staff_info/add_staff/add_staff.vue

@@ -62,13 +62,13 @@
 						<u-input v-model="formData.hyqk" placeholder="请输入婚姻情况" />
 					</u-form-item>
 					<u-form-item label="籍贯">
-						<u-input v-model="formData.jgdm" placeholder="请输入籍贯" @click.native="showPickerJiguan" />
+						<u-input v-model="formData.jgdm" placeholder="请输入籍贯" @click.native="showPickerJiguan" disabled class="jiguan"/>
 					</u-form-item>
 					<!-- <u-form-item label="警官证号">
 						<u-input v-model="formData.jgzh" placeholder="请输入警官证号" />
 					</u-form-item> -->
 					<u-form-item label="民族">
-						<u-input v-model="formData.mzdm" placeholder="请选择民族" @click.native="showPicker" />
+						<u-input v-model="formData.mzdm" placeholder="请选择民族" @click.native="showPicker"  disabled class="jiguan"/>
 					</u-form-item>
 					<!-- <u-form-item label="人员类别" @click="
 							showSex3 = true;
@@ -683,4 +683,7 @@
 		font-size: 25px !important;
 		line-height: 8px !important;
 	}
+	.jiguan{
+		background-color: #fff !important;
+	}
 </style>

pagesA/fire/staff_info/edit_staff/edit_staff.vue

@@ -76,11 +76,11 @@
 					<u-form-item label="婚姻情况	"><u-input v-model="formData.hyqk" placeholder="请输入婚姻情况" /></u-form-item>
 
 					<u-form-item label="籍贯">
-						<u-input v-model="formData.jgdm" placeholder="请输入籍贯" @click.native="showPickerJiguan" />
+						<u-input v-model="formData.jgdm" placeholder="请输入籍贯" @click.native="showPickerJiguan" disabled class="jiguan"/>
 					</u-form-item>
 					<!-- <u-form-item label="警官证号"><u-input v-model="formData.jgzh" placeholder="请输入警官证号" /></u-form-item> -->
 					<u-form-item label="民族">
-						<u-input v-model="formData.mzdm" placeholder="请选择民族" @click.native="showPicker" />
+						<u-input v-model="formData.mzdm" placeholder="请选择民族" @click.native="showPicker" disabled class="jiguan" />
 					</u-form-item>
 					<!-- 	<u-form-item
 						label="人员类别"

pagesA/fire/unit_info/edit_unit_info/edit_unit_info.vue

@@ -360,6 +360,7 @@
 			},
 			closeImage() {
 				this.formData.attId = []
+				this.formData.xfya=''
 				this.$forceUpdate()
 			},
 			//查看已上传附件

pagesB/components/drill/index.vue

@@ -0,0 +1,371 @@
+<template>
+	<view class="uni-container uni-container-bg">
+		<!-- 搜索框 -->
+		<uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
+			<uni-col :span="24">
+				<view class="u-page__tag-item">
+					<u-search placeholder="请输入培训演练名称" bgColor="#edf6f9" borderColor="#4cb2b6" v-model="keyword"
+						:show-action="true" @custom="search"></u-search>
+				</view>
+			</uni-col>
+		</uni-row>
+		<!-- 下拉框 -->
+		<view class="u-page__tag-item"
+			style="margin-bottom: 26upx;width: 700upx;border-bottom: 2px solid #55cbbf;background-color: #f5f7fa;">
+			<u-form>
+				<u-form-item prop="orgName" @click="
+						showOrg = true;
+						hideKeyboard();
+					" label="单位选择:" labelWidth="100px">
+					<!-- <u-picker :show="showOrg" :columns="actions"></u-picker> -->
+					<u--input border="none" disabled v-model="formData.orgName" placeholder="请选择所属单位"></u--input>
+					<u-icon slot="right" name="arrow-down"></u-icon>
+				</u-form-item>
+			</u-form>
+		</view>
+
+		<!-- 卡片栏 -->
+		<view v-if="tableData.length>0 && isLoaded">
+			<view v-for="(item, index) in tableData" :key="index"
+				v-if="formData.orgName == item.orgName || formData.orgId == item.orgId">
+				<uni-card>
+					<!-- 标题 -->
+					<view class="titles">{{ item.drillTitle }}</view>
+					<!-- 简要内容 -->
+					<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+						<text class="name-align-drill">培训演练时间：</text>
+						<text class="conts">{{ item.drillDate }}</text>
+					</view>
+					<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+						<text class="name-align-drill">培训演练地点：</text>
+						<text class="conts">{{ item.drillPlace }}</text>
+					</view>
+					<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+						<text class="name-align-drill">记录类型:</text>
+						<text class="conts max-width">{{ item.drillTypeName }}</text>
+					</view>
+					<view class="an-niu" @click.native="onClick(item,formData.orgName)" link><text
+							class="detail">查看详情</text></view>
+				</uni-card>
+			</view>
+		</view>
+		<!-- tableData为空时显示  -->
+		<view v-else-if="tableData.length==0 && isLoaded" style="text-align: center;">
+			<view class="text-gray" style="padding-top: 20px;" v-if="tableData == 0">
+				<img :src="tan90" alt="暂无数据" />
+			</view>
+		</view>
+		<u-action-sheet :show="showOrg" :actions="actions" title="请选择单位" @close="showOrg = false"
+			@select="sexSelect"></u-action-sheet>
+		<!-- 加载中 -->
+		<isLodingModel></isLodingModel>
+	</view>
+</template>
+<script>
+	var that = '';
+	import {
+		getDrill, //获取培训演练信息列表
+		delDrill, //删除培训演练信息
+		getOrgId //获取orgId
+	} from '@/api/drill';
+	import config from '@/config'
+	const baseUrlImg = config.baseUrlImg
+	export default {
+		data() {
+			return {
+				isLoaded: false,
+				Group: `${baseUrlImg}/checkActive/Group.png`,
+				showOrg: false,
+				actions: [],
+				// 数据
+				tableData: [],
+				id: '',
+				tan90: `${baseUrlImg}/tan90.png`,
+				// 每页数据量
+				pageSize: 10,
+				// 当前页
+				pageNo: 1,
+				// 数据总量
+				total: 0,
+				// tableData数据加载中
+				loading: false,
+				// 初始化时搜索框的值
+				keyword: '',
+				// 存放orgid,orgname
+				formData: {
+					orgName: ''
+				},
+				show: false,
+				showtimeStart: false,
+				showtimeEnd: false
+			};
+		},
+		watch: {
+			loading: {
+				handler(newLength, oldLength) {
+					this.$modal.isLoadingModel(this.loading)
+				},
+				immediate: true
+			}
+		},
+		mounted() {
+			this.actions = []
+			that = this;
+			getOrgId({
+				pageNo: this.pageNo,
+				pageSize: this.pageSize,
+				userId: this.$store.state.user.id
+			}).then(response => {
+				console.log(response, 'response');
+				// 取到用户对应的单位名称与id
+				response.data.map(v => {
+					this.actions.push({
+						id: v.dwid,
+						name: v.orgName
+					});
+				});
+				console.log(response.data, '21321312');
+				this.formData.orgName = response.data[0].orgName;
+				this.formData.orgId = response.data[0].dwid;
+				this.tableData = []
+				this.getData();
+			});
+		},
+		onReady() {},
+		mixins: [uni.$u.mixin],
+		methods: {
+			search(val) {
+				console.log(val, 'valvals');
+				this.isLoaded =false
+				this.tableData = []
+				this.getData(1)
+			},
+			// 获取数据
+			getData() {
+				this.loading = true;
+				// 获取培训演练信息详细信息
+				getDrill({
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					orgId: this.formData.orgId,
+					drillTitle: this.keyword
+				}).then(response => {
+					this.isLoaded = true
+					this.tableData = [...this.tableData, ...response.data.list]
+					this.total=response.data.total
+					this.loading = false
+					this.tableData.map(i => {
+						console.log(i);
+						if (i.drillType == 1) {
+							i.drillTypeName = '培训'
+						} else if (i.drillType == 2) {
+							i.drillTypeName = '演练'
+						}
+					})
+				});
+			},
+			// 传递数据
+			onClick(val, orgName) {
+				console.log(val, orgName, 'val');
+				this.isLoaded = false
+				uni.navigateTo({
+					url: '/pagesA/fire/drill/drill_details/drill_details?id=' + val.id + '&orgName=' + orgName+'&historyView=historyView',
+					events: {
+						// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
+						acceptDataFromOpenedPage: function(val) {
+							console.log(val, '打开页面传送到当前页面的数据');
+						}
+					},
+					success: function(res) {
+						// 通过eventChannel向被打开页面传送数据
+						res.eventChannel.emit('acceptDataFromOpenerPage', val);
+					}
+				});
+			},
+			sexSelect(e) {
+				this.formData.orgId = e.id;
+				this.formData.orgName = e.name;
+				// 获取培训演练信息详细信息
+				getDrill({
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					orgId: this.formData.orgId
+				}).then(response => {
+					this.tableData = response.data.list;
+				});
+			},
+
+			// 触底的事件
+			onReachBottom() {
+				// 判断是否还有下一页数据
+				if (this.pageNo * this.pageSize >= this.total)
+					return uni.showToast({
+						title: `数据加载完毕`
+					});
+				// 判断是否正在请求其它数据，如果是，则不发起额外的请求
+				if (this.loading) return;
+				this.pageNo += 1;
+				this.getData(this.pageNo);
+			},
+
+			// 隐藏键盘
+			hideKeyboard() {
+				uni.hideKeyboard();
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	body {
+		background-color: #f5f7f9;
+	}
+
+	page {
+		background-color: #f5f7f9;
+	}
+
+	/deep/ .u-tabs__wrapper[data-v-0de61367],
+	/deep/ .u-tabs__wrapper.data-v-0de61367,
+	/deep/ .u-tabs__wrapper {
+		width: 99%;
+	}
+
+	/deep/.u-tabs__wrapper__nav__item[data-v-0de61367],
+	/deep/.u-tabs__wrapper__nav__item.data-v-0de61367,
+	/deep/.u-tabs__wrapper__nav__item {
+		padding: 0 60rpx;
+	}
+
+	.uni-container {
+		height: 100vh;
+		padding-right: 20upx;
+	}
+
+	.addInsp {
+		width: 40px;
+		position: fixed;
+		right: 4px;
+		z-index: 99999;
+	}
+
+	::v-deep .u-icon__icon {
+		margin-right: 0px !important;
+	}
+
+	.an-niu {
+		float: right;
+		font-size: 10px;
+		text-align: center;
+		display: flex;
+		margin-top: -64upx;
+		padding-bottom: 30rpx;
+		// margin-top: 50rpx;
+		color: #fff;
+
+		.detail {
+			width: 60px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			border-radius: 30px;
+			background-color: #f7c41e;
+			margin-right: 20rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 27upx;
+		}
+
+		.detailDel {
+			width: 60px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			border-radius: 30px;
+			background-color: #ff2e31;
+			color: white;
+			margin-right: 20rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 30upx;
+		}
+
+		.solve {
+			width: 62px;
+			height: 60rpx;
+
+			margin-right: 20rpx;
+			border-radius: 30px;
+			background-color: #4cb2b6;
+			line-height: 60rpx;
+		}
+
+		/deep/ .padding-tb-sm {
+			padding-top: 0px;
+			padding-bottom: 10px;
+		}
+
+		.deletes {
+			width: 62px;
+			height: 60rpx;
+			border-radius: 60rpx;
+			background-color: red;
+			color: #fff;
+			line-height: 60rpx;
+		}
+	}
+
+	/deep/.segmented-control__item--button {
+		background-color: rgb(76, 178, 182) !important;
+	}
+
+	/deep/.segmented-control__item--button--active {
+		background-color: #ffffff !important;
+	}
+
+	/deep/.uni-card {
+		box-shadow: 0px 0px 3px 0px rgba(86, 165, 168, 0.63) !important;
+		border-radius: 30rpx;
+	}
+
+	.tiantupian {
+		width: 110rpx;
+		height: 110rpx;
+		position: fixed;
+		right: 15px;
+		bottom: 80rpx;
+	}
+
+	//列表样式
+	.titles {
+		font-weight: 600;
+		margin-bottom: 10rpx;
+		color: black;
+		font-size: 32rpx;
+	}
+
+	.conts {
+		max-width: 470rpx;
+		display: -webkit-box;
+		/*弹性伸缩盒子模型显示*/
+		-webkit-box-orient: vertical;
+		/*排列方式*/
+		-webkit-line-clamp: 1;
+		/*显示文本行数*/
+		overflow: hidden;
+		/*溢出隐藏*/
+		color: #274647;
+		text-overflow: ellipsis;
+		/*不知道干嘛的*/
+
+		.conts-title {
+			margin-right: 10rpx;
+			color: #728f90;
+		}
+	}
+
+	.max-width {
+		max-width: 180upx;
+	}
+
+	/deep/ .u-form-item__body__left__content__label {
+		font-size: 28upx !important;
+	}
+</style>

pagesB/components/fireSpecial/index.vue

@@ -0,0 +1,366 @@
+<template>
+	<view class="uni-container uni-container-bg">
+		<view class="example container" :style="'height: ' + (screenHeight - 100) + 'px'">
+			<!-- 搜索框 -->
+			<uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
+				<uni-col :span="24">
+					<view class="u-page__tag-item">
+						<u-search placeholder="请输入人员姓名" bgColor="#edf6f9" borderColor="#4cb2b6" v-model="keyword"
+							:show-action="true" @custom="search"></u-search>
+					</view>
+				</uni-col>
+			</uni-row>
+			<!-- 下拉框 -->
+			<view class="u-page__tag-item"
+				style="margin-bottom: 26upx;width: 700upx;border-bottom: 2px solid #55cbbf;background-color: #f5f7fa;">
+				<u-form>
+					<u-form-item prop="orgName" @click="
+						showOrg = true;
+						hideKeyboard();
+					" label="单位选择:" labelWidth="100px">
+						<u--input border="none" disabled v-model="formData.orgName" placeholder="请选择所属单位"></u--input>
+						<u-icon slot="right" name="arrow-down"></u-icon>
+					</u-form-item>
+				</u-form>
+			</view>
+			<!-- 卡片栏 -->
+			<view v-if="tableData.length>0 && isLoaded" style="margin-bottom: 120rpx">
+				<view v-for="(item, index) in tableData" :key="index"
+					v-if="formData.orgName === item.orgName || formData.orgId === item.orgId">
+					<uni-card>
+						<!-- 简要内容 -->
+						<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+							<text class="name-align-drill">姓名：</text>
+							<text class="conts">{{ item.empName }}</text>
+						</view>
+						<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+							<text class="name-align-drill">特种证书编号：</text>
+							<text class="conts">{{ item.numberCode }}</text>
+						</view>
+						<view style="margin-top: 80rpx;">
+							<view class="an-niu" @click.native="onClick(item.id)" link><text class="detail">查看详情</text>
+							</view>
+						</view>
+					</uni-card>
+				</view>
+			</view>
+			<!-- tableData为空时显示  -->
+			<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>
+			<u-action-sheet :show="showOrg" :actions="actions" title="请选择单位" @close="showOrg = false"
+				@select="sexSelect"></u-action-sheet>
+			<!-- 加载中 -->
+			<isLodingModel></isLodingModel>
+		</view>
+	</view>
+</template>
+<script>
+	var that = '';
+	import {
+		getOrgId //获取orgId
+	} from '@/api/architecture';
+	import {
+		fireSpecialPage,
+		fireSpecialUpdate,
+		fireSpecialDelete
+	} from '@/api/fireSpecial';
+	import config from '@/config'
+	const baseUrlImg = config.baseUrlImg
+	export default {
+		data() {
+			return {
+				screenHeight: this.$screenHeight,
+				wheight: '',
+				keyword:'',
+				isLoaded: false,
+				Group: `${baseUrlImg}/checkActive/Group.png`,
+				showOrg: false,
+				actions: [],
+				// 数据
+				tableData: {},
+				id: '',
+				tan90: `${baseUrlImg}/tan90.png`,
+				// 每页数据量
+				pageSize: 5,
+				// 当前页
+				pageNo: 1,
+				// 数据总量
+				total: 0,
+				// tableData数据加载中
+				loading: false,
+				// 初始化时搜索框的值
+				keyword: '',
+				// 存放orgid,orgname
+				formData: {},
+				show: false,
+				showtimeStart: false,
+				showtimeEnd: false
+			};
+		},
+		// 在 vue页面，向起始页通过事件传递数据
+		onLoad: function(option) {
+
+			// this.init();
+		},
+		watch: {
+			loading: {
+				handler(newLength, oldLength) {
+					this.$modal.isLoadingModel(this.loading)
+				},
+				immediate: true
+			}
+		},
+		mounted() {
+			this.actions = []
+			that = this;
+			getOrgId({
+				pageNo: this.pageNo,
+				pageSize: this.pageSize,
+				userId: this.$store.state.user.id
+			}).then(response => {
+				console.log(response, 'response');
+				// 取到用户对应的单位名称与id
+				response.data.map(v => {
+					this.actions.push({
+						id: v.dwid,
+						name: v.orgName
+					});
+				});
+				console.log(response.data, '21321312');
+				this.formData.orgName = response.data[0].orgName ? response.data[0].orgName : '';
+				this.formData.orgId = response.data[0].dwid;
+				this.tableData = []
+				this.getData();
+			});
+
+		},
+		onReady() {},
+		mixins: [uni.$u.mixin],
+		methods: {
+			search(val) {
+				console.log(val, 'valvals',this.formData);
+				this.tableData = []
+				this.getData()
+			},
+			async init() {
+				var t = this;
+				t.$.getlocation()
+					.then(res => {
+						console.log(res, 'res');
+					})
+					.catch(err => {
+						console.log(err, 'err');
+					});
+			},
+			//查看详情
+			addClickDetail(val) {
+				uni.navigateTo({
+					url: `/pagesA/fire/architecture/add_architecture/add_architecture?item=${JSON.stringify(val)}`
+				});
+			},
+			// 获取数据
+			getData() {
+				this.loading = true;
+				let arrOrg=[]
+				arrOrg.push(this.formData.orgId)
+				fireSpecialPage({
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					orgIds: arrOrg,	
+					empName:this.keyword
+				}).then(response => {
+					console.log(response,'sdsdsd');
+					this.isLoaded = true
+					this.tableData = response.data?[...this.tableData, ...response.data.list]:[]
+					this.total = response.data?response.data.total:0
+					this.loading = false
+				});
+			},
+
+
+			// 传递数据
+			onClick(val) {
+				this.isLoaded = false
+				uni.navigateTo({
+					url: `/pagesB/fire/fireSpecial/addSpecial/index?title=查看特种作业人员&&viewData=${val}`
+				})
+			},
+			sexSelect(e) {
+				this.formData.orgId = e.id;
+				this.formData.orgName = e.name;
+				this.getData()
+			},
+			// 触底的事件
+			onReachBottom() {
+				// 判断是否还有下一页数据
+				if (this.pageNo * this.pageSize >= this.total)
+					return uni.showToast({
+						title: `数据加载完毕`
+					});
+				// 判断是否正在请求其它数据，如果是，则不发起额外的请求
+				if (this.loading) return;
+				this.pageNo += 1;
+				this.getData(this.pageNo);
+			},
+
+			// 隐藏键盘
+			hideKeyboard() {
+				uni.hideKeyboard();
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	body {
+		background-color: #f5f7f9;
+	}
+
+	page {
+		background-color: #f5f7f9;
+	}
+
+	/deep/ .u-tabs__wrapper[data-v-0de61367],
+	.u-tabs__wrapper.data-v-0de61367 {
+		width: 99%;
+	}
+
+	.uni-container {
+		height: 100vh;
+		padding-right: 20upx;
+	}
+
+	.addInsp {
+		width: 40px;
+		position: fixed;
+		right: 4px;
+		z-index: 99999;
+	}
+
+	::v-deep .u-icon__icon {
+		margin-right: 0px !important;
+	}
+
+	.an-niu {
+		float: right;
+		font-size: 10px;
+		text-align: center;
+		display: flex;
+		margin-top: -64upx;
+		padding-bottom: 30rpx;
+		// margin-top: 50rpx;
+		color: #fff;
+
+		.detail {
+			width: 60px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			border-radius: 30px;
+			background-color: #f7c41e;
+			margin-right: 20rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 27upx;
+		}
+
+		.detailDel {
+			width: 60px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			border-radius: 30px;
+			background-color: #ff2e31;
+			color: white;
+			margin-right: 20rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 30upx;
+		}
+
+		.solve {
+			width: 62px;
+			height: 60rpx;
+			margin-right: 20rpx;
+			border-radius: 30px;
+			background-color: #4cb2b6;
+			line-height: 60rpx;
+		}
+
+		/deep/ .padding-tb-sm {
+			padding-top: 0px;
+			padding-bottom: 10px;
+		}
+
+		.deletes {
+			width: 62px;
+			height: 60rpx;
+			border-radius: 60rpx;
+			background-color: red;
+			color: #fff;
+			line-height: 60rpx;
+		}
+	}
+
+	/deep/.segmented-control__item--button {
+		background-color: rgb(76, 178, 182) !important;
+	}
+
+	/deep/.segmented-control__item--button--active {
+		background-color: #ffffff !important;
+	}
+
+	/deep/.uni-card {
+		box-shadow: 0px 0px 3px 0px rgba(86, 165, 168, 0.63) !important;
+		border-radius: 30rpx;
+	}
+
+	.tiantupian {
+		width: 110rpx;
+		height: 110rpx;
+		position: fixed;
+		right: 15px;
+		bottom: 30rpx;
+	}
+
+	//列表样式
+	.titles {
+		font-weight: 600;
+		margin-bottom: 10rpx;
+		color: black;
+		font-size: 32rpx;
+	}
+
+	/deep/ .u-form-item__body__left__content__label {
+		font-size: 28upx !important;
+	}
+
+	.conts {
+		max-width: 470upx;
+		display: -webkit-box;
+		/*弹性伸缩盒子模型显示*/
+		-webkit-box-orient: vertical;
+		/*排列方式*/
+		-webkit-line-clamp: 1;
+		/*显示文本行数*/
+		overflow: hidden;
+		/*溢出隐藏*/
+		color: #274647;
+		text-overflow: ellipsis;
+	}
+
+	.max-width {
+		max-width: 180upx;
+	}
+
+	/deep/.u-action-sheet {
+		overflow-y: auto;
+		height: 1000rpx;
+		background-color: #fff;
+	}
+
+	.example {
+		overflow-y: auto;
+	}
+</style>

pagesB/components/fireWork/index.vue

@@ -0,0 +1,435 @@
+<template>
+	<view class="uni-container uni-container-bg">
+		<view class="example container" :style="'height: ' + (screenHeight - 100) + 'px'">
+			<!-- 搜索框 -->
+			<uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
+				<uni-col :span="24">
+					<view class="u-page__tag-item">
+						<u-search placeholder="请输入人员姓名" bgColor="#edf6f9" borderColor="#4cb2b6" v-model="keyword"
+							:show-action="true" @custom="search"></u-search>
+					</view>
+				</uni-col>
+			</uni-row>
+			<!-- 下拉框 -->
+			<view class="u-page__tag-item"
+				style="margin-bottom: 26upx;width: 700upx;border-bottom: 2px solid #55cbbf;background-color: #f5f7fa;">
+				<u-form>
+					<u-form-item prop="orgName" @click="
+						showOrg = true;
+						hideKeyboard();
+					" label="单位选择:" labelWidth="100px">
+						<u--input border="none" disabled v-model="formData.orgName" placeholder="请选择所属单位"></u--input>
+						<u-icon slot="right" name="arrow-down"></u-icon>
+					</u-form-item>
+				</u-form>
+			</view>
+			<!-- 卡片栏 -->
+			<view v-if="tableData.length>0 && isLoaded" style="margin-bottom: 120rpx">
+				<view v-for="(item, index) in tableData" :key="index"
+					v-if="formData.orgName === item.orgName || formData.orgId === item.orgId">
+					<uni-card>
+						<!-- 简要内容 -->
+						<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+							<text class="name-align-drill">动火执行人：</text>
+							<text class="conts">{{ item.executor }}</text>
+						</view>
+						<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+							<text class="name-align-drill">动火事由：</text>
+							<text class="conts">{{ item.workReason }}</text>
+						</view>
+						<view style="margin-top: 80rpx;">
+							<view @click.native="onClick(item.id)" link  class="an-niu" ><text class="detail">查看详情</text>
+							</view>
+						</view>
+					</uni-card>
+				</view>
+			</view>
+			<!-- tableData为空时显示  -->
+			<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>
+			<u-action-sheet :show="showOrg" :actions="actions" title="请选择单位" @close="showOrg = false"
+				@select="sexSelect"></u-action-sheet>
+			<u-modal :show="show" @confirm="confirm" @cancel="cancel" @close="close" asyncClose closeOnClickOverlay
+				showCancelButton confirmColor="red" :title="title" :content="content" ref="uModal"></u-modal>
+			<u-modal title="审核" :show="showShenHe" showCancelButton closeOnClickOverlay confirmText="审核通过"
+				cancelText="取消" @confirm="confirmShenHe" :closeOnClickOverlay="true" @cancel="cancelShenHe" @close="close">
+			</u-modal>
+			<!-- 加载中 -->
+			<isLodingModel></isLodingModel>
+		</view>
+	</view>
+</template>
+<script>
+	var that = '';
+	import {
+		getOrgId //获取orgId
+	} from '@/api/architecture';
+	import {
+		fireWorkPage,
+		fireWorkUpdate,
+		fireWorkDelete,
+		fireWorkShenHe
+	} from '@/api/fireSpecial';
+	import config from '@/config'
+	const baseUrlImg = config.baseUrlImg
+	export default {
+		data() {
+			return {
+				showShenHe:false,
+				screenHeight: this.$screenHeight,
+				wheight: '',
+				keyword: '',
+				isLoaded: false,
+				Group: `${baseUrlImg}/checkActive/Group.png`,
+				showOrg: false,
+				actions: [],
+				// 数据
+				tableData: {},
+				title: '是否删除该数据项?',
+				content: '确认删除？',
+				id: '',
+				tan90: `${baseUrlImg}/tan90.png`,
+				// 每页数据量
+				pageSize: 5,
+				// 当前页
+				pageNo: 1,
+				// 数据总量
+				total: 0,
+				// tableData数据加载中
+				loading: false,
+				// 初始化时搜索框的值
+				keyword: '',
+				// 存放orgid,orgname
+				formData: {},
+				show: false,
+				showtimeStart: false,
+				showtimeEnd: false,
+				juese: {},
+				ShenHeids:''
+			};
+		},
+		// 在 vue页面，向起始页通过事件传递数据
+		onLoad: function(option) {
+
+			// this.init();
+		},
+		watch: {
+			loading: {
+				handler(newLength, oldLength) {
+					this.$modal.isLoadingModel(this.loading)
+				},
+				immediate: true
+			}
+		},
+		mounted() {
+			this.actions = []
+			that = this;
+			this.juese=uni.getStorageSync('getUserInfo_key').userRoles.appRoles[0].role_lable
+			getOrgId({
+				pageNo: this.pageNo,
+				pageSize: this.pageSize,
+				userId: this.$store.state.user.id
+			}).then(response => {
+				console.log(response, 'response');
+				// 取到用户对应的单位名称与id
+				response.data.map(v => {
+					this.actions.push({
+						id: v.dwid,
+						name: v.orgName
+					});
+				});
+				console.log(response.data, '21321312');
+				this.formData.orgName = response.data[0].orgName ? response.data[0].orgName : '';
+				this.formData.orgId = response.data[0].dwid;
+				this.tableData = []
+				this.getData();
+			});
+
+		},
+		onReady() {},
+		mixins: [uni.$u.mixin],
+		methods: {
+			processClick(ShenHeids) { //审核
+               this.showShenHe=true
+			   this.ShenHeids=ShenHeids
+			},
+			//审核通过
+			confirmShenHe() {
+				this.showShenHe = false
+				fireWorkShenHe({ids:this.ShenHeids
+				}).then(response => {
+						this.tableData = []
+						this.getData()
+				})
+			},
+			//审核不通过	
+			cancelShenHe() {
+				this.showShenHe = false
+			},
+			search(val) {
+				console.log(val, 'valvals', this.formData);
+				this.tableData = []
+				this.getData()
+			},
+			async init() {
+				var t = this;
+				t.$.getlocation()
+					.then(res => {
+						console.log(res, 'res');
+					})
+					.catch(err => {
+						console.log(err, 'err');
+					});
+			},
+			// 模态框内容
+			showModal(val) {
+				this.show = true;
+				this.id = val;
+				console.log(val, 'val.id');
+			},
+			confirm() {
+				this.show = false;
+				fireWorkDelete({
+					id: this.id
+				}).then(response => {
+					this.loading = true;
+					this.isLoaded = false
+					this.tableData = []
+					this.getData();
+					console.log(this.tableData, '获取建筑信息详细信息获取建筑信息详细信息获取建筑信息详细信息获取建筑信息详细信息');
+				});
+			},
+			close() {
+				this.show = false;
+				console.log('close');
+			},
+			cancel() {
+				this.show = false;
+				console.log('cancel');
+			},
+			//查看详情
+			addClickDetail(val) {
+				uni.navigateTo({
+					url: `/pagesA/fire/architecture/add_architecture/add_architecture?item=${JSON.stringify(val)}`
+				});
+			},
+			// 获取数据
+			getData() {
+				this.loading = true;
+				// 获取建筑信息详细信息
+				let arrOrg = []
+				arrOrg.push(this.formData.orgId)
+				fireWorkPage({
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					orgIds: arrOrg,
+					executor: this.keyword
+				}).then(response => {
+					console.log(response, 'sdsdsd');
+					this.isLoaded = true
+					this.tableData = response.data ? [...this.tableData, ...response.data.list] : []
+					this.total = response.data ? response.data.total : 0
+					this.loading = false
+				});
+			},
+
+
+			// 传递数据
+			onClick(val) {
+				this.isLoaded = false
+				uni.navigateTo({
+					url: `/pagesB/fire/fireWork/addWork/index?title=查看动火审批&&viewData=${val}`
+				})
+			},
+			editClick(val) {
+				this.isLoaded = false
+				uni.navigateTo({
+					url: `/pagesB/fire/fireWork/addWork/index?title=编辑动火审批&&editData=${val}&&orgaction=${JSON.stringify(this.actions)}`
+				})
+			},
+			addClick() {
+				this.isLoaded = false
+				uni.navigateTo({
+					url: `/pagesB/fire/fireWork/addWork/index?title=新增动火审批&&orgName=${this.formData.orgName}&&orgId=${this.formData.orgId}&&orgaction=${JSON.stringify(this.actions)}`
+				});
+			},
+
+			sexSelect(e) {
+				this.formData.orgId = e.id;
+				this.formData.orgName = e.name;
+				this.getData()
+			},
+			// 触底的事件
+			onReachBottom() {
+				// 判断是否还有下一页数据
+				if (this.pageNo * this.pageSize >= this.total)
+					return uni.showToast({
+						title: `数据加载完毕`
+					});
+				// 判断是否正在请求其它数据，如果是，则不发起额外的请求
+				if (this.loading) return;
+				this.pageNo += 1;
+				this.getData(this.pageNo);
+			},
+
+			// 隐藏键盘
+			hideKeyboard() {
+				uni.hideKeyboard();
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	body {
+		background-color: #f5f7f9;
+	}
+
+	page {
+		background-color: #f5f7f9;
+	}
+
+	/deep/ .u-tabs__wrapper[data-v-0de61367],
+	.u-tabs__wrapper.data-v-0de61367 {
+		width: 99%;
+	}
+
+	.uni-container {
+		height: 100vh;
+		padding-right: 20upx;
+	}
+
+	.addInsp {
+		width: 40px;
+		position: fixed;
+		right: 4px;
+		z-index: 99999;
+	}
+
+	::v-deep .u-icon__icon {
+		margin-right: 0px !important;
+	}
+
+	.an-niu {
+		float: right;
+		font-size: 10px;
+		text-align: center;
+		display: flex;
+		margin-top: -64upx;
+		padding-bottom: 30rpx;
+		// margin-top: 50rpx;
+		color: #fff;
+
+		.detail {
+			width: 60px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			border-radius: 30px;
+			background-color: #f7c41e;
+			margin-right: 20rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 27upx;
+		}
+
+		.detailDel {
+			width: 60px;
+			height: 60rpx;
+			// padding: 0 20rpx;
+			border-radius: 30px;
+			background-color: #ff2e31;
+			color: white;
+			margin-right: 20rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 30upx;
+		}
+
+		.solve {
+			width: 62px;
+			height: 60rpx;
+			margin-right: 20rpx;
+			border-radius: 30px;
+			background-color: #4cb2b6;
+			line-height: 60rpx;
+		}
+
+		/deep/ .padding-tb-sm {
+			padding-top: 0px;
+			padding-bottom: 10px;
+		}
+
+		.deletes {
+			width: 62px;
+			height: 60rpx;
+			border-radius: 60rpx;
+			background-color: red;
+			color: #fff;
+			line-height: 60rpx;
+		}
+	}
+
+	/deep/.segmented-control__item--button {
+		background-color: rgb(76, 178, 182) !important;
+	}
+
+	/deep/.segmented-control__item--button--active {
+		background-color: #ffffff !important;
+	}
+
+	/deep/.uni-card {
+		box-shadow: 0px 0px 3px 0px rgba(86, 165, 168, 0.63) !important;
+		border-radius: 30rpx;
+	}
+
+	.tiantupian {
+		width: 110rpx;
+		height: 110rpx;
+		position: fixed;
+		right: 15px;
+		bottom: 30rpx;
+	}
+
+	//列表样式
+	.titles {
+		font-weight: 600;
+		margin-bottom: 10rpx;
+		color: black;
+		font-size: 32rpx;
+	}
+
+	/deep/ .u-form-item__body__left__content__label {
+		font-size: 28upx !important;
+	}
+
+	.conts {
+		max-width: 470upx;
+		display: -webkit-box;
+		/*弹性伸缩盒子模型显示*/
+		-webkit-box-orient: vertical;
+		/*排列方式*/
+		-webkit-line-clamp: 1;
+		/*显示文本行数*/
+		overflow: hidden;
+		/*溢出隐藏*/
+		color: #274647;
+		text-overflow: ellipsis;
+	}
+
+	.max-width {
+		max-width: 180upx;
+	}
+
+	/deep/.u-action-sheet {
+		overflow-y: auto;
+		height: 1000rpx;
+		background-color: #fff;
+	}
+
+	.example {
+		overflow-y: auto;
+	}
+</style>

pagesB/components/fpd_detection/fpd_detection.vue

@@ -0,0 +1,399 @@
+<template>
+	<view class="uni-container uni-container-bg">
+		<!-- 搜索框 -->
+		<uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
+			<uni-col :span="24">
+				<view class="u-page__tag-item">
+					<u-search placeholder="请输入检测项目名称" bgColor="#edf6f9" borderColor="#4cb2b6" v-model="keyword"
+						:show-action="true" @custom="search"></u-search>
+				</view>
+			</uni-col>
+		</uni-row>
+		<!-- 下拉框 -->
+		<view class="u-page__tag-item"
+			style="margin-bottom: 26upx;width: 700upx;border-bottom: 2px solid #55cbbf;background-color: #f5f7fa;">
+			<u-form>
+				<u-form-item prop="orgName" @click="
+						showOrg = true;
+						hideKeyboard();
+					" label="单位选择:" labelWidth="100px">
+					<!-- <u-picker :show="showOrg" :columns="actions"></u-picker> -->
+					<u--input border="none" disabled v-model="formData.orgName" placeholder="请选择所属单位"></u--input>
+					<u-icon slot="right" name="arrow-down"></u-icon>
+				</u-form-item>
+			</u-form>
+		</view>
+		<!-- 卡片栏 -->
+		<view v-if="tableData.length>0 && isLoaded">
+			<view v-for="(item, index) in tableData" :key="index">
+				<uni-card>
+					<!-- 标题 -->
+					<view class="titles">{{ item.detinspect }}</view>
+					<!-- 简要内容 -->
+					<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+						<text class="name-align-drill">检测项目：</text>
+						<text class="conts">{{ item.detinspect }}</text>
+					</view>
+					<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+						<text class="name-align-drill">所属单位：</text>
+						<text class="conts">{{ item.orgName }}</text>
+					</view>
+					<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+						<text class="name-align-drill"> 检测维保结果:</text>
+						<text class="conts max-width">{{ item.detresult.name }}</text>
+					</view>
+					<view class="an-niu" @click.native="onClick(item,formData.orgName)" link><text
+							class="detail">查看详情</text></view>
+				</uni-card>
+			</view>
+		</view>
+		<!-- tableData为空时显示  -->
+		<view v-else-if="tableData.length==0 && isLoaded" style="text-align: center;">
+			<view class="text-gray" style="padding-top: 20px;" v-if="tableData.length == 0">
+				<img :src="tan90" alt="暂无数据" />
+			</view>
+		</view>
+		<u-action-sheet :show="showOrg" :actions="actions" title="请选择单位" @close="showOrg = false"
+			@select="sexSelect"></u-action-sheet>
+		<!-- 加载中 -->
+		<isLodingModel></isLodingModel>
+	</view>
+</template>
+
+<script>
+	var that = '';
+	import {
+		createFpdDetection, //创建消防设备维护和检测台账
+		updateFpdDetection, //更新消防设备维护和检测台账
+		deleteFpdDetection, //删除消防设备维护和检测台账
+		getFpdDetection, //获得消防设备维护和检测台账
+		getFpdDetectionPage, //获得消防设备维护和检测台账分页
+		exportFpdDetectionExcel, //导出消防设备维护和检测台账 Excel
+		getOrgId
+	} from '@/api/fpdDetection/index.js';
+	import config from '@/config'
+	import {
+		DICT_TYPE,
+		getDictDatas
+	} from '@/utils/dict';
+	const baseUrlImg = config.baseUrlImg
+	export default {
+		data() {
+			return {
+				isLoaded: false,
+				Group: `${baseUrlImg}/checkActive/Group.png`,
+				showOrg: false,
+				actions: [],
+				// 数据
+				tableData: [],
+				id: '',
+				tan90: `${baseUrlImg}/tan90.png`,
+				// 每页数据量
+				pageSize: 10,
+				// 当前页
+				pageNo: 1,
+				// 数据总量
+				total: 0,
+				// tableData数据加载中
+				loading: false,
+				// 初始化时搜索框的值
+				keyword: '',
+				// 存放orgid,orgname
+				formData: {
+					orgName: ''
+				},
+				show: false,
+				showtimeStart: false,
+				showtimeEnd: false,
+				// 查询参数
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+					detdate: [],
+					detinspect: null,
+					detresult: null,
+				},
+			}
+		},
+		methods: {
+			//搜索
+			search() {
+				console.log('keyword', this.keyword);
+				getFpdDetectionPage({
+					detinspect: this.keyword
+				}).then(res => {
+					console.log('res', res);
+					if (res.data) {
+						//对检测结果进行初始化
+						const reArr = getDictDatas(DICT_TYPE.BACKEND_DET_RESULT)
+						// console.log('reArr',reArr);
+						this.tableData = res.data.list.map(item => {
+							const thisItem = reArr.find(par=>par.value === item.detresult)
+							// console.log('thisItem',thisItem);
+							if(thisItem){
+								item.detresult = {id:thisItem.value,name:thisItem.label}
+							}
+							return item
+						})
+					} else {
+						this.tableData = []
+					}
+				})
+			},
+			// 隐藏键盘
+			hideKeyboard() {
+				uni.hideKeyboard();
+			},
+			sexSelect(e) {
+				this.formData.orgId = e.id;
+				this.formData.orgName = e.name;
+				// 获取培训演练信息详细信息
+				getFpdDetectionPage({
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					orgId: this.formData.orgId
+				}).then(response => {
+					this.tableData = response.data.list;
+				});
+			},
+			//获取表格数据
+			getData() {
+				this.loading = true;
+				getFpdDetectionPage(this.queryParams).then(response => {
+					// console.log('res',response	);
+					if (response.data) {
+						
+						//对检测结果进行初始化
+						const reArr = getDictDatas(DICT_TYPE.BACKEND_DET_RESULT)
+						// console.log('reArr',reArr);
+						this.tableData = response.data.list.map(item => {
+							const thisItem = reArr.find(par=>par.value === item.detresult)
+							// console.log('thisItem',thisItem);
+							if(thisItem){
+								item.detresult = {id:thisItem.value,name:thisItem.label}
+							}
+							return item
+						})
+						// this.tableData = response.data.list;
+
+					}
+					this.isLoaded = true
+					this.loading = false;
+					console.log('tableData', this.tableData);
+
+				}).catch(err => {
+						this.isLoaded = true
+						this.loading = false;
+					}
+
+				);
+			},
+			// 传递数据
+			onClick(val, orgName) {
+				console.log(val.orgName, val, 'val');
+				const navData = JSON.stringify({
+					...val
+				})
+				console.log('navData', navData);
+				this.isLoaded = false
+				uni.navigateTo({
+					url: '/pagesA/fire/fpd_detection/detection_details/detection_details?id=' + val.id+'&historyView=historyView',
+				});
+			},
+		},
+		watch: {
+			loading: {
+				handler(newLength, oldLength) {
+					this.$modal.isLoadingModel(this.loading)
+				},
+				immediate: true
+			}
+		},
+		mounted() {
+			// 执行查询
+			this.actions = []
+			getOrgId({
+				pageNo: this.pageNo,
+				pageSize: this.pageSize,
+				userId: this.$store.state.user.id
+			}).then(response => {
+				// console.log(response, 'response');
+				// 取到用户对应的单位名称与id
+				response.data.map(v => {
+					this.actions.push({
+						id: v.dwid,
+						name: v.orgName
+					});
+				});
+				// console.log(response.data, '21321312');
+				this.formData.orgName = response.data[0].orgName;
+				this.formData.orgId = response.data[0].dwid;
+				this.tableData = []
+				this.getData();
+
+			}).catch(err => {
+				this.loading = false
+				this.$modal.msg(err)
+			})
+			// this.tableData={}
+			// this.getData();
+			// this.getData()
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	body {
+		background-color: #f5f7f9;
+	}
+
+	page {
+		background-color: #f5f7f9;
+	}
+
+	/deep/ .u-tabs__wrapper[data-v-0de61367],
+	/deep/ .u-tabs__wrapper.data-v-0de61367,
+	/deep/ .u-tabs__wrapper {
+		width: 99%;
+	}
+
+	/deep/.u-tabs__wrapper__nav__item[data-v-0de61367],
+	/deep/.u-tabs__wrapper__nav__item.data-v-0de61367,
+	/deep/.u-tabs__wrapper__nav__item {
+		padding: 0 60rpx;
+	}
+
+	.uni-container {
+		height: 100vh;
+		padding-right: 20upx;
+	}
+
+	.addInsp {
+		width: 40px;
+		position: fixed;
+		right: 4px;
+		z-index: 99999;
+	}
+
+	::v-deep .u-icon__icon {
+		margin-right: 0px !important;
+	}
+
+	.an-niu {
+		float: right;
+		font-size: 10px;
+		text-align: center;
+		display: flex;
+		margin-top: -64upx;
+		padding-bottom: 30rpx;
+		// margin-top: 50rpx;
+		color: #fff;
+
+		.detail {
+			width: 60px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			border-radius: 30px;
+			background-color: #f7c41e;
+			margin-right: 20rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 27upx;
+		}
+
+		.detailDel {
+			width: 60px;
+			height: 60rpx;
+			padding: 0 20rpx;
+			border-radius: 30px;
+			background-color: #ff2e31;
+			color: white;
+			margin-right: 20rpx;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 30upx;
+		}
+
+		.solve {
+			width: 62px;
+			height: 60rpx;
+
+			margin-right: 20rpx;
+			border-radius: 30px;
+			background-color: #4cb2b6;
+			line-height: 60rpx;
+		}
+
+		/deep/ .padding-tb-sm {
+			padding-top: 0px;
+			padding-bottom: 10px;
+		}
+
+		.deletes {
+			width: 62px;
+			height: 60rpx;
+			border-radius: 60rpx;
+			background-color: red;
+			color: #fff;
+			line-height: 60rpx;
+		}
+	}
+
+	/deep/.segmented-control__item--button {
+		background-color: rgb(76, 178, 182) !important;
+	}
+
+	/deep/.segmented-control__item--button--active {
+		background-color: #ffffff !important;
+	}
+
+	/deep/.uni-card {
+		box-shadow: 0px 0px 3px 0px rgba(86, 165, 168, 0.63) !important;
+		border-radius: 30rpx;
+	}
+
+	.tiantupian {
+		width: 110rpx;
+		height: 110rpx;
+		position: fixed;
+		right: 15px;
+		bottom: 80rpx;
+	}
+
+	//列表样式
+	.titles {
+		font-weight: 600;
+		margin-bottom: 10rpx;
+		color: black;
+		font-size: 32rpx;
+	}
+
+	.conts {
+		max-width: 470rpx;
+		display: -webkit-box;
+		/*弹性伸缩盒子模型显示*/
+		-webkit-box-orient: vertical;
+		/*排列方式*/
+		-webkit-line-clamp: 1;
+		/*显示文本行数*/
+		overflow: hidden;
+		/*溢出隐藏*/
+		color: #274647;
+		text-overflow: ellipsis;
+		/*不知道干嘛的*/
+
+		.conts-title {
+			margin-right: 10rpx;
+			color: #728f90;
+		}
+	}
+
+	.max-width {
+		max-width: 180upx;
+	}
+
+	/deep/ .u-form-item__body__left__content__label {
+		font-size: 28upx !important;
+	}
+</style>

pagesA/fire/check_record/index.vue → pagesB/fire/check_record/index.vue

@@ -10,62 +10,62 @@
 			</view>
 		</uni-section>
 		<component :is="selectedTag" v-if="selectedTag!=''">
-			<router-view v-if="selectedTag !== null">
-			</router-view>
 		</component>
-		<u-list @scrolltolower="scrolltolower" v-if="tableData.length>0 && isLoaded&&fireInspection">
-			<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 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>
 </template>
 <script>
@@ -84,10 +84,10 @@
 	const baseUrlImg = config.baseUrlImg
 	export default {
 		components: {
-			Drill: () => import('@/pagesA/fire/drill/index.vue'),
-			FpdDetection: () => import('@/pagesA/fire/fpd_detection/fpd_detection.vue'),
-			FireSpecial: () => import('@/pagesB/fire/fireSpecial/index.vue'),
-			FireWork: () => import('@/pagesB/fire/fireWork/index.vue')
+			Drill: () => import('@/pagesB/components/drill/index.vue'),
+			FpdDetection: () => import('@/pagesB/components/fpd_detection/fpd_detection.vue'),
+			FireSpecial: () => import('@/pagesB/components/fireSpecial/index.vue'),
+			FireWork: () => import('@/pagesB/components/fireWork/index.vue')
 		},
 		data() {
 			return {
@@ -111,13 +111,6 @@
 					2: '审核中',
 					3: '审核未通过'
 				},
-				urls2: ['https://cdn.uviewui.com/uview/album/1.jpg', 'https://cdn.uviewui.com/uview/album/2.jpg',
-					'https://cdn.uviewui.com/uview/album/3.jpg', 'https://cdn.uviewui.com/uview/album/4.jpg',
-					'https://cdn.uviewui.com/uview/album/5.jpg', 'https://cdn.uviewui.com/uview/album/6.jpg',
-					'https://cdn.uviewui.com/uview/album/7.jpg', 'https://cdn.uviewui.com/uview/album/8.jpg',
-					'https://cdn.uviewui.com/uview/album/9.jpg', 'https://cdn.uviewui.com/uview/album/10.jpg',
-					'https://cdn.uviewui.com/uview/album/9.jpg', 'https://cdn.uviewui.com/uview/album/10.jpg',
-				],
 				my: '',
 				title: '暂无数据',
 				tagLabel: [{
@@ -153,7 +146,7 @@
 				hotApproval: false,
 				fireInspection: true,
 				clicKValue: 0, //点击的样式
-				selectedTag:''
+				selectedTag: ''
 			};
 		},
 		watch: {
@@ -166,7 +159,6 @@
 		},
 		// 在 vue页面，向起始页通过事件传递数据
 		onLoad: function(option) {
-			console.log(option, 'option');
 			if (option.my) {
 				this.my = option.my
 			}
@@ -174,32 +166,36 @@
 		},
 
 		onShow() {
-			this.tableData = []
-			this.getData(1);
+				this.tableData = []
+				this.getData(1);
+				this.selectedTag =''
+				this.fireInspection =true
+				this.clicKValue=0
 		},
 
 		methods: {
 			setInverted(value, rotues) { //标签的点击事件
+				this.fireInspection = false;
+				// this.drill = false;
+				// this.fireService = false;
+				// this.special = false;
+				// this.hotApproval = false;
 				switch (value) {
 					case 0:
 						this.fireInspection = true //消防检查结果
 						break;
-					case 1:
-						this.drill = true //培训与演练
-						this.fireInspection = false
-						break;
-					case 2:
-						this.fireService = true //消防设施维护和检测
-						this.fireInspection = false
-						break;
-					case 3:
-						this.special = true //特种作业人员
-						this.fireInspection = false
-						break;
-					case 4:
-						this.hotApproval = true //动火审批
-						this.fireInspection = false
-						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;
 				}
@@ -268,11 +264,11 @@
 				this.isLoaded = false
 				if (this.my == "myonly") {
 					uni.navigateTo({
-						url: `/pagesA/fire/check_record/picture/picture?items=${JSON.stringify(val)}`
+						url: `/pagesB/fire/check_record/picture/picture?items=${JSON.stringify(val)}`
 					});
 				} else {
 					uni.navigateTo({
-						url: `/pagesA/fire/check_record/picture/picture?id=${val.id}`
+						url: `/pagesB/fire/check_record/picture/picture?id=${val.id}`
 					});
 				}
 			},
@@ -298,7 +294,7 @@
 			gotoPersonnelDetails(val) {
 				this.isLoaded = false
 				uni.navigateTo({
-					url: '/pagesA/fire/check_record/personnel_record/personnel_record?id=' + val.id
+					url: '/pagesB/fire/check_record/personnel_record/personnel_record?id=' + val.id
 				});
 			},
 			// 触底的事件

pagesB/fire/fireSpecial/addSpecial/index.vue

@@ -62,7 +62,7 @@
 			<u-button v-if="isedit" @click="submit('customForm')" type="primary" shape="circle" size="large"
 				color="#4CB2B6" text="确认修改" style="width:200px">
 			</u-button>
-			<u-button v-else-if="!formData.id" @click="submit('customForm')" type="primary" shape="circle" size="large"
+			<u-button v-else-if="!isedit&&!isview" @click="submit('customForm')" type="primary" shape="circle" size="large"
 				color="#4CB2B6" text="确认新增" style="width:200px">
 			</u-button>
 			<u-button v-else-if="isview" @click="submit('customForm')" type="primary" shape="circle" size="large"

pagesB/fire/fireWork/addWork/index.vue

@@ -63,7 +63,7 @@
 			<u-button v-if="isedit" @click="submit('customForm')" type="primary" shape="circle" size="large"
 				color="#4CB2B6" text="确认修改" style="width:200px">
 			</u-button>
-			<u-button v-else-if="!formData.id" @click="submit('customForm')" type="primary" shape="circle" size="large"
+			<u-button v-else-if="!isedit&&!isview" @click="submit('customForm')" type="primary" shape="circle" size="large"
 				color="#4CB2B6" text="确认新增" style="width:200px">
 			</u-button>
 			<u-button v-else-if="isview" @click="submit('customForm')" type="primary" shape="circle" size="large"