소스 검색

样式已经微型消防站人员搜索方式修改

liyangzheng 1 년 전
부모
커밋
579d008f94

+ 40 - 4
pagesA/fire/fire_station/fireStation_details/fireStation_details.vue

@@ -24,10 +24,12 @@
 			<view class="buju">
 				<text class="miaoshu">控制室值班人员 :</text>
 				<text>{{ tableData.dutyer }}</text>
+				<button @click="goWorkNum" class="manyBtn">查看值班人</button>
 			</view>
 			<view class="buju">
 				<text class="miaoshu">负责人 :</text>
 				<text>{{ tableData.charger }}</text>
+				<button @click="goBigNum" class="manyBtn">查看负责人</button>
 			</view>
 			<view class="buju">
 				<text class="miaoshu">建站日期 :</text>
@@ -36,6 +38,7 @@
 			<view class="buju">
 				<text class="miaoshu">队员数量 :</text>
 				<text>{{ tableData.members }}</text>
+				<button @click="goPeopleMes" class="manyBtn">查看队员</button>
 			</view>
 			<view class="buju">
 				<text class="miaoshu">报警电话 :</text>
@@ -45,19 +48,19 @@
 			<view class="buju">
 				<view class="width100">
 					<uni-table stripe border emptyText="暂无更多数据">
-						<uni-tr>
+						<uni-tr class="uniTr">
 							<uni-th align="center">水罐车</uni-th>
 							<uni-td align="center">{{ tableData.waterTanker }}</uni-td>
 						</uni-tr>
-						<uni-tr>
+						<uni-tr class="uniTr">
 							<uni-th align="center">泡沫车</uni-th>
 							<uni-td align="center">{{ tableData.foamCar }}</uni-td>
 						</uni-tr>
-						<uni-tr>
+						<uni-tr class="uniTr">
 							<uni-th align="center">消防摩托</uni-th>
 							<uni-td align="center">{{ tableData.fireMoto }}</uni-td>
 						</uni-tr>
-						<uni-tr>
+						<uni-tr class="uniTr">
 							<uni-th align="center">其它</uni-th>
 							<uni-td align="center">{{ tableData.others }}</uni-td>
 						</uni-tr>
@@ -119,6 +122,24 @@
 						res.eventChannel.emit('acceptDataFromOpenerPage', val);
 					}
 				});
+			},
+			// 值班
+			goWorkNum(){
+				uni.navigateTo({
+					url:"/pagesA/fire/fire_station/people_fireStation/people_fireStation?addId=1"
+				})
+			},
+			// 负责人
+			goBigNum(){
+				uni.navigateTo({
+					url:"/pagesA/fire/fire_station/people_fireStation/people_fireStation?addId=2"
+				})
+			},
+			// 普通人
+			goPeopleMes(){
+				uni.navigateTo({
+					url:"/pagesA/fire/fire_station/people_fireStation/people_fireStation?addId=0"
+				})
 			}
 		}
 	};
@@ -197,4 +218,19 @@
 		border: none;
 
 	}
+	.uniTr{
+		background-color: #F2F4F6;
+	}
+	.manyBtn{
+		display: inline-block;
+		width: 100rpx;
+		height: 40rpx;
+		font-size: 20rpx;
+		line-height: 40rpx;
+		text-align: center;
+		border-radius: 20rpx;
+		background-color: #4DB1B6;
+		color: white;
+		margin-left: 10rpx;
+	}
 </style>

+ 10 - 6
pagesA/fire/fire_station/index.vue

@@ -33,7 +33,7 @@
 						<view class="titles">{{ item.microName }}</view>
 						<!-- 简要内容 -->
 						<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
-							<text  class="name-align-building">详细地址:</text>
+							<text class="name-align-building">详细地址:</text>
 							<text class="conts">{{ item.addr }}</text>
 						</view>
 						<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
@@ -208,13 +208,15 @@
 					this.tableData = [...this.tableData, ...response.data.list]
 					this.loading = false
 					// this.tableData = response.data.list;
