heyang

App.vue

@@ -101,10 +101,10 @@
                     connectTimeout: 5000, // 超时时间
                     reconnectPeriod:5000, // 重连间隔
                     clientId: uni.getStorageSync('token')+'lab/function/data',
-                    username: config.username,
-                    password: config.password,
+                    username: uni.getStorageSync('mqttUrl'),
+                    password: uni.getStorageSync('mqttUrl'),
                 }
-                const connectUrl = config.mqtt_url;
+                const connectUrl = uni.getStorageSync('mqttUrl');
                 // this.client = $mqtt.connect('wxs://' + connectUrl, mqttOptions);
                 this.client = $mqtt.connect('wxs://' + connectUrl, mqttOptions);
                 this.client.on('connect', () => {

api/index.js

@@ -601,7 +601,7 @@ export const gasRecycleList  = (data) => {
 //分级管控未完成工作列表
 export const gradingControl  = (data) => {
     return apiResquest({
-        url: `/app/lab/manage/havingList`,
+        url: `/base/app/lab/manage/havingList`,
         method: 'POST',
         data: {...data}
     })
@@ -617,7 +617,7 @@ export const storageListTaskIndex  = (data) => {
 //完成分级管控工作
 export const gradingControlAdd  = (data) => {
     return apiResquest({
-        url: `/app/lab/manage/finish`,
+        url: `/base/app/lab/manage/finish`,
         method: 'POST',
         data: {...data}
     })
@@ -625,7 +625,7 @@ export const gradingControlAdd  = (data) => {
 //分级管控已完成工作列表
 export const gradingControlFinish  = (data) => {
     return apiResquest({
-        url: `/app/lab/manage/finishList`,
+        url: `/base/app/lab/manage/finishList`,
         method: 'POST',
         data: {...data}
     })
@@ -633,7 +633,7 @@ export const gradingControlFinish  = (data) => {
 //分级管控详细信息
 export const gradingControlDetail  = (data) => {
     return apiResquest({
-        url: `/app/lab/manage/getInfo/`+data,
+        url: `/base/app/lab/manage/getInfo/`+data,
         method: 'GET',
         //data: data,
     })
@@ -659,7 +659,7 @@ export const logout  = (data) => {
 //查询违规记录列表 （用户端）
 export const getViolationList  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/getViolationList`,
+        url: `/base/app/lab/api/getViolationList`,
         method: 'GET',
         data: data,
     })
@@ -668,7 +668,7 @@ export const getViolationList  = (data) => {
 //查询我的违规记录统计（用户端）
 export const myViolationCount  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/myViolationCount`,
+        url: `/base/app/lab/api/myViolationCount`,
         method: 'GET',
         data: data,
     })
@@ -677,7 +677,7 @@ export const myViolationCount  = (data) => {
 //查询安全准入审批记录列表（用户端,管理端）
 export const getApprovalList  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/getApprovalList`,
+        url: `/base/app/lab/api/getApprovalList`,
         method: 'GET',
         data: data,
     })
@@ -686,7 +686,7 @@ export const getApprovalList  = (data) => {
 //获取安全准入审批记录详细信息(用户端)
 export const approvalDetail  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/approvalDetail`,
+        url: `/base/app/lab/api/approvalDetail`,
         method: 'GET',
         data: data,
     })
@@ -694,7 +694,7 @@ export const approvalDetail  = (data) => {
 //查询院系列表
 export const departmentsList  = (data) => {
     return apiResquest({
-        url: `/app/sysuser/api/departments/list`,
+        url: `/base/app/sysuser/api/departments/list`,
         method: 'GET',
         data: data,
     })
@@ -703,7 +703,7 @@ export const departmentsList  = (data) => {
 //根据院系查询楼栋列表
 export const buildingList  = (data) => {
     return apiResquest({
-        url: `/app/sysuser/api/building/list`,
+        url: `/base/app/sysuser/api/building/list`,
         method: 'GET',
         data: data,
     })
@@ -712,7 +712,7 @@ export const buildingList  = (data) => {
 //根据楼栋查询列表
 export const mySecuritySubjectList  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/mySecuritySubjectList`,
+        url: `/base/app/lab/api/mySecuritySubjectList`,
         method: 'GET',
         data: data,
     })
@@ -721,7 +721,7 @@ export const mySecuritySubjectList  = (data) => {
 //查询人脸信息与认证状态
 export const studentinfoFacemy  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/studentinfo/my`,
+        url: `/base/app/lab/api/studentinfo/my`,
         method: 'GET',
     })
 };
@@ -729,7 +729,7 @@ export const studentinfoFacemy  = (data) => {
 //查询实验室下的安全准入资格材料表
 export const subjectMaterialList  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/subjectMaterialList`,
+        url: `/base/app/lab/api/subjectMaterialList`,
         method: 'GET',
         data: data,
     })
@@ -747,7 +747,7 @@ export const upImage  = (data) => {
 //提交准入申请
 export const accessReview  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/accessReview`,
+        url: `/base/app/lab/api/accessReview`,
         method: 'POST',
         data: {...data}
     })
@@ -756,7 +756,7 @@ export const accessReview  = (data) => {
 //统计安全准入审批不同信息(管理端)
 export const getApprovalCount  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/getApprovalCount`,
+        url: `/base/app/lab/api/getApprovalCount`,
         method: 'GET',
         data: data,
     })
@@ -765,7 +765,7 @@ export const getApprovalCount  = (data) => {
 //审核信息详情(管理端)
 export const approvalDetailManage  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/approvalDetail`,
+        url: `/base/app/lab/api/approvalDetail`,
         method: 'GET',
         data: data,
     })
@@ -774,7 +774,7 @@ export const approvalDetailManage  = (data) => {
 //准入信息审核(管理端)
 export const appOperation  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/appOperation`,
+        url: `/base/app/lab/api/appOperation`,
         method: 'PUT',
         data: data,
     })
@@ -783,7 +783,7 @@ export const appOperation  = (data) => {
 //准入信息拒绝(管理端)
 export const failedOperation  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/failedOperation`,
+        url: `/base/app/lab/api/failedOperation`,
         method: 'PUT',
         data: data,
     })
@@ -792,7 +792,7 @@ export const failedOperation  = (data) => {
 //获取证书列表
 export const queryMyCert  = (data) => {
     return apiResquest({
-        url: `/app/exam/exam/queryMyCert`,
+        url: `/base/app/exam/exam/queryMyCert`,
         method: 'POST',
         data: {...data}
     })
@@ -801,7 +801,7 @@ export const queryMyCert  = (data) => {
 //获取考试列表
 export const onlineExamList  = (data) => {
     return apiResquest({
-        url: `/app/exam/onlineExamList`,
+        url: `/base/app/exam/onlineExamList`,
         method: 'GET',
         data: data,
     })
@@ -810,7 +810,7 @@ export const onlineExamList  = (data) => {
 //创建考卷
 export const createPaper  = (examId) => {
     return apiResquest({
-        url: `/app/exam/create-paper/`+examId,
+        url: `/base/app/exam/create-paper/`+examId,
         method: 'POST',
         data: {}
     })
@@ -819,7 +819,7 @@ export const createPaper  = (examId) => {
 //获取答题卡
 export const getPaper  = (id) => {
     return apiResquest({
-        url: `/app/exam/paper/`+id,
+        url: `/base/app/exam/paper/`+id,
         method: 'GET',
     })
 };
@@ -827,7 +827,7 @@ export const getPaper  = (id) => {
 //获取题目
 export const paperDetail  = (data) => {
     return apiResquest({
-        url: `/app/exam/paper/paperDetail/`+data.paperId+`/`+data.quId,
+        url: `/base/app/exam/paper/paperDetail/`+data.paperId+`/`+data.quId,
         method: 'POST',
         data: {}
     })
@@ -836,7 +836,7 @@ export const paperDetail  = (data) => {
 //提交答案
 export const fillAnswer  = (data) => {
     return apiResquest({
-        url: `/app/exam/paper/fillAnswer`,
+        url: `/base/app/exam/paper/fillAnswer`,
         method: 'POST',
         data: {...data}
     })
@@ -845,7 +845,7 @@ export const fillAnswer  = (data) => {
 //提交试卷
 export const handPaper  = (id,data) => {
     return apiResquest({
-        url: `/app/exam/paper/handPaper/`+id,
+        url: `/base/app/exam/paper/handPaper/`+id,
         method: 'POST',
         data: {...data}
     })
@@ -856,7 +856,7 @@ export const handPaper  = (id,data) => {
 //随手拍实验室列表
 export const getSubjectDict  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/getSubjectDict`,
+        url: `/base/app/lab/api/getSubjectDict`,
         method: 'GET',
         data: data,
     })
@@ -865,7 +865,7 @@ export const getSubjectDict  = (data) => {
 //随手拍提交
 export const addPhotoNote  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/addPhotoNote`,
+        url: `/base/app/lab/api/addPhotoNote`,
         method: 'POST',
         data: {...data}
     })
@@ -874,7 +874,7 @@ export const addPhotoNote  = (data) => {
 //消息列表
 export const groupList  = (data) => {
     return apiResquest({
-        url: `/app/message/content/my/group/list`,
+        url: `/base/app/message/content/my/group/list`,
         method: 'GET',
         data: data,
     })
@@ -882,7 +882,7 @@ export const groupList  = (data) => {
 //消息列表
 export const infoTotalCount  = (data) => {
     return apiResquest({
-        url: `/app/message/content/my/group/totalCount`,
+        url: `/base/app/message/content/my/group/totalCount`,
         method: 'GET',
         data: data,
     })
@@ -890,7 +890,7 @@ export const infoTotalCount  = (data) => {
 //未通过消息详情
 export const groupListRead  = (data) => {
     return apiResquest({
-        url: `/app/message/content/my/group/read`,
+        url: `/base/app/message/content/my/group/read`,
         method: 'GET',
         data: data,
     })
@@ -902,7 +902,7 @@ export const groupListRead  = (data) => {
 //消息详情列表
 export const groupIdList  = (id,data) => {
     return apiResquest({
-        url: `/app/message/content/my/`+id+`/group/list`,
+        url: `/base/app/message/content/my/`+id+`/group/list`,
         method: 'GET',
         data: data,
     })
@@ -911,7 +911,7 @@ export const groupIdList  = (id,data) => {
 //消息详情列表
 export const simpleInfo  = (data) => {
     return apiResquest({
-        url: `/app/sysuser/api/my/simple/info`,
+        url: `/base/app/sysuser/api/my/simple/info`,
         method: 'GET',
         data: data,
     })
@@ -920,7 +920,7 @@ export const simpleInfo  = (data) => {
 //查询我的实验室列表
 export const mySubjectList  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/mySubjectList`,
+        url: `/base/app/lab/api/mySubjectList`,
         method: 'GET',
         data: data,
     })
@@ -938,7 +938,7 @@ export const subject_class  = (data) => {
 //获取管理员工作台随手拍数量数据
 export const appReceivePhotoNote  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/appReceivePhotoNote`,
+        url: `/base/app/lab/api/appReceivePhotoNote`,
         method: 'GET',
         data: data,
     })
@@ -947,7 +947,7 @@ export const appReceivePhotoNote  = (data) => {
 //收到随手拍列表
 export const getAppList  = (data) => {
     return apiResquest({
-        url: `/app/lab/api/photonote/getAppList`,
+        url: `/base/app/lab/api/photonote/getAppList`,
         method: 'GET',
         data: data,
     })
@@ -956,7 +956,7 @@ export const getAppList  = (data) => {
 //收到随手拍详情
 export const getPhotonote  = (id) => {
     return apiResquest({
-        url: `/app/lab/api/photonote/`+id,
+        url: `/base/app/lab/api/photonote/`+id,
         method: 'GET',
     })
 };
@@ -964,7 +964,7 @@ export const getPhotonote  = (id) => {
 //确认处理随手拍
 export const editPhotoNote  = (data) => {
     return apiResquestForm({
-        url: `/app/lab/api/editPhotoNote`,
+        url: `/base/app/lab/api/editPhotoNote`,
         method: 'POST',
         data: {...data}
     })
@@ -973,7 +973,7 @@ export const editPhotoNote  = (data) => {
 //成绩查询
 export const getExamList  = (data) => {
     return apiResquestForm({
-        url: `/app/exam/my/exam/list`,
+        url: `/base/app/exam/my/exam/list`,
         method: 'GET',
         data: data,
     })
@@ -1000,7 +1000,7 @@ export const voice  = (id,data) => {
 //获取拍照检查配置
 export const outSubjectPhoto  = (id,data) => {
     return apiResquestForm({
-        url: `/app/lab/api/outSubjectPhoto`,
+        url: `/base/app/lab/api/outSubjectPhoto`,
         method: 'GET',
         data: data,
     })
@@ -1009,7 +1009,7 @@ export const outSubjectPhoto  = (id,data) => {
 //获取拍照检查可选实验室列表
 export const outSubjectList  = () => {
     return apiResquestForm({
-        url: `/app/lab/api/outSubjectList`,
+        url: `/base/app/lab/api/outSubjectList`,
         method: 'GET'
     })
 };
@@ -1018,7 +1018,7 @@ export const outSubjectList  = () => {
 //拍照检查提交
 export const addPhotoInspection = (data) => {
     return apiResquestJsonList({
-        url: `/app/lab/api/addPhotoInspection`,
+        url: `/base/app/lab/api/addPhotoInspection`,
         method: 'POST',
         data: data
     })
@@ -1027,7 +1027,7 @@ export const addPhotoInspection = (data) => {
 //学生卡上传
 export const commitCrad = (data) => {
     return apiResquestJsonList({
-        url: `/app/lab/api/commit/crad`,
+        url: `/base/app/lab/api/commit/crad`,
         method: 'POST',
         data: data
     })
@@ -1045,7 +1045,7 @@ export const mangerControl = (data) => {
 //获取积分列表
 export const listMyApp = (data) => {
     return apiResquestForm({
-        url: `/app/exam/points/record/list/myApp`,
+        url: `/base/app/exam/points/record/list/myApp`,
         method: 'POST',
         data: {...data}
     })
@@ -1054,7 +1054,7 @@ export const listMyApp = (data) => {
 // //获取当前积分
 export const countMyApp = (data) => {
     return apiResquestForm({
-        url: `/app/exam/points/record/count/myApp`,
+        url: `/base/app/exam/points/record/count/myApp`,
         method: 'GET',
         data: data
     })
@@ -1079,7 +1079,7 @@ export const listDepartments = (data) => {
 //获取报警信息列表
 export const getSafeWarnList = (data) => {
     return apiResquestForm({
-        url: '/app/lab/api/getSafeWarnList',
+        url: '/base/app/lab/api/getSafeWarnList',
         method: 'GET',
         data: data
     })
@@ -1088,7 +1088,7 @@ export const getSafeWarnList = (data) => {
 //获取报警信息数量
 export const getSafeWarnCount = (data) => {
     return apiResquestForm({
-        url: '/app/lab/api//getSafeWarnCount',
+        url: '/base/app/lab/api//getSafeWarnCount',
         method: 'GET',
         data: data
     })
@@ -1097,7 +1097,7 @@ export const getSafeWarnCount = (data) => {
 //获取預案列表
 export const getSubByRiskPlan = (data) => {
     return apiResquestForm({
-        url: '/app/lab/api/getSubByRiskPlan',
+        url: '/base/app/lab/api/getSubByRiskPlan',
         method: 'GET',
         data: data
     })
@@ -1106,7 +1106,7 @@ export const getSubByRiskPlan = (data) => {
 //获取实验室列表(新)
 export const laboratoryList = (data) => {
     return apiResquestForm({
-        url: '/app/laboratory/list',
+        url: '/base/app/laboratory/list',
         method: 'GET',
         data: data
     })
@@ -1115,7 +1115,7 @@ export const laboratoryList = (data) => {
 //获取实验室详情
 export const laboratoryInfo = (id) => {
     return apiResquestForm({
-        url: '/app/laboratory/'+id,
+        url: '/base/app/laboratory/'+id,
         method: 'GET'
     })
 };
@@ -1123,14 +1123,14 @@ export const laboratoryInfo = (id) => {
 //获取实验室详情
 export const getSubByRiskPlanDetail = (id) => {
     return apiResquestForm({
-        url: '/app/lab/api/getSubByRiskPlanDetail?id='+id,
+        url: '/base/app/lab/api/getSubByRiskPlanDetail?id='+id,
         method: 'GET'
     })
 };
 //查询用户电子签名
 export const querySignature  = (data) => {
     return apiResquest({
-        url: `/app/sysuser/api/querySignature`,
+        url: `/base/app/sysuser/api/querySignature`,
         method: 'POST',
         data: {...data}
     })
@@ -1138,7 +1138,7 @@ export const querySignature  = (data) => {
 //小程序电子签名抠图生成图片
 export const querygenSign  = (data) => {
     return apiResquest({
-        url: `/app/sysuser/api/genSign`,
+        url: `/base/app/sysuser/api/genSign`,
         method: 'POST',
         data: {...data}
     })
@@ -1146,7 +1146,7 @@ export const querygenSign  = (data) => {
 //小程序用户修改签名
 export const updateSignature  = (data) => {
     return apiResquest({
-        url: `/app/sysuser/api/updateSignature`,
+        url: `/base/app/sysuser/api/updateSignature`,
         method: 'POST',
         data: {...data}
     })
@@ -1343,7 +1343,7 @@ export const checkSign = (data) => {
 //问题整改重大项-判断是否上传电子签章
 export const queryDeptSignByUserId = (data) => {
     return apiResquestForm({
-        url: '/app/sysuser/api/queryDeptSignByUserId ',
+        url: '/base/app/sysuser/api/queryDeptSignByUserId ',
         method: 'GET',
     })
 };
@@ -1392,7 +1392,7 @@ export function editListUpdate(data) {
 //获取自身随手拍权限接口
 export function myIsadmin(data) {
     return apiResquestForm({
-        url:'/app/lab/api/my/isadmin',
+        url:'/base/app/lab/api/my/isadmin',
         method: 'GET',
         data: data
     })
@@ -1656,6 +1656,15 @@ export const getLogoInfo  = (data) => {
     })
 };
 
+// 查询开发配置
+export function getUrlConfig(data) {
+  return apiResquest({
+    url: '/system/urlConfig',
+    method: 'get',
+    data: data,
+  })
+}
+
 //结束预案
 export const closeRiskPlan  = (data) => {
     return apiResquest({

api/request/config.js

@@ -1,14 +1,14 @@
 const config = {
-	base_url: 'http://192.168.1.9:8080',//柴
+	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//周攀
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
-    // base_url: 'http://192.168.1.43:9800',//43服务器
+     //base_url: 'http://192.168.1.43:9800',//43服务器
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
+	 base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
     //base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
@@ -19,12 +19,12 @@ const config = {
 	video_url:'https://lab.sxitdlc.com',
 
 	//MQTT
-	// mqtt_url :'192.168.1.43:1883', //43MQTT
+	//mqtt_url :'192.168.1.43:1883', //43MQTT
 	// mqtt_url: 'lab.sxitdlc.com/nhmqtt', //矿大MQTT
 	// mqtt_url: 'lab.sxitdlc.com/jdmqtt', //交大MQTT
-	//mqtt_url:'ws://192.168.1.43:1884',
+	   mqtt_url:'192.168.1.43:1883',
 	// mqtt_url: 'lab.sxitdlc.com/jndxmqtt', //暨大MQTT
-	 mqtt_url: 'lab.sxitdlc.com/kdwcmqtt',  //矿大文昌MQTT
+	 //mqtt_url: 'lab.sxitdlc.com/kdwcmqtt',  //矿大文昌MQTT
     username: 'mqtt',
     password: 'mqtt@zd1883',
 }

api/request/request.js

@@ -14,7 +14,7 @@ export const apiResquest = (prams) => {
             url = url.slice(0, -1);
             prams.data = {};
         }
-		
+
 		return uni.request({
 			url: url,
 			data: {
@@ -223,7 +223,7 @@ export const apiResquestJsonList = (prams) => {
 }
 export const apiResquestFormVideo = (prams) => {
     return new Promise((resolve, reject) => {
-        let url = config.video_url + prams.url;
+        let url = uni.getStorageSync('cameraExtranetAgent') + prams.url;
         uni.showLoading({
             title: '加载中',
             mask: true
@@ -293,4 +293,4 @@ export const apiResquestFormVideo = (prams) => {
             }
         });
     })
-}
+}

pages/alarmInfo/alarmInfoMonitor.vue

@@ -20,7 +20,7 @@
 			</view>
 		</view>
 	</view>
-	
+
 </template>
 
 <script>
@@ -32,7 +32,7 @@
 				videoCover:uni.getStorageSync('videoCover'),
 				currentTab: 0,
 				form:{
-				
+
 				},
 				urlList:[],
 				barNameList:[
@@ -55,14 +55,14 @@
 						name:'实验室监控1',
 					},
 				],
-				
+
             }
         },
         onLoad(option) {
 			this.jinanGetStartList();
         },
         onShow(){
-			
+
         },
 		methods:{
 			//点击tab切换
@@ -78,7 +78,7 @@
 				// 	  _this.jinanGetStartList(_this.hardwareNUM[index])
 				// 	}
 				// })
-				
+
 			},
 			//查询摄像头地址(交大)
 			async jinanGetStartList(deviceIds){
@@ -92,7 +92,7 @@
 			  if(data.code == 200){
 				let list = [];
 				for(let i=0;i<data.data.length;i++){
-				  let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
+				  let text = uni.getStorageSync('cameraUrl');
 				  let url = data.data[i].result.body.data.hls;
 				  url = url.split("rtp/");
 				  let newUrl = text+'rtp/'+url[1];
@@ -107,7 +107,7 @@
 			  }
 			},
 		},
-	
+
 	}
 </script>
 
@@ -128,7 +128,7 @@
 					width: 100%;
 					white-space: nowrap;
 					border-bottom: 1px solid #e0e0e0;
-			 
+
 					& view {
 						white-space: normal;
 						display: inline-block;
@@ -143,7 +143,7 @@
 					& view:first-child:before {
 						display: none;
 					}
-			 
+
 					.select {
 						font-size: 28rpx;
 						font-family: PingFang SC;
@@ -151,7 +151,7 @@
 						color: #0183FA;
 						line-height: 60rpx;
 					}
-			 
+
 					.select1 {
 						color: #333333;
 					}
@@ -167,7 +167,7 @@
 				}
 			}
 		}
-	}	
+	}
 	/deep/.input-value-border{
 		display :none !important;
 	}

pages/emergencyEvacuationBig.vue

@@ -448,7 +448,7 @@
 				if(data.code == 200){
                     let list = [];
                     for(let i=0;i<data.data.length;i++){
-                         let text = 'https://lab.sxitdlc.com/wenchang/stream/';
+                        let text = uni.getStorageSync('cameraUrl');
                         let url = data.data[i].result.body.data.hls;
                         url = url.split("rtp/");
                         let newUrl = text+'rtp/'+url[1];

pages/emergencyEvacuationBig/emergencyEvacuationBig.vue

@@ -305,7 +305,7 @@
 			},
 			//获取实验室摄像头
 			async laboratoryInfo(){
-				
+
 			  let _this = this;
 			  const {data} = await laboratoryInfo(_this.itemData.subjectId);
 			  if(data.code == 200){
@@ -316,9 +316,9 @@
 						 _this.videoHardwareNUM.push(item.hardwareNUM)
 					 }
 				 })
-				 
+
 				 this.getCameraByFloor();
-			 
+
 			  }
 			},
 			//获取楼层摄像头列表
@@ -338,8 +338,8 @@
 							}
 						}
 						console.log(list)
-					
-					
+
+
 						this.nanhuGetStartList(list);
 					}
 				}
@@ -360,7 +360,7 @@
 				if(data.code == 200){
                     let list = [];
                     for(let i=0;i<data.data.length;i++){
-                         let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
+                         let text = uni.getStorageSync('cameraUrl');
                         let url = data.data[i].result.body.data.hls;
                         url = url.split("rtp/");
                         let newUrl = text+'rtp/'+url[1];

pages/emergencyEvacuationBig/emergencyEvacuationBigOne.vue

@@ -448,7 +448,7 @@
 				if(data.code == 200){
                     let list = [];
                     for(let i=0;i<data.data.length;i++){
-                         let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
+                         let text = uni.getStorageSync('cameraUrl');
                         let url = data.data[i].result.body.data.hls;
                         url = url.split("rtp/");
                         let newUrl = text+'rtp/'+url[1];

pages/login.vue

@@ -35,7 +35,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { login,getLogoInfo,getDemoInfoList,getOpenId} from '@/api/index.js'
+import { login,getLogoInfo,getDemoInfoList,getOpenId,getUrlConfig} from '@/api/index.js'
 export default {
   data() {
     return {
@@ -63,6 +63,7 @@ export default {
   },
   onShow(){
     this.getLogoInfo();
+    this.getUrlConfig();
 
   },
   methods: {
@@ -94,6 +95,26 @@ export default {
         uni.setStorageSync('videoCover',config.base_url + data.data.videoCover)
       }
     },
+	async getUrlConfig(){
+	  const {data} = await getUrlConfig();
+	  if(data.code == 200){
+	      //文件预览地址
+	      uni.setStorageSync('filePreviewUrl','https://'+data.data.fileExtranetUrl)
+	      //摄像头代理访问地址
+	      uni.setStorageSync('cameraExtranetAgent','https://'+data.data.cameraExtranetAgent)
+	      //摄像头地址ip段
+	      uni.setStorageSync('cameraIntranetAgent',data.data.cameraIntranetAgent)
+	      //摄像头访问地址
+	      uni.setStorageSync('cameraUrl','https://'+data.data.cameraExtranetUrl)
+	      //MQTT地址
+	      uni.setStorageSync('mqttUrl',data.data.mqttExtranetUrl)
+	      //MQTT账号
+	      uni.setStorageSync('mqttUser',data.data.mqttExtranetUser)
+	      //MQTT密码
+	      uni.setStorageSync('mqttPassword',data.data.mqttExtranetPassword)
+
+	  }
+	},
     checkboxChange() {
       this.checkedType = !this.checkedType;
     },

pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -358,11 +358,11 @@ export default {
         connectTimeout: 5000, // 超时时间
         reconnectPeriod:5000, // 重连间隔
         clientId: 'lab/function/data',
-        username: config.username,
-        password: config.password,
+        username: uni.getStorageSync('mqttUser'),
+        password: uni.getStorageSync('mqttPassword'),
       }
 
-      const connectUrl = config.mqtt_url;
+      const connectUrl = uni.getStorageSync('mqttUrl');
       this.client = $mqtt.connect('wxs://' + connectUrl, mqttOptions);
       this.client.on('connect', () => {
         // 这是为了给自己发条消息，其它无作用

pages_manage/workbench/laboratory/monitor.vue

@@ -363,7 +363,7 @@ export default {
       if(data.code == 200){
         let list = [];
         for(let i=0;i<data.data.length;i++){
-          let text = 'https://lab.sxitdlc.com/wenchang/stream/';
+          let text = uni.getStorageSync('cameraUrl');
           let url = data.data[i].result.body.data.hls;
           url = url.split("rtp/");
           let newUrl = text+'rtp/'+url[1];