dedsudiyu 1 semana atrás
pai
commit
7d2eb442b6

+ 6 - 2
.env.development

@@ -4,8 +4,12 @@ NODE_ENV=development
 # 项目名称
 VUE_APP_TITLE=贵州大学实验室安全智慧化管控中心
 
-# 接口基础地址
-VUE_APP_BASE_API=http://192.168.1.88/labSystem
+# 外网接口基础地址
+VUE_APP_BASE_API = 'http://lab.zjznai.com/appTest'
+
+# 内网接口基础地址
+VUE_APP_BASE_LOCAL_API = 'http://192.168.1.88/labSystem'
+
 
 # 接口超时时间(毫秒)
 VUE_APP_TIMEOUT=20000

+ 1 - 0
public/index.html

@@ -4,6 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=1920,initial-scale=1.0">
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>实验室安全智慧化管控中心</title>
 </head>
 <body>

+ 6 - 2
src/components/Header.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="top-nav">
-    <div class="nav-title">贵州大学实验室安全智慧化管控中心</div>
+    <div class="nav-title" style="display: flex">
+      <img :src="circularLogo" style="height:40px;width:40px;margin-right:20px;">
+      <p>贵州大学实验室安全智慧化管控中心</p>
+    </div>
     <div class="nav-tabs">
       <div
         v-for="tab in tabs"
@@ -31,7 +34,8 @@ export default {
       ],
       dateStr: '',
       timeStr: '',
-      weather: ''
+      weather: '',
+      circularLogo:localStorage.getItem('circularLogo'),
     }
   },
   computed: {

+ 1 - 1
src/components/LabStats/videoStats.vue

@@ -54,7 +54,7 @@
         // type 1.楼栋 2.楼层 3.楼道 4.实验室
         let obj = {
           page:'1',
-          pageSize:'10',
+          pageSize:'4',
           buildId:'',
           floorId:'',
           passageway:'',

+ 4 - 1
src/utils/request.js

@@ -6,7 +6,10 @@ import { getToken,removeToken } from '@/utils/auth'
 import { tansParams,judgmentNetworkReturnAddress } from "@/utils/index";
 
 //判定http或者https
-let urlText = window.location.href.split('://')[0]+'://';
+let urlText = '';
+if (process.env.NODE_ENV === 'production'){
+  urlText = window.location.href.split('://')[0]+'://';
+}
 
 //弹窗状态开关
 let messageData = null;