dedsudiyu 1 mēnesi atpakaļ
vecāks
revīzija
7c580cc747

+ 4 - 4
.env.production

@@ -24,13 +24,13 @@ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 # ####################外网接口配置####################
 
 # 现场
-# VUE_APP_BASE_API = 'labcontrol.nwafu.edu.cn/api'
+VUE_APP_BASE_API = 'labcontrol.nwafu.edu.cn/api'
 
 # 1.8外网地址
 # VUE_APP_BASE_API = 'lab.zjznai.com/labTest'
 
 # 43外网地址
-VUE_APP_BASE_API = 'lab.zjznai.com/labapp'
+# VUE_APP_BASE_API = 'lab.zjznai.com/labapp'
 
 # 开发人员地址
 # VUE_APP_BASE_API = '192.168.1.24:8080'
@@ -38,13 +38,13 @@ VUE_APP_BASE_API = 'lab.zjznai.com/labapp'
 # ####################内网接口配置####################
 
 # 现场
-# VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
+VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
 
 # 1.8内网地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 
 # 43内网地址
-VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'
+# VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'
 
 # 开发人员地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.24:8080'

BIN
src/assets/ZDimages/map_back.png


+ 8 - 8
src/views/newSafetyOverview/pageComponent/canvasMap.vue

@@ -119,15 +119,15 @@
         // alarmUrl:'/png/alarm.png',
         // noAlarmUrl:'/png/noAlarm.png',
         // 本地部署
-        modelsUrlN:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/NxiaoQu.glb':'/labAppTest/largeScreen/models/NxiaoQu.glb',
-        modelsUrlB:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/BxiaoQu.glb':'/labAppTest/largeScreen/models/BxiaoQu.glb',
-        alarmUrl:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/png/alarm.png':'/labAppTest/largeScreen/png/alarm.png',
-        noAlarmUrl:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/png/noAlarm.png':'/labAppTest/largeScreen/png/noAlarm.png',
+        // modelsUrlN:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/NxiaoQu.glb':'/labAppTest/largeScreen/models/NxiaoQu.glb',
+        // modelsUrlB:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/BxiaoQu.glb':'/labAppTest/largeScreen/models/BxiaoQu.glb',
+        // alarmUrl:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/png/alarm.png':'/labAppTest/largeScreen/png/alarm.png',
+        // noAlarmUrl:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/png/noAlarm.png':'/labAppTest/largeScreen/png/noAlarm.png',
         // 线上部署
-        // modelsUrlN:'/largeScreen/models/NxiaoQu.glb',
-        // modelsUrlB:'/largeScreen/models/BxiaoQu.glb',
-        // alarmUrl:'/largeScreen/png/alarm.png',
-        // noAlarmUrl:'/largeScreen/png/noAlarm.png',
+        modelsUrlN:'/schoolData/models/NxiaoQu.glb',
+        modelsUrlB:'/schoolData/models/BxiaoQu.glb',
+        alarmUrl:'/schoolData/png/alarm.png',
+        noAlarmUrl:'/schoolData/png/noAlarm.png',
         //当前校区状态
         schoolType:'',
       };