dedsudiyu 5 maanden geleden
bovenliggende
commit
8c04f7ca43
5 gewijzigde bestanden met toevoegingen van 21 en 14 verwijderingen
  1. 7 5
      .env.production
  2. 1 1
      src/api/login.js
  3. BIN
      src/assets/ZDimages/1695@1x.png
  4. 11 6
      src/views/components/centerNotice.vue
  5. 2 2
      src/views/home.vue

+ 7 - 5
.env.production

@@ -17,26 +17,28 @@ VUE_APP_RENEWAL_ENCODING = ''
 # ####################外网接口配置####################
 
 # 项目内网地址
-VUE_APP_BASE_API = 'labcontrol.nwafu.edu.cn/api'
+VUE_APP_BASE_API = '192.168.1.8/api'
 
 # ####################内网接口配置####################
 
 # 项目外网地址
-VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
+VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 
 # ####################外网接口配置-YiLi####################
 
 # YiLi外网地址
-VUE_APP_BASE_API_YILI = '8.134.167.185:8081/api'
+# VUE_APP_BASE_API_YILI = '8.134.167.185:8081/api'
+VUE_APP_BASE_API_YILI = '192.168.1.88:8080'
 
 # ####################内网接口配置-YiLi####################
 
 # YiLi内网地址
-VUE_APP_BASE_LOCAL_API_YILI = '8.134.167.185:8081/api'
+# VUE_APP_BASE_LOCAL_API_YILI = '8.134.167.185:8081/api'
+VUE_APP_BASE_LOCAL_API_YILI = '192.168.1.88:8080'
 
 # ####################楼层ID####################
 
-VUE_APP_FLOOR_ID_1 = '1951109332624351234'
+VUE_APP_FLOOR_ID_1 = '1961317181757542401'
 VUE_APP_FLOOR_ID_2 = '2'
 VUE_APP_FLOOR_ID_3 = '3'
 VUE_APP_FLOOR_ID_4 = '4'

+ 1 - 1
src/api/login.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 import md5 from 'js-md5';
 let account = 'wsadmin';
-let password = md5('Zd20240730zd#');
+let password = md5('4,@3MptV9W');
 let code = '';
 let uuid = '';
 let userType = '';

BIN
src/assets/ZDimages/1695@1x.png


+ 11 - 6
src/views/components/centerNotice.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="centerNotice" :class="allShow?'all-max-box':''">
     <div class="centerNotice-page" id="centerNotice-page">
-      <img class="null-max-img" v-if="!noticeList[1]" src="@/assets/ZDimages/a86cb7c7f5930fcad444bf35ba649d5d.png">
+      <img class="null-max-img" v-if="!noticeList[1]" src="@/assets/ZDimages/1695@1x.png">
       <div class="content-box" id="scrollTextBox" v-if="pageType === '0'" v-html="content"></div>
       <vue-office-pdf
         id="scrollPdfBox"
@@ -434,8 +434,10 @@
         height:60px!important;
       }
       .null-max-img{
-        width: 2840px!important;
-        height: 1400px!important;
+        width:528px!important;
+        height:474px!important;
+        /*width: 2840px!important;*/
+        /*height: 1400px!important;*/
         margin: 190px 116px 0!important;
       }
       .content-box{
@@ -490,9 +492,12 @@
         cursor: pointer;
       }
       .null-max-img{
-        width:1150px;
-        height:650px;
-        margin:85px 81px 0;
+        /*width:1150px;*/
+        /*height:650px;*/
+        width:528px!important;
+        height:474px!important;
+        margin:170px 0 0 393px;
+        /*margin:85px 81px 0;*/
       }
       //富文本
       .content-box{

+ 2 - 2
src/views/home.vue

@@ -156,8 +156,8 @@
             obj = {...obj,...res.data[0]};
             obj.status = obj.runningStateName == '维修' ? '3':(obj.stateName == '租用'?'2':'1')
             //假数据
-            obj.monitorVisable = true;
-            obj.subId = '1955554621449019392';
+            // obj.monitorVisable = true;
+            // obj.subId = '1955554621449019392';
             this.iotSensorFindBySubId(obj);
           }
         });