heyang

.env.development

@@ -13,13 +13,15 @@ VUE_APP_ENV = 'development'
 # 88服务器
 # VUE_APP_BASE_API = 'http://192.168.1.88/labSystem'
 # 43服务器
- VUE_APP_BASE_API = 'http://192.168.1.43/labSystem'
+# VUE_APP_BASE_API = 'http://192.168.1.43/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/kdwclabSystem/'
+# 化工学院
+VUE_APP_BASE_API = 'http://lab.sxitdlc.com/labSaasSystem/'
 
 
 

.env.production

@@ -17,9 +17,11 @@ VUE_APP_ENV = 'development'
 # 矿大
 # VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
 # 矿大-文昌
- VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
+# VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
 # 矿大-文昌(本地)
 #VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
+# 化工学院
+VUE_APP_BASE_API = 'http://lab.sxitdlc.com/labSaasSystem/'
 
 # ####################视频地址####################
 # 矿大-文昌
@@ -36,9 +38,11 @@ VUE_APP_ENV = 'development'
 #88地址
 #VUE_APP_BASE_MQTT_API = 'ws://192.168.1.43:1884'
 #矿大-文昌
- VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
+# 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_API = 'wss://lab.sxitdlc.com/labSaasMqtt'
 
 VUE_APP_BASE_MQTT_USERNAME = 'mqtt'
 VUE_APP_BASE_MQTT_PASSWORD = 'mqtt@zd1883'
@@ -49,7 +53,9 @@ 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://lab.sxitdlc.com/kdwclabSystem/admin/#/login'
 # 矿大文昌后台地址(内网)
 #VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://192.168.1.248/labSystem/admin/#/login'
+# 化工学院
+VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://192.168.1.248/labSaasSystem/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("/wenchang/api/play/startList",data,'video')
+export const startListDeviceIds = data => get("/labSaas/api/play/startList",data,'video')
 //预案-获取报警详情
 export const abnormalLogOrderByList = data => get("/laboratory/plan/log/abnormalLogOrderByList",data)
 //预案-实验室简要信息

src/utils/request.js

@@ -21,8 +21,8 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-axios.defaults.headers.common["Authorization"] = 'Bearer 96e3ef57-4dcb-4a20-9395-07981c0bd721';//`Bearer ${localStorage.getItem('access_token')`;
-//axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
+//axios.defaults.headers.common["Authorization"] = 'Bearer 25d1c577-816a-478c-95db-7f613920ef37';//`Bearer ${localStorage.getItem('access_token')`;
+axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时
 axios.defaults.timeout = 15000;

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>
@@ -463,6 +463,8 @@ export default {
           if(res.code==200){
             $(".header_l").attr("src",requestUrl+res.data.rectangleLogo);
             localStorage.setItem('logoImg',requestUrl+res.data.rectangleLogo)
+            $(".schoolName").html(res.data.schoolName);
+
           }
       })
       //安全隐患统计
@@ -2030,11 +2032,12 @@ export default {
           animation-iteration-count: infinite; // 动画循环无限次播放
           >li{
             width: rw(966);
-            height: rh(66);
+            height: auto;
             margin: 0 rw(30);
             background: rgba(30, 118, 142, 0.2);
             margin-bottom: rh(12);
             padding-top: rh(12);
+            padding-bottom: rh(12);
             .left_b_b_t{
               display: flex;
               justify-content: flex-start;
@@ -2063,6 +2066,7 @@ export default {
               width: 100%;
               display: flex;
               justify-content: flex-start;
+              flex-wrap: wrap;
               overflow: hidden;
               margin-top: rh(16);
               margin-left: rw(12);
@@ -2072,7 +2076,7 @@ export default {
                 font-family: Source Han Sans CN;
                 font-weight: 400;
                 color: #FFFFFF;
-                line-height:rh(14);
+                line-height:rh(20);
                 margin-right: rw(30);
 
               }

src/views/warningDetail.vue

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