“yueshang” 1 year ago
parent
commit
0787b89090

+ 1 - 5
config.js

@@ -1,10 +1,6 @@
 // 应用全局配置
 module.exports = {
-	baseUrl: 'http://api-security.byants.com',
-	baseUrlImg:'http://security.byants.com/static/appimg',
-	// baseUrlImg:'https://byant.jujutong.cloud/resource/appimg',
-	// baseUrl: 'https://byant.jujutong.cloud',
-	// baseUrl: 'http://192.168.1.24:48081', 
+	baseUrl: 'https://byant.jujutong.cloud',	// baseUrl: 'http://192.168.1.24:48081', 
 	// baseUrl:'http://192.168.1.10:48081',
 	// baseUrl:'http://api-security.byants.com/app-api/s9/task/self-page',
 	// baseUrl: 'http://127.0.0.1:4523/m1/2188954-0-default',

+ 2 - 1
pages.json

@@ -344,7 +344,8 @@
 				"path": "fire/fire_station/people_fireStation/people_fireStation",
 				"style": {
 					"navigationBarTitleText": "编辑人员",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
 				},
 				"query": ["addId"]
 			}, {

+ 2 - 2
pagesA/fire/fire_station/fireStation_details/fireStation_details.vue

@@ -218,8 +218,8 @@
 		border: none;
 
 	}
