heyang

.env.development

@@ -7,47 +7,21 @@ VUE_APP_ENV = 'development'
 
 # ####################接口配置####################
 # 韩
-# VUE_APP_BASE_API =  'http://192.168.1.20:8080'
+# VUE_APP_BASE_API =  '192.168.1.20:8080'
 # 飞
-#VUE_APP_BASE_API =  'http://192.168.1.17:8080'
+#VUE_APP_BASE_API =  '192.168.1.17:8080'
 # 88服务器
-# VUE_APP_BASE_API = 'http://192.168.1.88/labSystem'
+# VUE_APP_BASE_API = '192.168.1.88/labSystem'
+# 43服务器
+ VUE_APP_BASE_API = '192.168.1.43/labSystem/'
 # 柴
-# VUE_APP_BASE_API = 'http://192.168.1.9:8080'
+# VUE_APP_BASE_API = '192.168.1.9:8080'
 # 暨大
-# VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
+# VUE_APP_BASE_API = 'lab.sxitdlc.com/jndxlabSystem/'
 # 矿大-文昌
-VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
+#VUE_APP_BASE_API = 'lab.sxitdlc.com/kdwclabSystem/'
 
 
 
 
-# 视频地址
-
-VUE_APP_BASE_VIDEO_API = 'http://lab.sxitdlc.com'
-
-
-# ####################MQTT配置####################
-
-
-# MQTT地址
-#VUE_APP_BASE_MQTT_API = 'ws://192.168.1.43:1884'
-# 暨大MQTT地址
-#VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
-# VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
-#矿大-文昌
-VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
-VUE_APP_BASE_MQTT_USERNAME = 'mqtt'
-VUE_APP_BASE_MQTT_PASSWORD = 'mqtt@zd1883'
-
-
-
-
-# #####################后台跳转地址#####################
-
-# 暨大后台地址
-# VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/admin/#/login'
-
-# 矿大文昌后台地址
-VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://https://lab.sxitdlc.com/kdwclabSystem/admin/#/login'
 

.env.production

@@ -23,35 +23,4 @@ VUE_APP_ENV = 'development'
 # 矿大-文昌(本地)
 VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
 
-# ####################视频地址####################
-# 矿大-文昌
-# VUE_APP_BASE_VIDEO_API = 'http://lab.sxitdlc.com'
-
-# 矿大-文昌(本地)
-VUE_APP_BASE_VIDEO_API = 'http://192.168.1.248/labSystem'
-
-# ####################MQTT配置####################
-
-# 暨大MQTT地址
-# VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
-# VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
-
-#矿大-文昌
-# VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
-
-# 矿大-文昌(本地)
-VUE_APP_BASE_MQTT_API = 'ws://192.168.1.248:1884'
-
-VUE_APP_BASE_MQTT_USERNAME = 'mqtt'
-VUE_APP_BASE_MQTT_PASSWORD = 'mqtt@zd1883'
-
-# #####################后台跳转地址#####################
-
-# 暨大后台地址
-# VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/admin/#/login'
-
-# 矿大文昌后台地址
-# VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/admin/#/login'
-# 矿大文昌后台地址(内网)
-VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://192.168.1.248/labSystem/admin/#/login'
 

src/api/http.js

