zc

api/request/config.js

@@ -1,6 +1,7 @@
 const config = {
 	/************************************ 后台服务地址 ************************************/
 	
+	base_url: 'http://10.103.75.81/api', //43服务器
 	// base_url: 'http://192.168.1.43/api', //43服务器
 	// base_url: 'http://192.168.1.8/api',//1.8服务器
 	// base_url: 'http://192.168.1.88/labSystem',//1.88服务器
@@ -16,7 +17,7 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
 	// base_url: 'https://lab.zjznai.com/labapp/',//43服务器线上
-	base_url: 'http://lasfl.sxau.edu.cn/api',//88服务器线上
+	// base_url: 'http://lasfl.sxau.edu.cn/api',//88服务器线上
 	// base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
 	// base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
@@ -33,7 +34,7 @@ const config = {
 	imagesUrl: 'https://zj-wechat.oss-cn-beijing.aliyuncs.com/xcx_images/xcx_v3/',
 	/************************************ 扫一扫 ************************************/
 	//1.MSDS说明书			2.安全制度			3.危险源详情 地址配置 
-	saoCodeTypeUrl: 'http://192.168.1.88/labSystem/admin/#/codeHtml?',
+	saoCodeTypeUrl: 'http://10.103.75.81/#/codeHtml?',
 	/************************************ 校级管理员身份ID ************************************/
   schoolId:'1954794346556477442',
 	/************************************ 院级管理员身份ID ************************************/

pages/views/teacherPage/teacherHome.vue

@@ -59,7 +59,7 @@
 				<img class="home-button-img" :src="imagesUrl('home/icon_sy_aqzr@1x.png')"/>
 				<view class="home-button-name" style="color: #ff8c00;">安全准入</view>
 				<view class="home-button-text">实验室安全准入审核</view>
-				<view class="home-button-mark" v-if="admittanceHint"></view>
+				<!-- <view class="home-button-mark" v-if="admittanceHint"></view> -->
 			</view>
 			<view class="home-button-box-1" style="background-color: #FFE4E1;"
 				@click="goPage('emergencyDisposal')">
@@ -211,7 +211,7 @@
 				rectangleLogo: uni.getStorageSync('rectangleLogo'),
 				identityData:uni.getStorageSync('identityData'),
 				// 准入红点
-				admittanceHint:false,
+				// admittanceHint:false,
 			}
 		},
 		created() {
@@ -225,7 +225,7 @@
 		},
 		mounted() {
 				this.systemUserProfile();
-				this.laboratoryAppletCheckApplyPending();
+				// this.laboratoryAppletCheckApplyPending();
 		},
 		methods: {
 			//查询安全准入是否有-待审核

pages/views/videoPlayer.vue

@@ -15,10 +15,15 @@
 		onLoad(option) {
 			let obj = JSON.parse(decodeURIComponent(option.item))
 			let url = '';
+			// if(obj.type == 4){
+			// 	url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&mpegts=true&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+			// }else if(obj.type == 5){
+			// 	url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&mpegts=true&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+			// }
 			if(obj.type == 4){
-				url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&mpegts=true&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+				url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 			}else if(obj.type == 5){
-				url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&mpegts=true&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+				url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 			}
 			this.$set(this,'webViewUrl',url);
 			this.$set(this,'pageType',true);

pages_manage/views/laboratory/videoPlayer.vue

@@ -17,10 +17,15 @@
 					let obj = JSON.parse(decodeURIComponent(option.item))
 					console.log('obj',obj)
 					let url = '';
+					// if(obj.type == 4){
+					// 	url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&mpegts=true&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+					// }else if(obj.type == 5){
+					// 	url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&mpegts=true&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+					// }
 					if(obj.type == 4){
-						url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&mpegts=true&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+						url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 					}else if(obj.type == 5){
-						url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&mpegts=true&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+						url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 					}
 					this.$set(this,'webViewUrl',url);
 					this.$set(this,'pageType',true);