-	.uniTr{
-		background-color: #F2F4F6;
+	/deep/ .uniTr{
+		background-color: #F2F4F6 !important;
 	}
 	.manyBtn{
 		display: inline-block;

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

@@ -1,9 +1,9 @@
 <template>
 	<view style="position: relative;">
-		<div class="useBox">
-			<!-- <button @click="addNewPeople" class="antherBtn">{{tomole}}</button> -->
-			<!-- <u-button type="primary" @click="addSure" class="antherBtn">提交</u-button> -->
-		</div>
+		<navInfo :title="'编辑人员'"></navInfo>
+		<view class="bgTopImg" style="height:200rpx;">
+			<image slot="right" :src="`${urls}/navBg@2x.png`" class="bgTopImg" ></image>
+		</view>
 		<div class="cardBox">
 			<uni-card v-for="item in tableList" style="border: 2rpx solid #4DB1B6;">
 				<div style="display: flex;justify-content: space-between;align-items: center;">
@@ -115,7 +115,13 @@
 		editFirePeople,
 		getuserfireid
 	} from "../../../../api/peoplefire/index.js"
+	import config from '@/config'
+	const baseUrlImg=config.baseUrlImg
+	import navInfo from '@/pagesA/components/my-nav/nav'
 	export default {
+		components: {
+			navInfo
+		},
 		data() {
 			return {
 				membersList: [], //添加的人员数组

+ 7 - 1
pagesA/fire/meeting_sign_in/index.vue

@@ -69,6 +69,7 @@
 						<button class="regsiterBtn" @click="peopleReg(item)"
 							v-if="statusListTran(item.timeStuta)=='进行中'||statusListTran(item.timeStuta)=='未开始'?true:false">报名</button>
 						<!-- <button class="regsiterBtn" @click="onClick(item)">签到</button> -->
+						<button class="regsiterBtn" v-if="statusListTran(item.timeStuta)=='已结束'?true:false" @click="searchMeet(item)">查看</button>
 						<uni-col :span="14">
 							<view class="flex direction-column align-end ">
 								<text class="padding-bottom">会议主题</text>
@@ -275,11 +276,16 @@
 
 			},
 			peopleReg(row) {
-				console.log(row, 'row');
+				// console.log(row, 'row');
 				uni.navigateTo({
 					url: `/pagesA/fire/metting_regsiter/metting_sigin?metId=${row.id}&metName=${row.meetingName}`
 				})
 			},
+			searchMeet(row){
+				uni.navigateTo({
+					url: `/pagesA/fire/metting_regsiter/metting_sigin?meetSearch=${row.id}`
+				})
+			}
 		}
 	};
 </script>

+ 100 - 106
pagesA/fire/meeting_sign_in/meeting_details/meeting_details.vue

@@ -3,31 +3,24 @@
 		<view class="padding-bottom flex direction-column align-center justify-center ">
 			<uni-row class="padding-tb">
 				<uni-col :span="24">
-					<u--image
-						:src="meetingEnd == '1' ? SignINExpired : siginIn != '1' ? signOne : signIned"
-						width="234rpx"
-						height="128px"
-						@click="signInClick"
-					>
+					<u--image :src="meetingEnd == '1' ? SignINExpired : siginIn != '1' ? signOne : signIned"
+						width="234rpx" height="128px" @click="signInClick">
 						<template v-slot:loading>
 							<u-loading-icon color="red"></u-loading-icon>
 						</template>
 						<view slot="error" style="font-size: 24rpx;">加载失败</view>
 					</u--image>
-					<text v-if="meetingEnd == 1" style="font-weight:bold; padding-left: 51rpx;;color: #8d8d8d;font-size: 32rpx;">
+					<text v-if="meetingEnd == 1"
+						style="font-weight:bold; padding-left: 51rpx;;color: #8d8d8d;font-size: 32rpx;">
 						会议已结束
 					</text>
-				
-					<text
-						v-else-if="siginIn != '1'"
-						style="font-weight:bold; padding-left: 51rpx;;color: #4cb2b6;font-size: 32rpx;"
-					>
+
+					<text v-else-if="siginIn != '1'"
+						style="font-weight:bold; padding-left: 51rpx;;color: #4cb2b6;font-size: 32rpx;">
 						点击签到
 					</text>
-					<text
-						v-else-if="siginIn == '1'"
-						style="font-weight:bold; padding-left: 65rpx;;color: #f7c41e;font-size: 32rpx;"
-					>
+					<text v-else-if="siginIn == '1'"
+						style="font-weight:bold; padding-left: 65rpx;;color: #f7c41e;font-size: 32rpx;">
 						已签到
 					</text>
 				</uni-col>
@@ -74,105 +67,106 @@
 	</view>
 </template>
 <script>
-import {
-	getMeeting, // 查询会议列表
-	getMeetingSign, //会议签到
-	getMeet
-} from '@/api/meeting';
-let that = null;
-import config from '@/config'
-const baseUrlImg=config.baseUrlImg
-export default {
-	data() {
-		return {
-			formData: {},
-			formData2: {
-				id: '',
-				siginIn: '1',
-				status: 0,
-				userId: this.$store.state.user.id
-				// "orgId":1
-			},
-			siginIn: '',
-			status: '',
-			signOne: `${baseUrlImg}/metting/sign.png`,
-			signIned: `${baseUrlImg}/metting/Signed.png`,
-			SignINExpired: `${baseUrlImg}/metting/SignINExpired.png`,
-			IsSign: false,
-			FinalTime: 0,
-			meetingEnd: '',
-			pageSize: 20,
-			// 当前页
-			pageNo: 1
-		};
-	},
-	onshow() {
-	},
-	//目的页面接收
-	//这里用onshow()也可以
+	import {
+		getMeeting, // 查询会议列表
+		getMeetingSign, //会议签到
+		getMeet
+	} from '@/api/meeting';
+	let that = null;
+	import config from '@/config'
+	const baseUrlImg = config.baseUrlImg
+	export default {
+		data() {
+			return {
+				formData: {},
+				formData2: {
+					id: '',
+					siginIn: '1',
+					status: 0,
+					userId: this.$store.state.user.id
+					// "orgId":1
+				},
+				siginIn: '',
+				status: '',
+				signOne: `${baseUrlImg}/metting/sign.png`,
+				signIned: `${baseUrlImg}/metting/Signed.png`,
+				SignINExpired: `${baseUrlImg}/metting/SignINExpired.png`,
+				IsSign: false,
+				FinalTime: 0,
+				meetingEnd: '',
+				pageSize: 20,
+				// 当前页
+				pageNo: 1
+			};
+		},
+		onshow() {},
+		//目的页面接收
+		//这里用onshow()也可以
 
-	onLoad: function(options) {
-		var data = options.id;
-		// this.getData(data);
-		that = this;
+		onLoad: function(options) {
+			var data = options.id;
+			// this.getData(data);
+			that = this;
 
-		const eventChannel = this.getOpenerEventChannel();
-		// eventChannel.emit('acceptDataFromOpenedPage', {
-		// 监听acceptDataFromOpenerPage事件,获取上一页面通过eventChannel传送到当前页面的数据
-		eventChannel.on('acceptDataFromOpenerPage', function(val) {
-			console.log('传送到当前页面的数据 ', val);
-			that.formData = val;
-			that.formData2.id = val.meetingDetailDOList[0].id;
-			// 签到流程判断
-			var Time = new Date(that.formData.meetingEndTime);
-			that.FinalTime = Time.getTime();
-			var currentTime = new Date().getTime();
-			
-			// 判断结束时间是否小于当前时间   小于则判断是否已经签到
-			if (that.FinalTime < currentTime) {
-				// 1 表示显示过期图片
-				that.meetingEnd = '1';
-			} else {
-				const id = that.formData2.id;
-				getMeet({id:id}).then(res=>{
-					that.siginIn = res.data.siginIn;
-				})				
-			}
-		});
+			const eventChannel = this.getOpenerEventChannel();
+			// eventChannel.emit('acceptDataFromOpenedPage', {
+			// 监听acceptDataFromOpenerPage事件,获取上一页面通过eventChannel传送到当前页面的数据
+			eventChannel.on('acceptDataFromOpenerPage', function(val) {
+				console.log('传送到当前页面的数据 ', val);
+				that.formData = val;
+				that.formData2.id = val.meetingDetailDOList[0].id;
+				// 签到流程判断
+				var Time = new Date(that.formData.meetingEndTime);
+				that.FinalTime = Time.getTime();
+				var currentTime = new Date().getTime();
+
+				// 判断结束时间是否小于当前时间   小于则判断是否已经签到
+				if (that.FinalTime < currentTime) {
+					// 1 表示显示过期图片
+					that.meetingEnd = '1';
+				} else {
+					const id = that.formData2.id;
+					getMeet({
+						id: id
+					}).then(res => {
+						that.siginIn = res.data.siginIn;
+					})
+				}
+			});
+
+			// this.getData();/
+		},
+		methods: {
 
-		// this.getData();/
-	},
-	methods: {
 
+			signInClick() {
+				var SignJson = JSON.stringify(this.formData2);
 
-		signInClick() {			
-			var SignJson = JSON.stringify(this.formData2);
-			
-			getMeetingSign(SignJson).then(res => {
-				// console.log(res);
-				// this.siginIn='1'
-				if (res.code==0 ){
-					this.siginIn='1'
+				getMeetingSign(SignJson).then(res => {
+					// console.log(res);
+					// this.siginIn='1'
+					if (res.code == 0) {
+						this.siginIn = '1'
 					}
-			});
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 <style>
-.sign-in {
-	height: 400rpx;
-}
+	.sign-in {
+		height: 400rpx;
+	}
 
-.border-bottom {
-	border-bottom: 1px solid #cbd5e1;
-}
+	.border-bottom {
+		border-bottom: 1px solid #cbd5e1;
+	}
 
-.border-top {
-	border-top: 1px solid #cbd5e1;
-}
+	.border-top {
+		border-top: 1px solid #cbd5e1;
+	}
 
-.border-right {
-	border-right: 1px solid #cbd5e1;
-}
-</style>
+	.border-right {
+		border-right: 1px solid #cbd5e1;
+	}
+</style>

+ 13 - 6
pagesA/fire/metting_regsiter/metting_sigin.vue

@@ -10,8 +10,8 @@
 							<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>
-							<button @click="editUser(item)" class="editBtn">编辑</button>
+							<button @click="delUser(item)" class="editBtn" style="background-color: red;" v-if="ifMeet">删除</button>
+							<button @click="editUser(item)" class="editBtn" v-if="ifMeet">编辑</button>
 						</div>
 					</div>
 				</uni-card>
@@ -91,7 +91,7 @@
 			</div>
 			<!-- <button @click="show123 = true">11</button> -->
 			<!-- <button>1</button> -->
-			<button class="circleBtn" @click="addNewPeople">+</button>
+			<button class="circleBtn" @click="addNewPeople" v-if="ifMeet">+</button>
 		</view>
 	</view>
 </template>
@@ -144,7 +144,8 @@
 				tableSure1: false,
 				showDel: false,
 				makeDelId: "",
-				show123: false
+				show123: false,
+				ifMeet:true,
 			}
 		},
 		methods: {
@@ -362,7 +363,7 @@
 				})
 			},
 			cancel() {
-				this.show123 = false//取消
+				this.show123 = false //取消
 			},
 			close() {
 				this.show123 = false //遮罩层
@@ -374,7 +375,13 @@
 		},
 		onLoad() {
 			// console.log(this.$route.query, '111');
-			this.meetId = this.$route.query.metId
+			if (this.$route.query.metId) {
+				this.meetId = this.$route.query.metId
+			}
+			if (this.$route.query.meetSearch) {
+				this.meetId = this.$route.query.meetSearch
+				this.ifMeet = false
+			}
 		}
 	}
 </script>