@@ -88,7 +88,7 @@ export const mangerControl = data => post("/laboratory/subject/manger/control/"+
 //预案- 获取开关状态
 export const controllerList = data => get("/laboratory/onemachine/"+data+'/controller/list',)
 //预案-获取摄像头列表
-export const startListDeviceIds = data => get("/jinandaxue/api/play/startList",data,'video')
+export const startListDeviceIds = data => get("/algorithm/api/play/startList",data,'video')
 //预案-获取报警详情
 export const abnormalLogOrderByList = data => get("/laboratory/plan/log/abnormalLogOrderByList",data)
 //预案-实验室简要信息
@@ -98,6 +98,12 @@ export const bigviewFunctionList = data => get("/laboratory/onemachine/"+data+'/
 //预案-传感器信息
 export const bigviewWarnMessage = data => get("/laboratory/bigview/"+data+'/warn/message',)
 
+
+//查询开发配置
+export const getUrlConfig = data => get("/system/urlConfig",data)
+
+
+
 //验证验证码
 export const verifyCaptcha = data => post("/captcha/verify",data)
 

src/assets/styles/publicEle.css

@@ -1,4 +1,7 @@
 @charset "UTF-8";
+.el-picker-panel__icon-btn {
+  color: #fff !important; }
+
 .el-table__empty-text {
   color: rgba(0, 0, 0, 0);
   width: 100%;

src/utils/request.js

@@ -1,18 +1,20 @@
 import axios from "axios";
 import qs from "qs";
 
-axios.defaults.baseURL = process.env.VUE_APP_BASE_API //测试
+axios.defaults.baseURL = window.location.href.split('://')[0]+'://' +process.env.VUE_APP_BASE_API //测试
 
+//获取后台浏览器跳转过来的地址携带的token
 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";
 
@@ -21,8 +23,8 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-// axios.defaults.headers.common["Authorization"] = 'Bearer c104a214-2655-4a2e-9230-78e9d8c778e1';//`Bearer ${localStorage.getItem('access_token')`;
-axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
+ axios.defaults.headers.common["Authorization"] = 'Bearer e7e987c5-cf98-46bf-936e-70f0de7c9db5';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时
 axios.defaults.timeout = 15000;
@@ -78,9 +80,9 @@ export default {
 
     get(url, data,type) {
         if(type=='video'){
-            axios.defaults.baseURL = process.env.VUE_APP_BASE_VIDEO_API
+            axios.defaults.baseURL =localStorage.getItem('cameraExtranetAgent')
         }else{
-            axios.defaults.baseURL = process.env.VUE_APP_BASE_API
+            axios.defaults.baseURL = window.location.href.split('://')[0]+'://' +process.env.VUE_APP_BASE_API
         }
         return new Promise((resolve, reject) => {
 
@@ -98,5 +100,5 @@ export default {
         })
     },
 
-    baseUrl: process.env.VUE_APP_BASE_API
+    baseUrl: window.location.href.split('://')[0]+'://' +process.env.VUE_APP_BASE_API
 };

src/views/home.vue

@@ -6,7 +6,7 @@
       <div class="header_c">实验室安全智能监测与控制系统</div>
       <div class="header_r1">
         <img class="header_r1_l" src="@/assets/image/index_icon3.png"/>
-        <i>安全学院</i>
+        <i class="schoolName">****</i>
         <img class="header_r1_r" src="@/assets/image/index_icon4.png" @click="openBackManageUrl()"/>
       </div>
     </div>
@@ -298,6 +298,7 @@ import {
   optionCharts,
   queryHazardColumnar,
   workInfo,
+  getUrlConfig,
   requestUrl, getTypeCount, getFiedCount
 } from "../api/http"
 import Swiper from 'swiper'
@@ -425,14 +426,14 @@ export default {
     },
     //跳转后台管理
     openBackManageUrl(){
-      window.location.href = process.env.VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API
+      window.location.href = localStorage.getItem('pcVisitUrl')
     },
     //MQTT订阅
     subscriptionMQTT(){
       let _this = this;
-      this.client = mqtt.connect(process.env.VUE_APP_BASE_MQTT_API, {
-        username: process.env.VUE_APP_BASE_MQTT_USERNAME,
-        password: process.env.VUE_APP_BASE_MQTT_PASSWORD
+      this.client = mqtt.connect(localStorage.getItem('mqttUrl'), {
+        username: localStorage.getItem('mqttUser'),
+        password:localStorage.getItem('mqttPassword')
       });
       this.client.on("connect", e =>{
         console.log("连接成功",e);
@@ -456,15 +457,68 @@ export default {
         }
       });
     },
+
     getAjaxData: function () {
       let _this = this;
       //获取logo图片
       getLogoInfo({}).then((res) =>{
           if(res.code==200){
             $(".header_l").attr("src",requestUrl+res.data.rectangleLogo);
+            $(".schoolName").html(res.data.schoolName);
+
             localStorage.setItem('logoImg',requestUrl+res.data.rectangleLogo)
           }
       })
+      getUrlConfig().then(response => {
+        console.log('开发配置',response.data)
+        //判定http或者https
+        let urlText = window.location.href.split('://')[0]+'://';
+        if(urlText=='https://'){
+          //文件预览地址
+          localStorage.setItem('filePreviewUrl',urlText+response.data.fileExtranetUrl)
+          //摄像头代理访问地址
+          localStorage.setItem('cameraExtranetAgent',urlText+response.data.cameraExtranetAgent)
+          //摄像头地址ip段
+          localStorage.setItem('ipIdentify',response.data.ipIdentify)
+          //摄像头访问地址
+          localStorage.setItem('cameraUrl','wss://'+response.data.cameraExtranetUrl)
+          //MQTT地址
+          localStorage.setItem('mqttUrl','wss://'+response.data.mqttExtranetUrl)
+          //MQTT账号
+          localStorage.setItem('mqttUser',response.data.mqttExtranetUser)
+          //MQTT密码
+          localStorage.setItem('mqttPassword',response.data.mqttExtranetPassword)
+          //可视化大屏访问地址
+          localStorage.setItem('screenUrl',urlText+response.data.screenExtranetUrl)
+          //后台访问地址
+          localStorage.setItem('pcVisitUrl',urlText+response.data.pcExtranetUrl)
+        }else if(urlText=='http://'){
+          //文件预览地址
+          localStorage.setItem('filePreviewUrl',urlText+response.data.fileIntranetUrl)
+          //摄像头代理访问地址
+          localStorage.setItem('cameraExtranetAgent',urlText+response.data.cameraIntranetAgent)
+          //摄像头地址ip段
+          localStorage.setItem('ipIdentify',response.data.ipIdentify)
+          //摄像头访问地址
+          localStorage.setItem('cameraUrl','wss://'+response.data.cameraIntranetUrl)
+          //MQTT地址
+          localStorage.setItem('mqttUrl','ws://'+response.data.mqttIntranetUrl)
+          //MQTT账号
+          localStorage.setItem('mqttUser',response.data.mqttIntranetUser)
+          //MQTT密码
+          localStorage.setItem('mqttPassword',response.data.mqttIntranetPassword)
+          //可视化大屏访问地址
+          localStorage.setItem('screenUrl',urlText+response.data.screenIntranetUrl)
+          //后台访问地址
+          localStorage.setItem('pcVisitUrl',urlText+response.data.pcIntranetUrl)
+        }
+
+
+
+      });
+
+
+
       //安全隐患统计
       optionCharts({type:localStorage.getItem('deptLevel')}).then((res) =>{
         if(res.code==200){

src/views/warningDetail.vue

@@ -228,23 +228,9 @@ export default {
       startListDeviceIds(obj).then((res) =>{
         if(res.code==200){
           let data=res
-          // for(let i=0;i<data.data.length;i++){
-          //   let list = {
-          //     divId:'divId'+i,
-          //     hasAudio:false,
-          //     height:false,
-          //     videoError:"",
-          //     videoUrl:data.data[i].result.body.data.flv,
-          //   }
-          //   _this.videoList.push(list)
-          //   _this.$forceUpdate();
-          //   setTimeout(function(){
-          //     _this.leftVideoFunction();
-          //   },2000);
-          // }
           let list = [];
           for(let i=0;i<data.data.length;i++){
-            let text = 'http://lab.sxitdlc.com/jinandaxue/stream/';
+            let text = localStorage.getItem('cameraUrl');
             let url = data.data[i].result.body.data.fmp4;
             url = url.split("rtp/");
             let newUrl = text+'rtp/'+url[1];