heyang

api/apiDemo/index.js

@@ -1566,7 +1566,7 @@ export const materialUpdate  = (data) => {
 //安全准入详情接口
 export const getDetails = (data) => {
     return apiResquestForm({
-        url: '/laboratory/apply/getDetailsApp',
+        url: '/laboratory/apply/getDetails',
         method: 'GET',
         data: data
     })

api/request/config.js

@@ -11,6 +11,7 @@ const config = {
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
+	// base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
 	// base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
 	// base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	// base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址

pages.json

@@ -625,7 +625,16 @@
 				{
 					"path": "views/laboratory/infoPage",//详情
 					"style": {
-						"navigationBarTitleText": "实验室详情"
+						"navigationBarTitleText": "实验室详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				/* 实验室详情-进出记录 */
+				{
+					"path": "views/laboratory/accessRecord",
+					"style": {
+						"navigationBarTitleText": "进出记录",
+						"enablePullDownRefresh": true
 					}
 				},
 				{

pages/views/login/login.vue

@@ -52,7 +52,7 @@
 			return {
 				identityStatus: 1,
 				// username:"dedsudiyu",//学生
-				username: "dedsudiyu",//教职工
+				username: "888", //教职工
 				password: "zd123456",
 				checkedType: false,
 				loginBanner: uni.getStorageSync('loginBanner'),
@@ -117,7 +117,7 @@
 							uni.redirectTo({
 								url: '/pages/views/saoCode/saoCode',
 							});
-						}else if(uni.getStorageSync('warningId')){
+						} else if (uni.getStorageSync('warningId')) {
 							uni.redirectTo({
 								url: '/pages_basics/views/earlyWarningManage/earlyWarningDetail',
 							});
@@ -143,7 +143,7 @@
 				} = await systemAppletRolePermission();
 				if (data.code == 200) {
 					uni.setStorageSync('permissions', data.data.data)
-					uni.setStorageSync('controlsRestrict', data.data.roleKeys?data.data.roleKeys:[])
+					uni.setStorageSync('controlsRestrict', data.data.roleKeys ? data.data.roleKeys : [])
 				}
 			},
 			switchClick() {
@@ -189,7 +189,7 @@
 				});
 				if (data.code == 200) {
 					let obj = JSON.parse(data.data.configValue)
-					console.log('obj',obj)
+					console.log('obj', obj)
 					//文件预览地址
 					uni.setStorageSync('filePreviewUrl', 'https://' + obj.fileExtranetUrl)
 					//摄像头代理访问地址
@@ -204,6 +204,9 @@
 					uni.setStorageSync('mqttUser', Decrypt(obj.mqttExtranetUser))
 					//MQTT密码
 					uni.setStorageSync('mqttPassword', Decrypt(obj.mqttExtranetPassword))
+					//文件浏览环境
+					uni.setStorageSync('fileBrowseEnvironment','http://'+Decrypt(obj.fileBrowseEnvironment))
+					uni.setStorageSync('fileBrowseEnvironmentExtranet','https://'+Decrypt(obj.fileBrowseEnvironmentExtranet))
 				}
 			},
 			checkboxChange() {

pages/views/mine/mine.vue

@@ -280,7 +280,7 @@
 					uni.removeStorageSync('userId');
 					uni.removeStorageSync('userType');
 					uni.redirectTo({
-						url: '/pages/login/login',
+						url: '/pages/views/login/login',
 					});
 				}
 			},

pages/views/pages_patrolInspector/chemicalCabinetQRcode.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="header_r">
 				<view class="header_r_t">{{infoData.cabinetName}}</view>
-				<view class="header_r_b">规格：2门</view>
+				<view class="header_r_b">规格：{{infoData.cabinetNorms}}门</view>
 			</view>
 		</view>
 		<view  class="basics">

pages/views/pages_patrolInspector/chemicalDetail.vue

@@ -12,7 +12,7 @@
 					<view>{{newData.chemicalLevel==1?'管控':'非管控'}}</view>
 					<view :class="newData.status==0?'color-A':(newData.status==1?'color-B':'color-C')">{{newData.statusTag}}</view>
 				</view>
-				<view class="header-r-b">编号：{{newData.tagCode}}</view>
+				<view class="header-r-b">编码：{{newData.tagCode}}</view>
 				<view class="header-r-b2">余量：{{newData.surplus}}{{newData.specUnit}}</view>
 			</view>
 		</view>
@@ -27,14 +27,14 @@
 				<view class="list-li"><text>CAS：</text><text>{{newData.casNum}}</text></view>
 				<view class="list-li"><text>别名：</text><text>{{newData.anotherName}}</text></view>
 				<view class="list-li"><text>类别：</text><text>{{newData.chemicalCategoryName}}</text></view>
-				<view class="list-li"><text>规格：</text><text>{{newData.specNum}}{{newData.specUnit}}</text></view>
+				<view class="list-li"><text>规格：</text><text>{{newData.specNum}}{{newData.specUnit}}/{{newData.packUnit}}</text></view>
 				<view class="list-li"><text>归属人：</text><text>{{newData.belongName}}</text></view>
 			</view>
 			<view class="list-border">
 				<view class="list-li"><text>学院：</text><text>{{newData.deptName}}</text></view>
 				<view class="list-li"><text>楼栋：</text><text>{{newData.buildName}}-{{newData.floorName}}</text></view>
 				<view class="list-li"><text>实验室：</text><text>{{newData.subName}}({{newData.subRoom}})</text></view>
-				<view class="list-li"><text>存储位置：</text><text>{{newData.cabinetName}}-{{newData.doorName}}-{{newData.layers}}</text></view>
+				<view class="list-li"><text>存储位置：</text><text>{{newData.cabinetName}}-{{newData.doorName}}-{{newData.layers}}层</text></view>
 			</view>
 		</view>
 		<viw class="list-tow" v-if="pageType==1" >
@@ -48,16 +48,17 @@
 				<!-- tagCode 1领用，0是归还，3是空瓶出库-->
 				<view class="list-tow-li-b">
 					<view class="list-tow-li-b-li" v-if="item.tagCode==1 || item.tagCode==3"><text>领用人：</text><text>{{item.userName}}</text></view>
-					<view class="list-tow-li-b-li" v-if="item.tagCode==1 || item.tagCode==3"><text>领用量：</text><text>{{item.collectNowNum}}</text></view>
-					<view class="list-tow-li-b-li"><text>双人认证：</text><text>{{item.doubleAuthen}}</text></view>
+					<view class="list-tow-li-b-li" v-if="item.tagCode==1 || item.tagCode==3"><text>领用量：</text><text>{{item.collectNowNum}}{{item.specUnit}}</text></view>
+					
 					
 					<view class="list-tow-li-b-li" v-if="item.tagCode==0"><text>归还人：</text><text>{{item.userName}}</text></view>
-					<view class="list-tow-li-b-li" v-if="item.tagCode==0 || item.tagCode==3"><text>使用量：</text><text>{{item.useAmount}}</text></view>
-					<view class="list-tow-li-b-li" v-if="item.tagCode==0"><text>余 量：</text><text>{{item.returnStockNum}}</text></view>
+					<view class="list-tow-li-b-li" v-if="item.tagCode==0 || item.tagCode==3"><text>使用量：</text><text>{{item.useAmount}}{{item.specUnit}}</text></view>
+					<view class="list-tow-li-b-li" v-if="item.tagCode==0"><text>余 量：</text><text>{{item.returnStockNum}}{{item.specUnit}}</text></view>
+					<view class="list-tow-li-b-li"><text>双人认证：</text><text>{{item.doubleAuthen}}</text></view>
 				</view>
 			</view>
 		</viw>
-		<view class="tip" v-if="pageType==1 || pageType==2">仅展示最近三个月的申购记录</view>
+		<view class="tip" v-if="pageType==1 || pageType==2">仅展示最近三个月的使用记录</view>
 	</scroll-view>
   </view>
 

pages/views/saoCode/saoCode.vue

@@ -33,6 +33,7 @@
 				list.forEach((item) => {
 					codeData[item.split("=")[0]] = item.split("=")[1];
 				})
+				console.log('二维码',codeData)
 				if (!uni.getStorageSync('token')) {
 					uni.setStorageSync('codeData', codeData);
 					uni.redirectTo({
@@ -80,17 +81,17 @@
 					} else if (codeData.type == 7) {
 						//培训课程
 						uni.redirectTo({
-							url: '/pages/pages_patrolInspector/courseQRcode?code=' + codeData.code,
+							url: '/pages/views/pages_patrolInspector/courseQRcode?code=' + codeData.code,
 						});
 					} else if (codeData.type == 8) {
 						//化学品柜
 						uni.redirectTo({
-							url: '/pages/pages_patrolInspector/chemicalCabinetQRcode?code=' + codeData.code,
+							url: '/pages/views/pages_patrolInspector/chemicalCabinetQRcode?code=' + codeData.code,
 						});
 					} else if (codeData.type == 9) {
 						//化学品
 						uni.redirectTo({
-							url: '/pages/pages_patrolInspector/chemicalDetail?code=' + codeData.code,
+							url: '/pages/views/pages_patrolInspector/chemicalDetail?code=' + codeData.code,
 						});
 					} else if (codeData.type == 1 || codeData.type == 2 || codeData.type == 3) {
 						//1.MSDS说明书			2.安全制度			3.危险源详情

pages_basics/api/index.js

@@ -40,6 +40,14 @@ export const laboratoryAppletSignSubList = (data) => {
 		data: { ...data }
 	})
 };
+//进出记录-头部数据
+export const laboratoryAppletPassOutCount = (data) => {
+	return apiResquest({
+		url: `/laboratory/applet/passOutCount`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
 //进出记录-列表
 export const laboratoryAppletPassOutList = (data) => {
 	return apiResquest({

pages_basics/views/earlyWarningManage/earlyWarningDetail.vue

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

pages_manage/views/laboratory/accessRecord.vue

@@ -8,30 +8,38 @@
 			</view>
 		</view>
 		<view class="list" v-for="(item,index) in dataList" :key="index">
-			<view class="list-t">{{item.time}}</view>
-			<view class="list-b" v-for="(item2,index2) in item.child" :key="index2">
+			<view class="list-t">{{item.showInTime}}</view>
+			<view class="list-b" v-for="(item2,index2) in item.list" :key="index2">
 				<view class="list-b-t">
-					<img :src="item2.avatar">
-					<view>{{item2.name}}</view>
+					<img v-if="item2.avatar" :src="baseUrl+item2.avatar">
+					<img v-else src="@/pages_basics/images/icon_01.png">
+					<view>{{item2.userName}}</view>
 					<view>{{item2.phone}}</view>
-					<view :class="item2.status==0?'color-A':(item2.status==1?'color-B':(item2.status==2?'color-C':''))">
-					{{item2.status==0?'实验中':(item2.status==1?'已离开':(item2.status==2?'未离开考勤违规':''))}}
+					<view
+						:class="item2.accessStatus==1?'color-A':(item2.accessStatus==2?'color-B':(item2.accessStatus==3?'color-C':''))">
+						{{item2.accessStatusStr}}
 					</view>
 				</view>
 				<img class="list-b-img" src="@/pages_manage/images/for_min_bg.png">
 				<view class="list-b-b">
-					<view>签到时间：{{item2.time1}}</view>
-					<view>离开时间：{{item2.time2}}</view>
-					<view>停留时间：{{item2.time3}}</view>
+					<view>签到时间：{{item2.inTime?item2.inTime:'-'}}</view>
+					<view>离开时间：{{item2.outTime?item2.outTime:'-'}}</view>
+					<view>停留时间：{{item2.hoursMinutes?item2.hoursMinutes:'-'}}</view>
 				</view>
-				
+
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {} from '@/pages_manage/api/index.js'
+	import {
+		config
+	} from '@/api/request/config.js'
+	import {
+		laboratoryAppletPassOutList,
+		laboratoryAppletPassOutCount
+	} from '@/pages_basics/api/index.js'
 	export default {
 		name: "accessRecord",
 		props: {
@@ -39,71 +47,107 @@
 		},
 		data() {
 			return {
-				statisticsData:[
-					{name:'当前实验人数',num:'1'},
-					{name:'今日累计人次',num:'23'},
-					{name:'当月累计人次',num:'302'},
-				],
-				newData:{
-					
-				},
-				dataList:[
-					{
-						time:'2023年12月',
-						child:[
-							{
-								avatar:require('@/pages_manage/images/icon_yw_yc.png'),
-								name:'姓名',
-								phone:'123456987',
-								status:0,	
-								time1:'2023-12-14  12:20',	
-								time2:'2023-12-14  14:56',	
-								time3:'2小时26分钟',	
-							}
-						],
-						
+				baseUrl: config.base_url,
+				statisticsData: [{
+						name: '当前实验人数',
+						num: '0'
 					},
 					{
-						time:'2023年12月',
-						child:[
-							{
-								avatar:require('@/pages_manage/images/icon_yw_yc.png'),
-								name:'姓名',
-								phone:'123456987',
-								status:1,	
-								time1:'2023-12-14  12:20',	
-								time2:'2023-12-14  14:56',	
-								time3:'2小时26分钟',	
-							}
-						],
-						
+						name: '今日累计人次',
+						num: '0'
 					},
 					{
-						time:'2023年12月',
-						child:[
-							{
-								avatar:require('@/pages_manage/images/icon_yw_yc.png'),
-								name:'姓名',
-								phone:'123456987',
-								status:2,	
-								time1:'2023-12-14  12:20',	
-								time2:'2023-12-14  14:56',	
-								time3:'2小时26分钟',	
-							}
-						],
-						
-					}
-				]
+						name: '当月累计人次',
+						num: '0'
+					},
+				],
+				newData: {
+
+				},
+				dataList: [],
+				// 查询参数
+				queryParams: {
+					page: 1,
+					pageSize: 10,
+					subId: '',
+				},
+				total: 0,
 			}
 		},
 		created() {
 
+		},
+		beforeMount() {
+			uni.$on('onReachBottom', () => { // 监听上拉加载
+				console.log("到达底部，onReachBottom")
+				this.scrollGet();
+			})
+			uni.$on('onPullDownRefresh', () => { // 监听下拉刷新
+				console.log("进行了上拉刷新，onPullDownRefresh")
+			})
 		},
 		mounted() {
-			
+			this.$set(this.queryParams, 'subId', this.subjectData.subId);
+			this.laboratoryAppletPassOutCount();
+			this.getList();
 		},
 		methods: {
-			
+			//滚动加载事件
+			scrollGet() {
+				if (this.total / this.queryParams.pageSize <= this.queryParams.page) {
+					this.$set(this, 'getDataType', true);
+				} else {
+					this.queryParams.page += 1;
+					this.$nextTick(() => {
+						this.getList();
+					})
+				}
+			},
+			async laboratoryAppletPassOutCount() {
+				let self = this;
+				const {
+					data
+				} = await laboratoryAppletPassOutCount(this.queryParams.subId);
+				if (data.code == 200) {
+					this.statisticsData[0].num = data.data.experimenters
+					this.statisticsData[1].num = data.data.numberPeople
+					this.statisticsData[2].num = data.data.monthNumberPeople
+				}
+
+			},
+			async getList() {
+				let self = this;
+				let obj = JSON.parse(JSON.stringify(this.queryParams));
+				const {
+					data
+				} = await laboratoryAppletPassOutList(obj);
+				if (data.code == 200) {
+					let list = [];
+					if (this.queryParams.page != 1) {
+						list = JSON.parse(JSON.stringify(this.dataList));
+					}
+					data.data.records.forEach((item) => {
+						let num = 0;
+						list.forEach((minItem) => {
+							if (item.showInTime == minItem.showInTime) {
+								num++
+								minItem.list.push(item)
+							}
+						})
+						if (num == 0) {
+							list.push({
+								showInTime: item.showInTime,
+								list: [item]
+							})
+						}
+					})
+					this.$set(this, 'dataList', list);
+					this.$set(this, 'total', data.data.total);
+					if (data.data.total / this.queryParams.pageSize <= this.queryParams.page) {
+						this.$set(this, 'getDataType', true);
+					}
+				}
+			},
 		},
 	}
 </script>
@@ -111,7 +155,8 @@
 <style lang="stylus" scoped>
 	.accessRecord {
 		width: 750rpx;
-		.title{
+
+		.title {
 			width: 750rpx;
 			height: 160rpx;
 			background: #fff;
@@ -119,9 +164,11 @@
 			justify-content: space-between;
 			padding: 0 20rpx;
 			box-sizing: border-box;
-			>view{
+
+			>view {
 				flex: 1;
-				>view:nth-of-type(1){
+
+				>view:nth-of-type(1) {
 					font-family: PingFang SC;
 					font-weight: 500;
 					font-size: 36rpx;
@@ -130,7 +177,8 @@
 					text-align: center;
 					margin: 30rpx 0 34rpx 0;
 				}
-				>view:nth-of-type(2){
+
+				>view:nth-of-type(2) {
 					font-family: PingFang SC;
 					font-weight: 500;
 					font-size: 30rpx;
@@ -140,16 +188,19 @@
 					border-right: 1rpx solid #E0E0E0;
 				}
 			}
-			>view:last-child{
-				>view:nth-of-type(2){
+
+			>view:last-child {
+				>view:nth-of-type(2) {
 					border-right: none;
 				}
 			}
 		}
-		.list{
+
+		.list {
 			padding: 0 20rpx;
 			box-sizing: border-box;
-			.list-t{
+
+			.list-t {
 				height: 80rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
@@ -157,21 +208,26 @@
 				color: #222222;
 				line-height: 80rpx;
 			}
-			.list-b{
-				.list-b-t{
+
+			.list-b {
+				margin-bottom: 20rpx;
+
+				.list-b-t {
 					background: #FFFFFF;
-					border-radius:20rpx 20rpx 0 0;
+					border-radius: 20rpx 20rpx 0 0;
 					display: flex;
 					justify-content: flex-start;
 					align-items: center;
 					padding: 30rpx 26rpx 16rpx 30rpx;
 					box-sizing: border-box;
-					>img{
+
+					>img {
 						width: 70rpx;
 						height: 70rpx;
 						border-radius: 35rpx;
 					}
-					>view:nth-of-type(1){
+
+					>view:nth-of-type(1) {
 						font-family: PingFang SC;
 						font-weight: 500;
 						font-size: 28rpx;
@@ -179,7 +235,8 @@
 						line-height: 30rpx;
 						margin-left: 22rpx;
 					}
-					>view:nth-of-type(2){
+
+					>view:nth-of-type(2) {
 						font-family: PingFang SC;
 						font-weight: 500;
 						font-size: 28rpx;
@@ -187,7 +244,8 @@
 						line-height: 30rpx;
 						margin-left: 44rpx;
 					}
-					>view:nth-of-type(3){
+
+					>view:nth-of-type(3) {
 						font-family: PingFang SC;
 						font-weight: 500;
 						font-size: 28rpx;
@@ -195,31 +253,37 @@
 						flex: 1;
 						text-align: right;
 					}
-					.color-A{
+
+					.color-A {
 						color: #0183FA;
 					}
-					.color-B{
+
+					.color-B {
 						color: #999999;
 					}
-					.color-C{
+
+					.color-C {
 						color: #FFAE00;
 					}
 				}
-				.list-b-img{
+
+				.list-b-img {
 					width: 710rpx;
 					height: 32rpx;
 				}
-				.list-b-b{
+
+				.list-b-b {
 					background: #FFFFFF;
-					border-radius:0 0 20rpx 20rpx;
+					border-radius: 0 0 20rpx 20rpx;
 					padding-top: 32rpx;
 					box-sizing: border-box;
 					overflow: hidden;
-					>view{
-						margin: 0 0 26rpx 20rpx;	
+
+					>view {
+						margin: 0 0 26rpx 20rpx;
 					}
 				}
 			}
 		}
 	}
-</style>
+</style>

pages_manage/views/laboratory/infoPage.vue

@@ -78,9 +78,16 @@
 				},
 				subjectData: null,
 				// 空调弹窗
-				airConditioningData:null,
+				airConditioningData: null,
 			}
 		},
+		// 父页面  
+		onReachBottom() {
+			uni.$emit('onReachBottom') // 设置监听事件
+		},
+		onPullDownRefresh() {
+			uni.$emit('onPullDownRefresh') // 设置监听事件
+		},
 		onLoad(option) {
 			this.$set(this, 'newData', JSON.parse(decodeURIComponent(option.infoData)));
 			this.$set(this, 'subjectData', JSON.parse(decodeURIComponent(option.infoData)));
@@ -119,7 +126,7 @@
 					this.$set(this, 'broadcastPage', false);
 				} else if (type == 'conditioningOpen') {
 					//空调弹窗开启
-					this.$set(this,'airConditioningData',row);
+					this.$set(this, 'airConditioningData', row);
 					this.$set(this, 'conditioningPage', true);
 				} else if (type == 'conditioningClose') {
 					//空调弹窗关闭
@@ -264,4 +271,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages_manage/views/laboratory/iotControl.vue

@@ -14,8 +14,9 @@
 		</view>
 		<view class="sensor">
 			<view v-for="(item,index) in sensorData" :key="index">
-				<img :src="baseUrl+item.icon">
-				<veiw>{{item.deviceName}}: {{item.deviceValue?item.deviceValue:''}}{{item.unit?item.unit:''}}</veiw>
+				<img class="sensor-l" :src="baseUrl+item.icon"/>
+				<veiw class="sensor-r">{{item.deviceName}}:
+					{{item.deviceValue?item.deviceValue:''}}{{item.unit?item.unit:''}}</veiw>
 			</view>
 		</view>
 		<!-- 智能控制 -->
@@ -214,14 +215,14 @@
 					subjectId: this.subId
 				});
 				if (data.code == 200) {
-					data.data.forEach((item)=>{
-						if(item.hardwareTypeKey == 'airConditioner'){
-							if(item.reservedThree.indexOf('-') != -1){
+					data.data.forEach((item) => {
+						if (item.hardwareTypeKey == 'airConditioner') {
+							if (item.reservedThree.indexOf('-') != -1) {
 								let list = item.reservedThree.split('-');
-								item.switchType = list[0]?list[0]:'';
-								item.functionType = list[1]?list[1]:'';
-								item.orderType = list[2]?list[2]:'';
-							}else{
+								item.switchType = list[0] ? list[0] : '';
+								item.functionType = list[1] ? list[1] : '';
+								item.orderType = list[2] ? list[2] : '';
+							} else {
 								item.switchType = '';
 								item.functionType = '';
 								item.orderType = '';
@@ -296,12 +297,12 @@
 							let list = JSON.parse(JSON.stringify(this.labHardwareVOList))
 							list.forEach((item) => {
 								if (item.hardwareNo == data.hardwareNo) {
-									if(item.hardwareTypeKey == 'airConditioner'){
+									if (item.hardwareTypeKey == 'airConditioner') {
 										let list = data.command.split('-');
-										item.switchType = list[0]?list[0]:'';
-										item.functionType = list[1]?list[1]:'';
-										item.orderType = list[2]?list[2]:'';
-									}else{
+										item.switchType = list[0] ? list[0] : '';
+										item.functionType = list[1] ? list[1] : '';
+										item.orderType = list[2] ? list[2] : '';
+									} else {
 										item.operatingState = data.operatingState;
 										item.online = data.online;
 									}
@@ -433,24 +434,31 @@
 			box-sizing: border-box;
 
 			>view {
+				
+				min-height: 66rpx;
+				width: 355rpx;
 				display: flex;
 				justify-content: flex-start;
-				align-items: center;
-				height: 66rpx;
-				width: 355rpx;
-
-				>img {
+				align-content: center;
+				
+				.sensor-l {
+					flex-shrink: 0;
 					width: 42rpx;
 					height: 42rpx;
 					margin-right: 20rpx;
 				}
 
-				>view {
+				.sensor-r {
 					font-family: PingFang SC;
 					font-weight: 500;
 					font-size: 28rpx;
 					color: #222222;
 					line-height: 30rpx;
+					overflow: hidden;
+
+					text-overflow: ellipsis;
+
+					white-space: nowrap;
 				}
 			}
 		}
@@ -504,4 +512,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages_manage/views/laboratory/meLaboratory.vue

@@ -37,7 +37,7 @@
 					<view>{{ item.subName}}</view>
 					<img src="@/pages_manage/images/icon_04.png">
 				</view>
-				<view class="address-box"><span>{{ item.typeName }}</span>{{ item.deptName }}</view>
+				<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>

pages_safetyExamine/views/dangerManage/dangerDetail.vue

@@ -603,7 +603,7 @@
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkRectify/genReport/' + this.infoData.id,
+					url: config.base_url + '/zd-security/checkRectify/genReport/?id='+this.infoData.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},
@@ -649,7 +649,7 @@
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkManage/getRectifyAdviceNote/' + id,
+					url: config.base_url + '/zd-security/checkManage/getRectifyAdviceNote/?checkMangeId='+this.infoData.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},
@@ -695,7 +695,7 @@
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkManage/getRectifyNotification/' + id,
+					url: config.base_url + '/zd-security/checkManage/getRectifyNotification/?checkMangeId='+this.infoData.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},

pages_safetyExamine/views/dangerManage/dangerManage.vue

@@ -564,7 +564,7 @@
 		}
 
 		.list_three {
-			padding: 0 30rpx;
+			padding: 120rpx 30rpx 0;
 			box-sizing: border-box;
 
 			.list_three_li {

pages_safetyExamine/views/examineManage/examineDetail.vue

@@ -384,7 +384,7 @@
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkRectify/genReport/' + this.infoData.id,
+					url: config.base_url + '/zd-security/checkRectify/genReport/?id='+this.infoData.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},
@@ -430,7 +430,7 @@
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkManage/getRectifyAdviceNote/' + id,
+					url: config.base_url + '/zd-security/checkManage/getRectifyAdviceNote/?checkMangeId='+this.infoData.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},
@@ -476,7 +476,7 @@
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkManage/getRectifyNotification/' + id,
+					url: config.base_url + '/zd-security/checkManage/getRectifyNotification/?checkMangeId='+this.infoData.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},

pages_safetyExamine/views/examineManage/examineList.vue

@@ -267,17 +267,17 @@
 						url: '/pages_safetyExamine/views/examineManage/examineAdd'
 					});
 				} else if (doType == 'download') { //整改报告下载rectifyNotice 整改通知(1整改告知书 2整改通知书)
-					this.rectifyReport(row.id)
+					this.rectifyReport(row)
 				}
 
 			},
 			//整改报告
-			rectifyReport(id) {
+			rectifyReport(row) {
 				uni.showLoading({
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkRectify/genReport/' + id,
+					url: config.base_url + '/zd-security/checkRectify/genReport/?id='+row.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},
@@ -318,12 +318,12 @@
 				})
 			},
 			//整改通知书
-			genNotice(id) {
+			genNotice(row) {
 				uni.showLoading({
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkManage/getRectifyAdviceNote/' + id,
+					url: config.base_url + '/zd-security/checkManage/getRectifyAdviceNote/?checkMangeId='+row.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},
@@ -364,12 +364,12 @@
 				})
 			},
 			//整改告知书
-			genReport(id) {
+			genReport(row) {
 				uni.showLoading({
 					title: '下载中'
 				});
 				wx.downloadFile({
-					url: config.base_url + '/zd-security/checkManage/getRectifyNotification/' + id,
+					url: config.base_url + '/zd-security/checkManage/getRectifyNotification/?checkMangeId='+row.id+'&fileUrl='+uni.getStorageSync('fileBrowseEnvironment'),
 					header: {
 						Authorization: uni.getStorageSync('token')
 					},

pages_safetyExamine/views/snapshotManage/snapshotAdd.vue

@@ -58,7 +58,7 @@
 				<view class="popup-for-max-box">
 					<view class="popup-for-null" v-if="!roomList[0]">暂无数据</view>
 					<view class="popup-for-box" v-for="(item,index) in roomList" :key="index">
-						<view class="name-p">{{item.subName}} ({{item.roomNum}})</view>
+						<view class="name-p">{{item.subName}} ({{item.roomNum?item.roomNum:'-'}})</view>
 						<view class="button-p" @click="popupClickItem(item)">确定</view>
 					</view>
 				</view>

pages_student/views/accessApplication/newApplication.vue

@@ -626,7 +626,7 @@
 				const {
 					data
 				} = await laboratoryAppletMaterialApply({
-					subjectId: this.subject.subId
+					subId: this.subject.subId
 				})
 				if (data.code == 200) {
 					if (data.data.sysUser.userType != '2') {