-					console.log(this.tableData[0].id, 'ppp');
-					localStorage.setItem('fireId',this.tableData[0].id)
+					// console.log(this.tableData[0].id, 'ppp');
+					// localStorage.setItem('fireId',this.tableData[0].id)
 				});
 			},
 
 			// 传递数据
 			onClick(val, orgName) {
+				console.log(val.id, orgName, 'nnn');
+				localStorage.setItem("fireId", JSON.stringify(val.id))
 				this.isLoaded = false
 				uni.navigateTo({
 					url: '/pagesA/fire/fire_station/fireStation_details/fireStation_details?id=' + val.id +
@@ -358,7 +360,7 @@
 			margin-right: 20rpx;
 			text-align: center;
 			line-height: 60rpx;
-			font-size: 27upx;
+			font-size: 30rpx;
 		}
 
 		.detailDel {
@@ -371,7 +373,7 @@
 			margin-right: 20rpx;
 			text-align: center;
 			line-height: 60rpx;
-			font-size: 30upx;
+			font-size: 30rpx;
 		}
 
 		.operation {
@@ -386,6 +388,7 @@
 			border-radius: 30px;
 			background-color: #4cb2b6;
 			line-height: 60rpx;
+			font-size: 30rpx;
 		}
 
 		/deep/ .padding-tb-sm {
@@ -459,12 +462,13 @@
 	/deep/ .u-form-item__body__left__content__label {
 		font-size: 28upx !important;
 	}
+
 	/deep/.u-action-sheet {
 		overflow-y: auto;
 		height: 1000rpx;
 		background-color: #fff;
 	}
-	
+
 	.example {
 		overflow-y: auto;
 	}

+ 10 - 11
pagesA/fire/fire_station/people_fireStation/people_fireStation.vue

@@ -14,7 +14,7 @@
 						<text>职务:{{getDuty(item.duty)}}</text>
 					</div>
 					<div style="display: flex;justify-content: space-around;align-items: center;">
-						<button @click="delUser(item)" class="editBtn">删除</button>
+						<button @click="delUser(item)" class="editBtn" style="background-color: red;">删除</button>
 						<button @click="editUser(item)" class="editBtn">编辑</button>
 					</div>
 				</div>
@@ -24,7 +24,7 @@
 		<div v-for="(person, index) in membersList" :key="index" style="border-bottom: 1px solid black;">
 			<u--form ref="forms">
 				<u-form-item class="typeStyle" :prop="'name' + (index + 1)">
-					<p style="width: 150rpx;margin-left: 20rpx;">姓名{{(index + 1)}}</p>
+					<p style="width: 150rpx;margin-left: 20rpx;">姓名</p>
 					<u-input v-model="person.name" id="nameId" @blur="nameBlur" :placeholder="'请输入姓名'" />
 					<span class="erroring" v-if="nameRules">请输入名称</span>
 				</u-form-item>
@@ -84,7 +84,7 @@
 			</u-popup>
 		</div>
 		<div>
-			<u-popup :show="showDel" title="确认删除?" mode="center" >
+			<u-popup :show="showDel" title="确认删除?" mode="center">
 				<div style="width: 300rpx;height: 200rpx;">
 					<p>是否删除该内容?</p>
 					<button class="antherBtn" @click="makeSureDel">确认</button>
@@ -397,13 +397,16 @@
 			}
 		},
 		onLoad(options) {
-
+			let ids = localStorage.getItem("fireId")
+			if (ids) {
+				this.fireStationId = ids
+			}
 		},
 		onShow() {
 			if (this.$route.query.addId) {
 				this.getAllFire()
 				this.getbackid()
-				console.log(options, 'options')
+				// console.log(options, 'options')
 				this.resultId = this.$route.query.addId
 				if (this.resultId === '2') {
 					this.tomole = '添加负责人'
@@ -412,11 +415,7 @@
 				} else {
 					this.tomole = '添加人员信息'
 				}
-				let ids = localStorage.getItem("fireId")
-				if (ids) {
-					this.fireStationId = ids
-					// console.log(this.fireStationId, 'fireid');
-				}
+
 				// console.log(this.$route.query, 'query'); // 输出传递的参数值
 			} else {
 				return
@@ -498,7 +497,7 @@
 		border-radius: 10rpx;
 		font-size: 20rpx;
 		margin-bottom: 10rpx;
-		margin-right: 10rpx0;
+		margin-right: 10rpx;
 	}
 
 	.modalBox {

+ 2 - 2
pagesA/fire/metting_regsiter/metting_sigin.vue

@@ -7,7 +7,7 @@
 						<div>
 							<text>姓名:{{item.ppName}}</text><br>
 							<text>电话:{{ item.ppTel }}</text><br>
-							<text>职务:{{item.ppDuty}}</text>
+							<text>职务: {{item.ppDuty}}</text>
 						</div>
 						<div style="display: flex;justify-content: space-around;align-items: center;">
 							<button @click="delUser(item)" class="editBtn" style="background-color: red;">删除</button>
@@ -17,7 +17,7 @@
 				</uni-card>
 			</div>
 			<div class="noMesBox" v-if="tableSure1">
-				<span style="border: 5rpx solid #4DB1B6;font-size: 30rpx;padding: 10rpx;">暂无数据</span>
+				<span style="font-size: 30rpx;padding: 10rpx;color: gray;">暂无会议报名人员</span>
 			</div>
 			<div class="useBox">
 				<!-- <button class="useBtn" @click="addNewPeople">新增参会人员</button> -->