修改bug

pages/mine/info/edit.vue

@@ -6,7 +6,7 @@
 			<image slot="right" :src="`${urls}/navBg@2x.png`" class="bgTopImg"></image>
 		</view>
 		<!-- #endif -->
-		<view class="  uni-container  ">
+		<view class="uni-container">
 			<view class="u-demo-block">
 				<view class="u-demo-block__content">
 					<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
@@ -23,7 +23,7 @@
 								</u-form-item>
 							</view>
 						</view>
-						<view class="flex flex-direction-row">
+						<!-- <view class="flex flex-direction-row">
 							<view class="flex justify-center align-center" style="width: 12%;">
 								<image :src="`${urls}/info/username.svg`" class="editimg"></image>
 							</view>
@@ -31,11 +31,10 @@
 								<u-form-item label-position="top" label="姓名" prop="userInfo.username" borderBottom>
 									<u--input v-model="user.userInfo.username" border="none" placeholder="姓名">
 									</u--input>
-
 									<image slot="right" :src="`${urls}/info/edit.svg`" class="edit"></image>
 								</u-form-item>
 							</view>
-						</view>
+						</view> -->
 						<view class="flex flex-direction-row">
 							<view class="flex justify-center align-center" style="width: 12%;">
 								<image :src="`${urls}/info/gender.svg`" class="editimg"></image>
@@ -45,12 +44,11 @@
 									@click="showSex = true; hideKeyboard()">
 									<u--input v-model="user.userInfo.sexname" disabled disabledColor="#ffffff"
 										placeholder="请选择性别" border="none"></u--input>
-
 									<image slot="right" :src="`${urls}/info/edit.svg`" class="edit"></image>
 								</u-form-item>
 							</view>
 						</view>
-						<view class="flex flex-direction-row">
+						<!-- <view class="flex flex-direction-row">
 							<view class="flex justify-center align-center" style="width: 12%;">
 								<image :src="`${urls}s/info/birthday.svg`" class="editimg"></image>
 							</view>
@@ -60,10 +58,10 @@
 									<u--input v-model="user.userInfo.birthday" disabled disabledColor="#ffffff"
 										placeholder="请选择出生年月" border="none"></u--input>
 									<image slot="right" :src="`${urls}/info/edit.svg`" class="edit"></image>
-									<!-- <u-icon slot="right" name="arrow-right"></u-icon> -->
+									<u-icon slot="right" name="arrow-right"></u-icon>
 								</u-form-item>
 							</view>
-						</view>
+						</view> -->
 						<view class="flex flex-direction-row">
 							<view class="flex justify-center align-center" style="width: 12%;">
 								<image :src="`${urls}/info/phone.svg`" class="editimg"></image>
@@ -71,12 +69,11 @@
 							<view style="width: 88%;">
 								<u-form-item label-position="top" label="手机号" prop="userInfo.mobile" borderBottom>
 									<u--input v-model="user.userInfo.mobile" border="none" placeholder="手机号"></u--input>
-
 									<image slot="right" :src="`${urls}/info/edit.svg`" class="edit"></image>
 								</u-form-item>
 							</view>
 						</view>
-						<view class="flex flex-direction-row">
+						<!-- <view class="flex flex-direction-row">
 							<view class="flex justify-center align-center" style="width: 12%;">
 								<image :src="`${urls}/info/address.svg`" class="editimg"></image>
 							</view>
@@ -93,13 +90,13 @@
 								<image :src="`${urls}/info/address.svg`" class="editimg"></image>
 							</view>
 							<view style="width: 88%;">
-								<u-form-item label-position="top" label="角色" prop="userInfo.remark" borderBottom>
+								<u-form-item label-position="top" label="角色" prop="userInfo.dept.name" borderBottom>
 									<u--input v-model="user.userInfo.dept.name" border="none" placeholder="角色">
 									</u--input>
 									<image slot="right" :src="`${urls}/info/edit.svg`" class="edit"></image>
 								</u-form-item>
 							</view>
-						</view>
+						</view> -->
 					</u--form>
 					<u-button type="primary" text="确认修改"
 						customStyle="height: 72rpx;width: 340rpx;margin-top: 100rpx;display: flex;align-items: center;justify-content: center;border-radius: 60rpx;background: #4CB2B6;"
@@ -126,7 +123,6 @@
 	// #ifdef H5
 	import navInfo from '@/pagesA/components/my-nav/nav'
 	// #endif
