liyangzheng 1 year ago
parent
commit
ae18eea698

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

@@ -129,7 +129,7 @@
 				value: 0,
 				range: [{
 						value: '2',
-						text: "负责人"
+						text: "站长"
 					},
 					{
 						value: '1',

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

@@ -148,7 +148,6 @@
 			},
 
 			search(val) {
-				console.log(val, 'valvals');
 				this.tableData = []
 				this.getData(1)
 			},
@@ -166,18 +165,13 @@
 					meetingName: this.keyword,
 					meetingStartTime: this.meetingStartTime,
 					meetingEndTime: this.meetingEndTime
-
-
 				}).then(response => {
-					console.log();
 					// 为数据赋值:通过展开运算符的形式,进行新旧数据的拼接
 					this.tableData = [...this.tableData, ...response.data.list];
 					// 签到流程判断
 					console.log(this.tableData, '				console.log(this.tableData);');
-
 					// 数组时间戳转换
 					this.tableData.map(i => {
-						console.log(i);
 						var meetingEndTime = new Date(i.meetingEndTime).getTime();
 						var meetingStartTime = new Date(i.meetingStartTime).getTime();
 
@@ -197,7 +191,6 @@
 					this.meetingStartTime = '';
 					this.meetingEndTime = '';
 					this.loading = false;
-					console.log(response, '获取后端数据-----------');
 				});
 			},
 			onClick(val) {

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

@@ -154,9 +154,12 @@
 				this.$refs.popup.open('center')
 			},
 			getUser() {
-				getUserProfile().then(res => {
-					this.doorId = res.data.dept.id
-				})
+				// getUserProfile().then(res => {
+				// 	this.doorId = res.data.dept.id
+				// })
+				let user = localStorage.getItem('getUserInfo_key')
+				user = JSON.parse(user)
+				this.doorId = user.data.superviseOrg[0].dwid
 			},
 			getAllPeople() {
 				getListPage({