heyang

pages_basics/views/earlyWarningManage/earlyWarningDetail.vue

@@ -111,7 +111,7 @@
 					</view>
 					<view class="basics_li">
 						<text>存放位置：</text>
-						<text>{{item.position}}</text>
+						<text>{{item.position}}层</text>
 					</view>
 					<view class="basics_li">
 						<text>化学品余量：</text>

pages_manage/views/accessQualification/accessQualificationInfo.vue

@@ -164,15 +164,18 @@
 					uni.showLoading({
 						title: '下载中'
 					});
+					
+					console.log(self.baseUrl + '/' + minItem.name)
+					console.log(minItem.url)
 					//下载文档
 					wx.downloadFile({
-						url: minItem.url,
+						url: self.baseUrl+minItem.url,
 						header: {
 							Authorization: uni.getStorageSync('token')
 						},
 						success: function(res) {
 							const fileManager = wx.getFileSystemManager()
-							const filePath = wx.env.USER_DATA_PATH + '/' + minItem.name + '.docx'
+							const filePath = wx.env.USER_DATA_PATH + '/' + minItem.name
 							fileManager.saveFile({
 								tempFilePath: res.tempFilePath,
 								filePath,

pages_manage/views/accessQualification/approve.vue

@@ -78,7 +78,7 @@
 				} = await laboratoryAppletEditApp(obj)
 				if (data.code == 200) {
 					uni.showToast({
-						title: '审核成功',
+						title: '提交成功!',
 						icon: "none",
 						mask: true,
 						duration: 2000

pages_manage/views/gradingControl/gradingControl.vue

@@ -50,6 +50,9 @@
 			
 		},
 		onShow() {
+			
+		},
+		mounted() {
 			this.getList();
 		},
 		methods: {

pages_manage/views/gradingControl/infoPage.vue

@@ -111,7 +111,9 @@
 						duration: 2000
 					});
 					setTimeout(function() {
-						uni.navigateBack();
+						uni.redirectTo({
+							url: '/pages_manage/views/gradingControl/gradingControl'
+						});
 					}, 2000);
 				}
 			}
@@ -180,4 +182,4 @@
 			color: #fff;
 		}
 	}
-</style>
+</style>infoPage

pages_manage/views/laboratory/accessRecord.vue

@@ -107,7 +107,7 @@
 				let self = this;
 				const {
 					data
-				} = await laboratoryAppletPassOutCount(this.queryParams.subId);
+				} = await laboratoryAppletPassOutCount({subId:this.queryParams.subId});
 				if (data.code == 200) {
 					this.statisticsData[0].num = data.data.experimenters
 					this.statisticsData[1].num = data.data.numberPeople

pages_manage/views/laboratory/iotControl.vue

@@ -29,11 +29,11 @@
 				<view class="for-button-p">{{item.hardwareName}}
 					<text v-if="item.reservedThree">({{item.reservedThree}})</text>
 				</view>
-				<img v-if="item.online && item.operatingState" src="@/pages_manage/images/icon_10.png"
+				<img v-if="item.operatingState" src="@/pages_manage/images/icon_10.png"
 					@click="buttonClick('switch',item,'0')">
-				<img v-if="item.online && !item.operatingState" src="@/pages_manage/images/icon_11.png"
+				<img v-if="!item.operatingState" src="@/pages_manage/images/icon_11.png"
 					@click="buttonClick('switch',item,'1')">
-				<view class="for-button-p" v-if="!item.online">离线</view>
+				<!-- <view class="for-button-p" v-if="!item.online">离线</view> -->
 			</view>
 		</view>
 		<!-- 智能终端 -->
@@ -169,6 +169,10 @@
 						success: function(res) {
 							if (res.confirm) {
 								self.mangerControl(row, status);
+								setTimeout(function(){
+									self.iotAppHardwareFindByType();
+								},200)
+								
 								console.log('用户点击确定');
 							} else if (res.cancel) {
 								console.log('用户点击取消');
@@ -275,8 +279,6 @@
 					});
 				});
 				this.client.on("message", (topic, message) => {
-					console.log('message', message);
-					console.log('topic,', topic);
 					if (message) {
 						if (topic == this.mtopic + this.subId) {
 							//传感器
@@ -295,6 +297,7 @@
 							//智能控制
 							let data = JSON.parse(message)
 							let list = JSON.parse(JSON.stringify(this.labHardwareVOList))
+							console.log('智能控制',data)
 							list.forEach((item) => {
 								if (item.hardwareNo == data.hardwareNo) {
 									if (item.hardwareTypeKey == 'airConditioner') {

pages_manage/views/laboratory/meLaboratory.vue

@@ -40,7 +40,7 @@
 				<view class="address-box"><span>{{ item.typeName?item.typeName:'' }}</span>{{ item.deptName?item.deptName:'' }}</view>
 				<view class="address-box-two">
 					<img src="@/pages_manage/images/icon_14.png">
-					<view>{{ item.buildName}} {{ item.floorName}} {{ item.subName}} {{ item.roomName}}</view>
+					<view>{{ item.buildName}} {{ item.floorName}} {{ item.subName}} {{ item.roomName?item.roomName:''}}</view>
 				</view>
 			</view>
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>

pages_safetyExamine/views/dangerManage/dangerDetail.vue

@@ -261,7 +261,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 				},
 				tabTextTow: [],

pages_safetyExamine/views/dangerManage/dangerList.vue

@@ -82,7 +82,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					hazardType: '1', //1是院校巡查，2是实验室自查
 					rectifyStatus: '', //1已完成 2待整改 3待复核 4 暂无法整改
@@ -154,7 +154,7 @@
 			//顶部tab点击
 			tabClickTow(index) {
 				this.curTabTow = index;
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.getData.searchValue = '';
 				this.getData.deptId = '';
 				this.getData.deptName = '';
@@ -187,7 +187,7 @@
 			},
 			//清除
 			clearBtn() {
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.collegeIndex = 0;
 				this.getData.deptId = '';
 				this.getData.deptName = '';
@@ -198,11 +198,11 @@
 			//滚动事件
 			scrollGet() {
 				let self = this;
-				if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+				if (self.total / self.getData.pageSize <= self.getData.page) {
 					console.log('没有更多数据!')
 				} else {
 					setTimeout(function() {
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					}, 1000)
 

pages_safetyExamine/views/dangerManage/dangerManage.vue

@@ -89,7 +89,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					hazardType: '1', //1是院校巡查，2是实验室自查
 					rectifyStatus: '', //1已完成 2待整改 3待复核 4 暂无法整改
@@ -171,7 +171,7 @@
 		methods: {
 			tabClick(index) {
 				this.curTab = index;
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.getData.searchValue = '';
 				this.getData.deptId = '';
 				this.getData.deptName = '';
@@ -188,7 +188,7 @@
 			//顶部tab点击
 			tabClickTow(index) {
 				this.curTabTow = index;
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.getData.searchValue = '';
 				this.getData.deptId = '';
 				this.getData.deptName = '';
@@ -221,7 +221,7 @@
 			},
 			//清除
 			clearBtn() {
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.collegeIndex = 0;
 				this.getData.deptId = '';
 				this.getData.deptName = '';
@@ -232,11 +232,11 @@
 			//滚动事件
 			scrollGet() {
 				let self = this;
-				if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+				if (self.total / self.getData.pageSize <= self.getData.page) {
 					console.log('没有更多数据!')
 				} else {
 					setTimeout(function() {
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					}, 1000)
 

pages_safetyExamine/views/examineManage/examineAdd.vue

@@ -168,6 +168,9 @@
 	import {
 		config
 	} from '@/api/request/config.js'
+	import {
+		laboratoryAppletGetSubDetailInfo
+	} from '@/pages/api/index.js'
 	import {
 		getCheckPlanBySubId,
 		checkManageUpdate,
@@ -190,7 +193,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 				},
 				customTitle: '',
@@ -832,25 +835,14 @@
 				uni.scanCode({
 					onlyFromCamera: true,
 					success: function(res) {
-						if (res.result.indexOf("code") != -1 && res.result.indexOf("-") != -1 && res.result
-							.indexOf("&") != -1) {
-							let codeRoom = "";
-							let newList = res.result.split("?")[1].split("&")
-							let list = newList[0].split("=")[1].split("-")
-							codeRoom = list[1];
-							if (codeRoom) {
-								self.roomList = [];
-								self.room = codeRoom;
-								self.buildBySub();
-								self.popupType = true;
-							} else {
-								uni.showToast({
-									title: '请扫描正确的二维码',
-									icon: "none",
-									mask: true,
-									duration: 2000
-								});
-							}
+						let list = res.result.split("?")[1].split("&");
+						let codeData = {};
+						list.forEach((item) => {
+							codeData[item.split("=")[0]] = item.split("=")[1];
+						})
+						console.log('二维码', codeData)
+						if (codeData.code) {
+							self.laboratoryAppletGetSubDetailInfo(codeData.code);
 						} else {
 							uni.showToast({
 								title: '请扫描正确的二维码',
@@ -862,6 +854,45 @@
 					}
 				});
 			},
+			//获取实验室详情
+			async laboratoryAppletGetSubDetailInfo(infoId) {
+				const {
+					data
+				} = await laboratoryAppletGetSubDetailInfo({
+					infoId: infoId
+				});
+				if (data.code == 200) {
+				
+					this.$set(this.form, "subIds",  data.data.subId)
+					this.$set(this.form, "subjectName",  data.data.subName)
+					this.$set(this.form, "deptId",  data.data.deptId)
+					this.$set(this.form, "deptName", data.data.deptName)
+					this.$set(this.form, "collegeName", data.data.deptName)
+					this.$set(this.form, "buildId",  data.data.buildId)
+					this.$set(this.form, "buildName",  data.data.buildName)
+					this.$set(this.form, "roomNumber",  data.data.roomNum)
+					this.$set(this.form, 'title', '');
+					this.$set(this.form, 'id', '');
+					this.$set(this.form, 'checkType', 2);
+					this.$set(this.form, 'checkResult', 1);
+					this.$set(this.form, 'rectifyDeadline', '');
+					this.$set(this, 'informIndex', 0);
+					this.$set(this.form, 'cycleStartTime', '');
+					this.$set(this.form, 'cycleEndTime', '');
+					this.$set(this.form, 'checkHazardDtoList', [{
+						voiceRemark: [], //语音备忘存储
+						hazardLevel: 2, //隐患等级
+						hazardLevelName: '一般隐患', //隐患等级
+						hazardCheckCode: '', //检查项目code序号
+						hazardCheckName: '', //检查项目名称
+						hazardCheckPro: '', //最后一级的id
+						hazardCheckPoint: '', // 检查要点
+						hazardDescribe: '', //隐患描述
+						uploadDtoList: [], //隐患照片
+					}]);
+					this.getCheckPlanBySubId( data.data.subId)
+				}
+			},
 			//附件查看
 			attachmentPreview(item) {
 				uni.showLoading({

pages_safetyExamine/views/examineManage/examineAddContent.vue

@@ -46,7 +46,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 200,
 					searchValue: '',
 					subId: '',

pages_safetyExamine/views/examineManage/examineDetail.vue

@@ -82,8 +82,8 @@
 						<view class="grade" :style="item.switch?'border-bottom: 1rpx solid #D8D8D8;':'border:none;'">
 							<text>第{{index+1}}项隐患</text>
 							<text style="color: #0183FA;"
-								@click="dangerItem(item)">{{item.rectifyStatus==1?'已完成':(item.rectifyStatus==2?'待整改':(item.rectifyStatus==3?'待复核':(item.rectifyStatus==4?'暂无法整改':'')))}}
-								>></text>
+								@click="dangerItem(item)">
+								{{item.rectifyStatus==1?'已完成':(item.rectifyStatus==2?'待整改':(item.rectifyStatus==3?'待复核':(item.rectifyStatus==4?'暂无法整改':'')))}}>></text>
 						</view>
 						<view v-if="item.switch">
 							<view class="grade">
@@ -133,8 +133,8 @@
 							<viwe :class="item.checkFlag==0?'noConform':'isConform'">{{item.checkFlag==0?'不符合':'符合'}}
 							</viwe>
 							<text style="color: #0183FA;" v-if="item.checkFlag==0"
-								@click="dangerItem(item)">{{item.rectifyStatus==1?'已完成':(item.rectifyStatus==2?'待整改':(item.rectifyStatus==3?'待复核':(item.rectifyStatus==4?'暂无法整改':'')))}}
-								>></text>
+								@click="dangerItem(item)">
+								{{item.rectifyStatus==1?'已完成':(item.rectifyStatus==2?'待整改':(item.rectifyStatus==3?'待复核':(item.rectifyStatus==4?'暂无法整改':'')))}}>></text>
 						</view>
 						<view class="small_items">{{item.hazardCheckProStr}}</view>
 						<view v-if="item.switch">

pages_safetyExamine/views/examineManage/examineList.vue

@@ -96,7 +96,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					isSelf: 0, //是否本人查询
 					checkType: '', //检查组织(0全部1校院巡查2实验室自查)
@@ -175,7 +175,7 @@
 			//顶部tab点击
 			tabClickTow(index) {
 				this.curTabTow = index;
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.dataList = [];
 				if (index == 0) {
 					this.getData.manageStatus = -1;
@@ -203,7 +203,7 @@
 			},
 			//清除
 			clearBtn() {
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.collegeIndex = 0;
 				this.getData.deptId = '';
 				this.getData.deptName = '';
@@ -214,11 +214,11 @@
 			//滚动事件
 			scrollGet() {
 				let self = this;
-				if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+				if (self.total / self.getData.pageSize <= self.getData.page) {
 					console.log('没有更多数据!')
 				} else {
 					setTimeout(function() {
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					}, 1000)
 

pages_safetyExamine/views/patrolPlan/patrolPlanAdd.vue

@@ -128,7 +128,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 				},
 				form: {

pages_safetyExamine/views/patrolPlan/patrolPlanAddContent.vue

@@ -51,7 +51,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					hazardTypeMode: '', //类型id
 					hazardTypeModeName: '',
@@ -90,11 +90,11 @@
 			//滚动事件
 			scrollGet() {
 				let self = this;
-				if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+				if (self.total / self.getData.pageSize <= self.getData.page) {
 					console.log('没有更多数据!')
 				} else {
 					setTimeout(function() {
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					}, 1000)
 
@@ -105,7 +105,7 @@
 				this.collegeIndex = e.target.value;
 				this.getData.hazardTypeMode = this.collegeList[e.target.value].value
 				this.getData.hazardTypeModeName = this.collegeList[e.target.value].label
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.dataList = [];
 				this.getList();
 			},
@@ -133,7 +133,7 @@
 			},
 			//清除
 			clearBtn() {
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.collegeIndex = 0;
 				this.getData.deptId = '';
 				this.getData.deptName = '';

pages_safetyExamine/views/patrolPlan/patrolPlanAddLab.vue

@@ -51,7 +51,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					deptId: '', //学院id
 					deptName: '',
@@ -89,11 +89,11 @@
 			//滚动事件
 			scrollGet() {
 				let self = this;
-				if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+				if (self.total / self.getData.pageSize <= self.getData.page) {
 					console.log('没有更多数据!')
 				} else {
 					setTimeout(function() {
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					}, 1000)
 
@@ -104,7 +104,7 @@
 				this.collegeIndex = e.target.value;
 				this.getData.deptId = this.collegeList[e.target.value].deptId
 				this.getData.deptName = this.collegeList[e.target.value].deptName
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.dataList = [];
 				this.getList();
 			},
@@ -132,7 +132,7 @@
 			},
 			//清除
 			clearBtn() {
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.collegeIndex = 0;
 				this.getData.deptId = '';
 				this.getData.deptName = '';

pages_safetyExamine/views/patrolPlan/patrolPlanAddMember.vue

@@ -79,11 +79,11 @@
 			//滚动事件
 			scrollGet() {
 				let self = this;
-				if (self.total <= self.getData.pageNum) {
+				if (self.total <= self.getData.page) {
 					console.log('没有更多数据!')
 				} else {
 					setTimeout(function() {
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					}, 1000)
 
@@ -112,7 +112,7 @@
 			},
 			//清除按钮
 			clearBtn() {
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.getData.searchValue = '';
 				this.dataList = [];
 				this.getList();

pages_safetyExamine/views/patrolPlan/patrolPlanDetail.vue

@@ -135,7 +135,7 @@ export default {
 		pageType:0,
 		//列表请求参数
 		getData:{
-		 pageNum:1,
+		 page:1,
 		 pageSize:20,
 		},
 		inspectState:0,//检查状态 0 未开始 1进行中
@@ -196,11 +196,11 @@ export default {
 		//滚动事件
 		scrollGet(){
 			let self=this;
-			if(self.total<=self.getData.pageNum){
+			if(self.total<=self.getData.page){
 			    console.log('没有更多数据!')
 			}else{
 					setTimeout(function(){
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					},1000)
 
@@ -219,7 +219,7 @@ export default {
 
 		 //    let self = this;
 		 //    let obj = {
-		 //        pageNum:this.getData.page,
+		 //        page:this.getData.page,
 		 //        pageSize:this.getData.pageSize,
 		 //    };
 		 //    const {data} = await groupList(obj);

pages_safetyExamine/views/patrolPlan/patrolPlanEdit.vue

@@ -215,7 +215,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					checkPlanId: '',
 					deptId: '',
@@ -318,7 +318,7 @@
 				} else if (index == 3) { //已检查
 					this.getData.manageStatus = 2;
 				}
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.dataList = [];
 				this.getList()
 			},
@@ -371,7 +371,7 @@
 			},
 			//清除
 			clearBtn() {
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.collegeIndex = 0;
 				this.getData.deptId = '';
 				this.getData.deptName = '';
@@ -383,11 +383,11 @@
 			scrollGet() {
 				let self = this;
 				if (this.pageType == 1) { //当页面切换到检查管理列表里的时候
-					if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+					if (self.total / self.getData.pageSize <= self.getData.page) {
 						console.log('没有更多数据!')
 					} else {
 						setTimeout(function() {
-							self.getData.pageNum += 1;
+							self.getData.page += 1;
 							self.getList();
 						}, 1000)
 

pages_safetyExamine/views/patrolPlan/patrolPlanList.vue

@@ -74,7 +74,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					searchValue: '',
 					checkType: '',
@@ -119,7 +119,7 @@
 			},
 			//清除按钮
 			clearBtn() {
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.getData.searchValue = '';
 				this.dataList = [];
 				this.getList();
@@ -127,11 +127,11 @@
 			//滚动事件
 			scrollGet() {
 				let self = this;
-				if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+				if (self.total / self.getData.pageSize <= self.getData.page) {
 					console.log('没有更多数据!')
 				} else {
 					setTimeout(function() {
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					}, 1000)
 
@@ -141,7 +141,7 @@
 			//顶部tab点击
 			tabClick(index) {
 				this.curTab = index;
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.dataList = [];
 				this.getData.checkStatus = index;
 				this.getList()

pages_safetyExamine/views/safetyExamineWorkbench.vue

@@ -263,12 +263,12 @@
 				pageType: 1, //人员类型 3整改人 2检查人 1管理员
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					checkStatus: 1,
 				},
 				getData2: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					isSelf: 0, //是否本人查询
 					checkType: 0,
@@ -276,7 +276,7 @@
 					rectifyStatus: '',
 				},
 				getData3: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					hazardType: '', //1是院校巡查，2是实验室自查
 					rectifyStatus: '', //1已完成 2待整改 3待复核 4 暂无法整改
@@ -411,21 +411,21 @@
 			scrollGet() {
 				let self = this;
 				if (this.pageType == 1) { //管理员
-					if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+					if (self.total / self.getData.pageSize <= self.getData.page) {
 						console.log('没有更多数据!')
 					} else {
 						setTimeout(function() {
-							self.getData.pageNum += 1;
+							self.getData.page += 1;
 							self.getList();
 						}, 1000)
 
 					}
 				} else if (this.pageType == 2) { //检查者
-					if (self.total2 / self.getData2.pageSize <= self.getData2.pageNum) {
+					if (self.total2 / self.getData2.pageSize <= self.getData2.page) {
 						console.log('没有更多数据!')
 					} else {
 						setTimeout(function() {
-							self.getData2.pageNum += 1;
+							self.getData2.page += 1;
 
 							if (self.curTabTow == 2) { //待复核
 								self.checkHazardAppList()
@@ -435,11 +435,11 @@
 						}, 1000)
 					}
 				} else if (this.pageType == 3) { //整改者
-					if (self.total3 / self.getData3.pageSize <= self.getData3.pageNum) {
+					if (self.total3 / self.getData3.pageSize <= self.getData3.page) {
 						console.log('没有更多数据!')
 					} else {
 						setTimeout(function() {
-							self.getData3.pageNum += 1;
+							self.getData3.page += 1;
 							if (self.curTabThree == 0) { //隐患
 								self.checkHazardAppList()
 							} else { //随手拍
@@ -472,7 +472,7 @@
 			//管理员
 			tabClick(index) {
 				this.curTab = index;
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.dataList = [];
 				if (index == 0) { //未开始
 					this.getData.checkStatus = 1
@@ -484,7 +484,7 @@
 			},
 			tabClickTow(index) {
 				this.curTabTow = index;
-				this.getData2.pageNum = 1;
+				this.getData2.page = 1;
 				this.dataList2 = [];
 				if (index == 0) { //未开始
 					this.getData2.manageStatus = 0
@@ -500,7 +500,7 @@
 			},
 			tabClickThree(index) { //整改者
 				this.curTabThree = index;
-				this.getData3.pageNum = 1;
+				this.getData3.page = 1;
 				this.dataList3 = [];
 				if (index == 0) { //隐患待整改
 					this.getData3.rectifyStatus = 2
@@ -620,7 +620,7 @@
 									self.getCheckPlanBySubId(codeData.subId)
 								} else if (self.pageType == 3) { //整改者
 									let obj = {
-										pageNum: 1,
+										page: 1,
 										pageSize: 100,
 										subId: codeData.subId,
 									}
@@ -831,7 +831,7 @@
 			async checkPlanListAllNum() {
 				let self = this;
 				let obj = {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					checkStatus: 1,
 				}
@@ -845,7 +845,7 @@
 			async checkPlanListAllNum2() {
 				let self = this;
 				let obj = {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					checkStatus: 2,
 				}
@@ -902,14 +902,15 @@
 				let obj = {};
 				if (this.pageType == 2) { //检查者
 					obj = {
-						pageNum: this.getData2.pageNum,
+						page: this.getData2.page,
 						pageSize: this.getData2.pageSize,
 						hazardType: '',
 						rectifyStatus: '3',
 					};
+					this.dataList2=[];
 				} else if (this.pageType == 3) { //整改者
 					obj = {
-						pageNum: this.getData3.pageNum,
+						page: this.getData3.page,
 						pageSize: this.getData3.pageSize,
 						hazardType: '',
 						rectifyStatus: '2',
@@ -935,7 +936,7 @@
 			async checkClapList() {
 				let self = this;
 				let obj = {
-					pageNum: this.getData3.pageNum,
+					page: this.getData3.page,
 					pageSize: this.getData3.pageSize,
 					rectifyStatus: 0,
 				};
@@ -951,7 +952,7 @@
 			async checkClapListAllNum() {
 				let self = this;
 				let obj = {
-					pageNum: this.getData3.pageNum,
+					page: this.getData3.page,
 					pageSize: this.getData3.pageSize,
 					rectifyStatus: 0,
 				};
@@ -967,7 +968,7 @@
 			async checkManageListAllNum() {
 				let self = this;
 				let obj = {
-					pageNum: this.getData2.pageNum,
+					page: this.getData2.page,
 					pageSize: this.getData2.pageSize,
 					isSelf: 0, //是否本人查询
 					manageStatus: 0,
@@ -984,7 +985,7 @@
 			async checkManageListAllNum2() {
 				let self = this;
 				let obj = {
-					pageNum: this.getData2.pageNum,
+					page: this.getData2.page,
 					pageSize: this.getData2.pageSize,
 					isSelf: 0, //是否本人查询
 					manageStatus: 1,
@@ -1001,7 +1002,7 @@
 			async checkHazardAppListAllNum() {
 				let self = this;
 				let obj = {
-					pageNum: this.getData2.pageNum,
+					page: this.getData2.page,
 					pageSize: this.getData2.pageSize,
 					rectifyStatus: 3,
 					hazardType: '',

pages_safetyExamine/views/snapshotManage/snapshotAdd.vue

@@ -73,7 +73,9 @@
 	import {
 		config
 	} from '@/api/request/config.js'
-
+	import {
+		laboratoryAppletGetSubDetailInfo
+	} from '@/pages/api/index.js'
 	import {
 		laboratorySubRelInfoGetRelList,
 		getUserCollegCheck,
@@ -92,7 +94,7 @@
 				pageType: 0,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 				},
 				form: {
@@ -120,6 +122,7 @@
 				popupType: false,
 				//房间搜索字段
 				room: "",
+				subId: "",
 				roomList: [],
 
 			}
@@ -279,25 +282,14 @@
 				uni.scanCode({
 					onlyFromCamera: true,
 					success: function(res) {
-						if (res.result.indexOf("code") != -1 && res.result.indexOf("-") != -1 && res.result
-							.indexOf("&") != -1) {
-							let codeRoom = "";
-							let newList = res.result.split("?")[1].split("&")
-							let list = newList[0].split("=")[1].split("-")
-							codeRoom = list[1];
-							if (codeRoom) {
-								self.roomList = [];
-								self.room = codeRoom;
-								self.buildBySub();
-								self.popupType = true;
-							} else {
-								uni.showToast({
-									title: '请扫描正确的二维码',
-									icon: "none",
-									mask: true,
-									duration: 2000
-								});
-							}
+						let list = res.result.split("?")[1].split("&");
+						let codeData = {};
+						list.forEach((item) => {
+							codeData[item.split("=")[0]] = item.split("=")[1];
+						})
+						console.log('二维码', codeData)
+						if (codeData.code) {
+							self.laboratoryAppletGetSubDetailInfo(codeData.code);
 						} else {
 							uni.showToast({
 								title: '请扫描正确的二维码',
@@ -309,7 +301,20 @@
 					}
 				});
 			},
-
+			//获取实验室详情
+			async laboratoryAppletGetSubDetailInfo(infoId) {
+				const {
+					data
+				} = await laboratoryAppletGetSubDetailInfo({
+					infoId: infoId
+				});
+				if (data.code == 200) {
+					this.$set(this.form, "subId", data.data.subId)
+					this.$set(this.form, "subName", data.data.subName)
+					this.$set(this.form, "deptId", data.data.deptId)
+					this.$set(this.form, "deptName", data.data.deptName)
+				}
+			},
 			//查询用户身份信息
 			async getUserCollegCheck() {
 				let _this = this;

pages_safetyExamine/views/snapshotManage/snapshotList.vue

@@ -61,7 +61,7 @@
 				pageType: 1,
 				//列表请求参数
 				getData: {
-					pageNum: 1,
+					page: 1,
 					pageSize: 20,
 					rectifyStatus: 0,
 				},
@@ -135,7 +135,7 @@
 			tabClickTow(index) {
 				this.dataList = [];
 				this.curTabTow = index;
-				this.getData.pageNum = 1;
+				this.getData.page = 1;
 				this.getData.rectifyStatus = index;
 				this.getList()
 			},
@@ -143,11 +143,11 @@
 			//滚动事件
 			scrollGet() {
 				let self = this;
-				if (self.total / self.getData.pageSize <= self.getData.pageNum) {
+				if (self.total / self.getData.pageSize <= self.getData.page) {
 					console.log('没有更多数据!')
 				} else {
 					setTimeout(function() {
-						self.getData.pageNum += 1;
+						self.getData.page += 1;
 						self.getList();
 					}, 1000)
 

pages_student/views/accessApplication/applicationDetails.vue

@@ -4,7 +4,7 @@
 		<view class="user-info-box">
 			<view class="user-info-box-min">
 				<view>实验室：</view>
-				<view>{{subjectData.labSecurityApply.subjectName}}</view>
+				<view>{{subjectData.labSecurityApply.subName}}</view>
 			</view>
 			<view class="user-info-box-min">
 				<view>申请时限：</view>
@@ -22,15 +22,15 @@
 			</view>
 			<view class="user-info-box-min">
 				<view>申请人：</view>
-				<view>{{subjectData.sysUser.nickName}}</view>
+				<view>{{subjectData.sysUser.userName}}</view>
 			</view>
 			<view class="user-info-box-min">
 				<view>联系电话：</view>
-				<view>{{subjectData.sysUser.phonenumber}}</view>
+				<view>{{subjectData.sysUser.mobile}}</view>
 			</view>
 			<view class="user-info-box-min">
 				<view>学号：</view>
-				<view>{{subjectData.sysUser.userName}}</view>
+				<view>{{subjectData.sysUser.account}}</view>
 			</view>
 			<view class="user-info-box-min">
 				<view>物理卡号：</view>
@@ -38,7 +38,7 @@
 			</view>
 			<view class="user-info-box-min">
 				<view>班级：</view>
-				<view>{{subjectData.sysUser.grade}}</view>
+				<view>{{subjectData.sysUser.gradeName}}</view>
 			</view>
 			<view class="user-info-box-min">
 				<view>导师：</view>
@@ -172,7 +172,7 @@
 				const {
 					data
 				} = await getDetails({
-					id: this.infoData.id
+					id: this.infoData.applyId
 				})
 				if (data.code == 200) {
 					for (let i = 0; i < data.data.listTemp.length; i++) {