-
 	export default {
 		components: {
 	// #ifdef H5
@@ -150,6 +146,7 @@
 						birthday: '',
 						mobile: '',
 						remark: '',
+						dept:{name:''}
 					},
 				},
 				showSex: false,

pagesA/fire/archive/edit_archive/edit_archive2.vue

@@ -15,10 +15,16 @@
 					</u-form-item>
 					<u-form-item label="办公地址"><u-input v-model="formData.bgdz" placeholder="请输入办公地址" /></u-form-item>
 
-					<u-form-item label="是否建立微型消防站或志愿消防队	">
+					<u-form-item label="是否建立微型消防站或志愿消防队	" @click="
+							showSfjlwxxfz = true;
+							hideKeyboard();
+						">
 						<u-input v-model="formData.sfjlwxxfz" placeholder="是否建立微型消防站或志愿消防队" />
 					</u-form-item>
-					<u-form-item label="是否组织制定防火安全公约		">
+					<u-form-item label="是否组织制定防火安全公约" @click="
+							showSfzdfhgy = true;
+							hideKeyboard();
+						">
 						<u-input v-model="formData.sfzdfhgy" placeholder="是否组织制定防火安全公约" />
 					</u-form-item>
 					<u-form-item label="所辖单位（场所）数量">
@@ -43,6 +49,10 @@
 				</view>
 			</u--form>
 		</view>
+		<u-action-sheet :show="showSfjlwxxfz" :actions="actionSfjlwxxfz" title="是否建立微型消防站或志愿消防队"
+			@close="showSfjlwxxfz = false" @select="sexSelect"></u-action-sheet>
+			<u-action-sheet :show="showSfzdfhgy" :actions="actionSfzdfhgy" title="是否组织制定防火安全公约"
+				@close="showSfzdfhgy = false" @select="sexSelect2"></u-action-sheet>
 		<uni-row class="heigthButton">
 			<u-button @click="submit('customForm')" type="primary" shape="circle" size="large" color="#4CB2B6"
 				text="确认修改"></u-button>
@@ -61,6 +71,26 @@
 			return {
 				screenHeight: this.$screenHeight,
 				wheight: '',
+				showSfjlwxxfz: false,
+				showSfzdfhgy: false,
+				actionSfjlwxxfz: [{
+						id: 1,
+						name: '是'
+					},
+					{
+						id: 2,
+						name: '否'
+					}
+				],
+				actionSfzdfhgy: [{
+						id: 1,
+						name: '是'
+					},
+					{
+						id: 2,
+						name: '否'
+					}
+				],
 				// 每页数据量
 				pageSize: 5,
 				// 当前页
@@ -139,6 +169,12 @@
 		},
 
 		methods: {
+			sexSelect(e) {
+				this.formData.sfjlwxxfz = e.name;
+			},
+			sexSelect2(e) {
+				this.formData.sfzdfhgy = e.name;
+			},
 			submit(ref) {
 				this.$refs[ref]
 					.validate()

pagesA/fire/check_record/index.vue

@@ -1,6 +1,19 @@
 <template>
 	<view class="container uni-container uni-container-bg">
-		<u-list @scrolltolower="scrolltolower" v-if="tableData.length>0 && isLoaded">
+		<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"
+						:key="index" :inverted="true" :text="item.label" type="primary"
+						@click="setInverted(item.value,item.rotues)" :class="{bg:item.value==clicKValue}" />
+				</view>
+			</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"
@@ -51,8 +64,8 @@
 				<img :src="tan90" alt="暂无数据" />
 			</view>
 		</view>
-		<!-- 加载中 -->
-		<isLodingModel></isLodingModel>
+		<!-- 	加载中
+		<isLodingModel></isLodingModel> -->
 	</view>
 </template>
 <script>
@@ -70,6 +83,12 @@
 	import config from '@/config'
 	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')
+		},
 		data() {
 			return {
 				isLoaded: false,
@@ -100,7 +119,41 @@
 					'https://cdn.uviewui.com/uview/album/9.jpg', 'https://cdn.uviewui.com/uview/album/10.jpg',
 				],
 				my: '',
-				title: '暂无数据'
+				title: '暂无数据',
+				tagLabel: [{
+						value: 0,
+						rotues: '',
+						label: '消防检查结果'
+					},
+					{
+						value: 1,
+						rotues: 'Drill',
+						label: '检查项培训演练'
+					},
+					{
+						value: 2,
+						rotues: 'fpd-detection',
+						label: '消防设施维护和检测'
+					},
+					{
+						value: 3,
+						rotues: 'fire-special',
+						label: '特种作业人员'
+					},
+					{
+						value: 4,
+						rotues: 'fire-work',
+						label: '动火审批'
+					},
+
+				],
+				drill: false,
+				fireService: false,
+				special: false,
+				hotApproval: false,
+				fireInspection: true,
+				clicKValue: 0, //点击的样式
+				selectedTag:''
 			};
 		},
 		watch: {
@@ -113,7 +166,7 @@
 		},
 		// 在 vue页面，向起始页通过事件传递数据
 		onLoad: function(option) {
-			console.log(option,'option');
+			console.log(option, 'option');
 			if (option.my) {
 				this.my = option.my
 			}
@@ -124,10 +177,38 @@
 			this.tableData = []
 			this.getData(1);
 		},
