dedsudiyu 1 mese fa
parent
commit
7177997245
2 ha cambiato i file con 15 aggiunte e 10 eliminazioni
  1. 4 4
      .env.production
  2. 11 6
      src/views/cengterMaxBox/canvasMap/index.vue

+ 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/labAppTest'
 
 # 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'

+ 11 - 6
src/views/cengterMaxBox/canvasMap/index.vue

@@ -107,16 +107,21 @@
           {school:'老附中校区',	name:'附中实验楼',	buildId:'101093843117592830',centerValue:'',valueList:[],alarmType:false,},
           {school:'老附中校区',	name:'附中教学楼',	buildId:'101093843117592791',centerValue:'',valueList:[],alarmType:false,},
         ],
-        //本地
+        // 本地
         // modelsUrlN:'/models/xiaoQuN.glb',
         // modelsUrlB:'/models/xiaoQuB.glb',
         // alarmUrl:'/png/alarm.png',
         // noAlarmUrl:'/png/noAlarm.png',
-        // 部署
-        modelsUrlN:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/xiaoQuN.glb':'/labAppTest/largeScreen/models/xiaoQuN.glb',
-        modelsUrlB:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/xiaoQuB.glb':'/labAppTest/largeScreen/models/xiaoQuB.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/xiaoQuN.glb':'/labAppTest/largeScreen/models/xiaoQuN.glb',
+        // modelsUrlB:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/xiaoQuB.glb':'/labAppTest/largeScreen/models/xiaoQuB.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/xiaoQuN.glb',
+        modelsUrlB:'/largeScreen/models/xiaoQuB.glb',
+        alarmUrl:'/largeScreen/png/alarm.png',
+        noAlarmUrl:'/largeScreen/png/noAlarm.png',
         //当前校区状态
         schoolType:'',
       };