liyangzheng 1 anno fa
parent
commit
5b2ef3a6ea

+ 1 - 1
api/meetpeople/index.js

@@ -43,7 +43,7 @@ export function getListPage(data) {
 	return request({
 		url: '/admin-api/backend/meeting-participants/page',
 		method: 'get',
-		query: data
+		data
 	})
 }
 // 修改参会人员明细

+ 65 - 0
api/peoplefire/index.js

@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+// 创建微型消防站人员
+export function creatFirePeople(data) {
+	return request({
+		url: '/admin-api/backend/micro-station-emp/create',
+		method: 'post',
+		query: data
+	})
+}
+// 删除微型消防站人员
+export function delFirePeople(data) {
+	return request({
+		url: '/admin-api/backend/micro-station-emp/delete',
+		method: 'post',
+		query: data
+	})
+}
+// 导出消防人员为excel
+export function outexcel(data) {
+	return request({
+		url: '/admin-api/backend/micro-station-emp/export-excel',
+		method: 'get',
+		query: data
+	})
+}
+// 根据id获得消防人员信息
+export function getMesbyid(data) {
+	return request({
+		url: '/admin-api/backend/micro-station-emp/get',
+		method: 'get',
+		query: data
+	})
+}
+// 获取人员列表
+export function getfirelist(data) {
+	return request({
+		url: '/admin-api/backend/micro-station-emp/list',
+		method: 'get',
+		query: data
+	})
+}
+// 获取微信消防站人员分页
+export function getfirepage(data) {
+	return request({
+		url: '/admin-api/backend/micro-station-emp/page',
+		method: 'get',
+		query: data
+	})
+}
+// 修改人员信息
+export function editFirePeople(data) {
+	return request({
+		url: '/admin-api/backend/micro-station-emp/update',
+		method: 'post',
+		query: data
+	})
+}
+
+export function getuserfireid(data) {
+	return request({
+		url: '/admin-api/s9/micro-station/selflist',
+		method: 'get',
+		data
+	})
+}

+ 1 - 1
pagesA/fire/fire_station/index.vue

@@ -209,7 +209,7 @@
 					this.loading = false
 
 					// this.tableData = response.data.list;
-					console.log(this.tableData, '获取消防站信息详细信息获取消防站信息详细信息获取消防站信息详细信息获取消防站信息详细信息');
+					console.log(this.tableData, 'ppp');
 				});
 			},
 

+ 38 - 5
pagesA/fire/fire_station/people_fireStation/people_fireStation.vue

@@ -32,10 +32,20 @@
 </template>
 
 <script>
+	import {
+		creatFirePeople,
+		delFirePeople,
+		outexcel,
+		getMesbyid,
+		getfirelist,
+		getfirepage,
+		editFirePeople,
+		getuserfireid
+	} from "../../../../api/peoplefire/index.js"
 	export default {
 		data() {
 			return {
-				membersList: [],
+				membersList: [], //添加的人员数组
 				resultId: '',
 				value: 0,
 				range: [{
@@ -51,7 +61,10 @@
 						text: "普通人员"
 					},
 				],
-				tomole: "添加人员"
+				tomole: "添加人员",
+				tableList: [], //显示的人员数组
+				userId:'',
+				smallFireId:'',
 			}
 		},
 		methods: {
@@ -77,9 +90,26 @@
 			change(e) {
 				console.log("e:", e);
 			},
+			getbackid() {
+				let x = localStorage.getItem('getUserInfo_key')
+				x = JSON.parse(x)
+				this.userId = x.data.userInfo.id
+				getuserfireid({userId:this.userId}).then(res=>{
+					console.log(res,'userfire');
+				})
+				console.log(x.data.userInfo.id,'xxx');
+			},
+			getAllFire() {
+				getfirepage({
+					pageNo: 1,
+					pageSize: 10
+				}).then(res => {
+					this.tableList = res.data.list
+				})
+			}
 		},
 		onLoad(options) {
-			console.log(options,'options')
+			console.log(options, 'options')
 			this.resultId = this.$route.query.addId
 			if (this.resultId === '2') {
 				this.tomole = '添加负责人'
@@ -88,9 +118,11 @@
 			} else {
 				this.tomole = '添加人员信息'
 			}
-			console.log(this.$route.query,'query'); // 输出传递的参数值
+			console.log(this.$route.query, 'query'); // 输出传递的参数值
 		},
 		onShow() {
+			this.getAllFire()
+			this.getbackid()
 		}
 	}
 </script>