+
 		methods: {
+			setInverted(value, rotues) { //标签的点击事件
+				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;
+					default:
+						break;
+				}
+				this.clicKValue = value
+				this.selectedTag = rotues;
+			},
 			changeLog(e) {
 				this.title = ''
-				this.isLoaded=false
+				this.isLoaded = false
 				this.tableData = []
 				if (this.kewords.length > 0 && this.kewords[0].indexOf(":") === -1) {
 					this.kewords[0] = this.kewords[0] + ' 00:00:00'
@@ -144,11 +225,9 @@
 			// ================================ 
 			// 获取数据
 			getData(pageNo, value = '') {
-
 				this.loading = true;
 				this.pageNo = pageNo;
-					
-				let formChuan={
+				let formChuan = {
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
 					userId: this.$store.state.user.id,
@@ -168,7 +247,7 @@
 						this.total = response.data.total;
 						this.loading = false;
 					});
-				} else{
+				} else {
 					getInspecthisPage(formChuan).then(response => {
 						console.log('1111', response);
 						this.isLoaded = true
@@ -276,4 +355,12 @@
 		top: 2px !important;
 		padding-left: 3px !important;
 	}
+
+	::v-deep .uni-section-header {
+		padding: 0 !important;
+	}
+
+	.bg {
+		background-color: #bdbdbd;
+	}
 </style>

pagesA/fire/staff_info/add_staff/add_staff.vue

@@ -206,7 +206,6 @@
 					accountId: '',
 					// empBirthday:'请选择出生日期',
 					// rwsj:'请选择入伍时间'
-					empBirthday: '',
 					rwsj: ''
 				},
 

pagesA/fire/staff_info/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="uni-container uni-container-bg">
-		<view class="container" :style="'height: ' + (screenHeight - 75) + 'px'">
+		<view class="example container" :style="'height: ' + (screenHeight - 75) + 'px'">
 			<!-- 搜索框 -->
 			<uni-row class="demo-uni-row padding-tb-sm" :gutter="20" width="100%">
 				<uni-col :span="24">
@@ -52,16 +52,16 @@
 				<view class="text-gray" style="padding-top: 20px;">
 					<img :src="tan90" alt="暂无数据" />
 				</view>
-				<!-- tableData为空时显示  -->
-				<view>
-					<image :src="Group" @click="addClick" class="tiantupian"></image>
-				</view>
-				<u-action-sheet :show="showOrg" :actions="actions" title="请选择单位" @close="showOrg = false"
-					@select="sexSelect">
-				</u-action-sheet>
-				<!-- 加载中 -->
-				<isLodingModel></isLodingModel>
 			</view>
+			<view>
+				<image :src="Group" @click="addClick" class="tiantupian"></image>
+			</view>
+			<u-action-sheet :show="showOrg" :actions="actions" title="请选择单位" @close="showOrg = false"
+				@select="sexSelect">
+			</u-action-sheet>
+			<!-- 加载中 -->
+			<isLodingModel></isLodingModel>
+
 		</view>
 	</view>
 </template>
@@ -410,4 +410,7 @@
 		height: 1000rpx;
 		background-color: #fff;
 	}
+	.example{
+		overflow-y: auto;
+	}
 </style>

pagesB/fire/fireWork/index.vue

@@ -67,8 +67,8 @@
 				@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 title="审核" :show="showShenHe" showCancelButton closeOnClickOverlay confirmText="审核通过"
+				cancelText="取消" @confirm="confirmShenHe" :closeOnClickOverlay="true" @cancel="cancelShenHe" @close="close">
 			</u-modal>
 			<!-- 加载中 -->
 			<isLodingModel></isLodingModel>