dedsudiyu 2 年之前
父节点
当前提交
aa24b0cd00
共有 5 个文件被更改,包括 14 次插入19 次删除
  1. 3 3
      .env.development
  2. 1 1
      .env.production
  3. 9 0
      src/utils/request.js
  4. 0 14
      src/views/home.vue
  5. 1 1
      src/views/warningDetail.vue

+ 3 - 3
.env.development

@@ -11,11 +11,11 @@ VUE_APP_ENV = 'development'
 # 飞
 #VUE_APP_BASE_API =  'http://192.168.1.17:8080'
 # 88服务器
-#VUE_APP_BASE_API = 'http://192.168.1.88/labSystem'
+VUE_APP_BASE_API = 'http://192.168.1.88/labSystem'
 # 柴
 # VUE_APP_BASE_API = 'http://192.168.1.9:8080'
 # 暨大
-VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
+# VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
 # 矿大-文昌
 #VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
 
@@ -24,7 +24,7 @@ VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
 
 # 视频地址
 
-VUE_APP_BASE_VIDEO_API = 'https://lab.sxitdlc.com'
+VUE_APP_BASE_VIDEO_API = 'http://lab.sxitdlc.com'
 
 
 # ####################MQTT配置####################

+ 1 - 1
.env.production

@@ -21,7 +21,7 @@ VUE_APP_BASE_API = 'http://192.168.1.88/labSystem'
 
 # 视频地址
 
-VUE_APP_BASE_VIDEO_API = 'https://lab.sxitdlc.com'
+VUE_APP_BASE_VIDEO_API = 'http://lab.sxitdlc.com'
 #VUE_APP_BASE_VIDEO_API = 'http://192.168.8.3/labSystem/'
 
 

+ 9 - 0
src/utils/request.js

@@ -3,6 +3,15 @@ import qs from "qs";
 
 axios.defaults.baseURL = process.env.VUE_APP_BASE_API //测试
 
+let afterUrl = window.location.search.substring(1);
+console.log("afterUrl",afterUrl)
+let identity = afterUrl.substr(9, afterUrl.length);
+console.log("identity",identity)
+if(identity.length>0){
+    //Authorization
+    localStorage.setItem('Authorization',identity)
+    localStorage.setItem('deptLevel','2')////这个是登陆后,刘波给你的院校的类型
+}
 
 //post请求头
 axios.defaults.headers.post["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8";

+ 0 - 14
src/views/home.vue

@@ -1291,20 +1291,6 @@ export default {
       },1000*6);
     },
   },
-  beforeMount:function(){
-
-    //获取到页面传过来的值
-      var afterUrl = window.location.search.substring(1);
-     var identity = afterUrl.substr(9, afterUrl.length);
-
-
-
-      if(identity.length>0){
-       //Authorization
-        localStorage.setItem('Authorization',identity)
-        localStorage.setItem('deptLevel','2')////这个是登陆后,刘波给你的院校的类型
-      }
-  },
   mounted: function () {
 
 

+ 1 - 1
src/views/warningDetail.vue

@@ -244,7 +244,7 @@ export default {
           // }
           let list = [];
           for(let i=0;i<data.data.length;i++){
-            let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
+            let text = 'http://lab.sxitdlc.com/jinandaxue/stream/';
             let url = data.data[i].result.body.data.fmp4;
             url = url.split("rtp/");
             let newUrl = text+'rtp/'+url[1];