zhouchong 2 jaren geleden
bovenliggende
commit
fa5a1673b8
5 gewijzigde bestanden met toevoegingen van 13187 en 186 verwijderingen
  1. 9 6
      .env.development
  2. 26 20
      .env.production
  3. 13146 155
      package-lock.json
  4. 2 2
      src/utils/request.js
  5. 4 3
      src/views/home.vue

+ 9 - 6
.env.development

@@ -7,17 +7,17 @@ VUE_APP_ENV = 'development'
 
 # ####################接口配置####################
 # 韩
-#VUE_APP_BASE_API =  'http://192.168.1.20:8080'
+# VUE_APP_BASE_API =  'http://192.168.1.20:8080'
 # 飞
 #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/kdwclabSystem/'
+VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
 
 
 
@@ -34,9 +34,9 @@ VUE_APP_BASE_VIDEO_API = 'http://lab.sxitdlc.com'
 #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/jndxmqtt'
 #矿大-文昌
-#VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
+VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
 VUE_APP_BASE_MQTT_USERNAME = 'mqtt'
 VUE_APP_BASE_MQTT_PASSWORD = 'mqtt@zd1883'
 
@@ -46,5 +46,8 @@ 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/jndxlabSystem/admin/#/login'
+
+# 矿大文昌后台地址
+VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://https://lab.sxitdlc.com/kdwclabSystem/admin/#/login'
 

+ 26 - 20
.env.production

@@ -8,44 +8,50 @@ VUE_APP_ENV = 'development'
 # ####################接口配置####################
 
 # 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://192.168.1.9:8080'
 # 暨大
-#VUE_APP_BASE_API = 'http://192.168.8.3/labSystem/'
-#VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
+# VUE_APP_BASE_API = 'http://192.168.8.3/labSystem/'
+# VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
 # 矿大
-#VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
+# VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
+
 # 矿大-文昌
 # VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
 
-# 视频地址
+# 矿大-文昌(本地)
+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.8.3/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.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 = 'ws://192.168.1.248:1884'
+# 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 = '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/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'
 

File diff suppressed because it is too large
+ 13146 - 155
package-lock.json


+ 2 - 2
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 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 c104a214-2655-4a2e-9230-78e9d8c778e1';//`Bearer ${localStorage.getItem('access_token')`;
+axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时
 axios.defaults.timeout = 15000;

+ 4 - 3
src/views/home.vue

@@ -2,11 +2,11 @@
   <div class="main">
     <img class="bg_img" src="@/assets/image/bg.png"/>
     <div class="header">
-      <img class="header_l" src="@/assets/image/index_zw.png" />
+      <img class="header_l" src="" />
       <div class="header_c">实验室安全智能监测与控制系统</div>
       <div class="header_r1">
         <img class="header_r1_l" src="@/assets/image/index_icon3.png"/>
-        <i>环境与气候研究院</i>
+        <i>安全学院</i>
         <img class="header_r1_r" src="@/assets/image/index_icon4.png" @click="openBackManageUrl()"/>
       </div>
     </div>
@@ -35,6 +35,7 @@
                     </div>
                     <div class="left_t_r_b over2">{{item.conAbstract}}</div>
                   </li>
+                  <div v-if="infoList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
                 </div>
               </div>
               <div class="swiper-slide">
@@ -56,7 +57,7 @@
                        <img src="@/assets/image/index_icon8.png" @click="openPlanUrl()"/>
                     </li>
                   </div>
-
+                  <div v-if="planList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
                 </div>
               </div>
               <div class="swiper-slide">