@@ -105,7 +137,8 @@
 		height: 100rpx;
 		margin-left: 20rpx;
 	}
-	/deep/ .antherBtn{
+
+	/deep/ .antherBtn {
 		width: 300rpx;
 		margin-bottom: 30rpx;
 		background-color: #4DB1B6;

+ 30 - 19
pagesA/fire/metting_regsiter/metting_sigin.vue

@@ -56,20 +56,23 @@
 				<u-popup :show="showModal" mode="center" @close="closeModal">
 					<view class="modalBox">
 						<u--form labelPosition="left" :model="modalList" ref="uForm">
-							<u-form-item label="姓名" prop="modalList.name" borderBottom ref="item1">
-								<u--input v-model="modalList.mname" border="none"></u--input>
+							<u-form-item style="width: 500rpx;" label="姓名" prop="modalList.name" borderBottom ref="item1">
+								<u--input class="modalInput" v-model="modalList.mname" border="none"></u--input>
 							</u-form-item>
-							<u-form-item label="电话号" prop="modalList.mphone" borderBottom ref="item2">
-								<u--input v-model="modalList.mphone" border="none"></u--input>
+							<u-form-item style="width: 500rpx;" label="电话号" prop="modalList.mphone" borderBottom ref="item2">
+								<u--input class="modalInput" v-model="modalList.mphone" border="none"></u--input>
 							</u-form-item>
-							<u-form-item label="职务" prop="modalList.mpower" borderBottom ref="item3">
-								<u--input v-model="modalList.mpower" border="none"></u--input>
+							<u-form-item style="width: 500rpx;" label="职务" prop="modalList.mpower" borderBottom ref="item3">
+								<u--input class="modalInput" v-model="modalList.mpower" border="none"></u--input>
 							</u-form-item>
-							<u-form-item label="状态" prop="modalList.mstatus" borderBottom ref="item4">
-								<u--input v-model="modalList.mstatus" border="none"></u--input>
+							<u-form-item style="width: 500rpx;" label="状态" prop="modalList.mstatus" borderBottom ref="item4">
+								<u--input class="modalInput" v-model="modalList.mstatus" border="none"></u--input>
 							</u-form-item>
 						</u--form>
-						<button @click="sureUpdate">确认修改</button>
+						<div style="display: flex;justify-content: space-around;align-items: center;">
+							<button class="useBtn" @click="sureUpdate">确认修改</button>
+							<button class="useBtn" @click="showModal = false">关闭</button>
+						</div>
 					</view>
 				</u-popup>
 			</div>
@@ -127,7 +130,7 @@
 				})
 			},
 			getAllPeople() {
-				getListPage().then(res => {
+				getListPage({meetingId:this.meetId,pageNo:1,pageSize:10}).then(res => {
 					this.tableList = res.data.list
 					console.log(res, 'all');
 				})
@@ -270,12 +273,12 @@
 			}
 		},
 		onShow() {
-			console.log(this.$route.query, '111');
-			this.meetId = this.$route.query.metId
-		},
-		onLoad() {
 			this.getUser()
 			this.getAllPeople()
+		},
+		onLoad() {
+			console.log(this.$route.query, '111');
+			this.meetId = this.$route.query.metId
 		}
 	}
 </script>
@@ -308,14 +311,15 @@
 	}
 
 	.modalBox {
-		width: 500rpx;
-		height: auto;
+		width: 600rpx;
+		height: 600rpx;
 	}
 
 	.text {
 		color: #4DB1B6;
 	}
-	.useBox{
+
+	.useBox {
 		width: 90%;
 		height: auto;
 		margin: 20rpx auto;
@@ -323,7 +327,8 @@
 		justify-content: space-around;
 		align-items: center;
 	}
-	.useBtn{
+
+	.useBtn {
 		width: 200rpx;
 		height: 60rpx;
 		background-color: #4DB1B6;
@@ -333,7 +338,8 @@
 		border-radius: 10rpx;
 		font-size: 20rpx;
 	}
-	.editBtn{
+
+	.editBtn {
 		width: 100rpx;
 		height: 60rpx;
 		background-color: #4DB1B6;
@@ -344,4 +350,9 @@
 		font-size: 20rpx;
 		margin-bottom: 10rpx;
 	}
+
+	.modalInput {
+		width: 200rpx;
+		border: 1px solid #4DB1B6;
+	}
 </style>