zc

src/views/cengterMaxBox/canvasMap/newIndex.vue

@@ -111,20 +111,20 @@
           {school:'老附中校区',	name:'附中教学楼',	buildId:'101093843117592791',centerValue:'',valueList:[],alarmType:false,},
         ],
         // 本地
-        modelsUrlN:'/models/NxiaoQu.glb',
-        modelsUrlB:'/models/BxiaoQu.glb',
-        alarmUrl:'/png/alarm.png',
-        noAlarmUrl:'/png/noAlarm.png',
+        // modelsUrlN:'/models/NxiaoQu.glb',
+        // modelsUrlB:'/models/BxiaoQu.glb',
+        // 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:'/largeScreen/models/NxiaoQu.glb',
-        // modelsUrlB:'/largeScreen/models/BxiaoQu.glb',
-        // alarmUrl:'/largeScreen/png/alarm.png',
-        // noAlarmUrl:'/largeScreen/png/noAlarm.png',
+        modelsUrlN:'/largeScreen/models/NxiaoQu.glb',
+        modelsUrlB:'/largeScreen/models/BxiaoQu.glb',
+        alarmUrl:'/largeScreen/png/alarm.png',
+        noAlarmUrl:'/largeScreen/png/noAlarm.png',
         //当前校区状态
         schoolType:'',
       };
@@ -190,10 +190,10 @@
         this.controls.dampingFactor = 0.05;
 
         // 添加灯光
-        const ambientLight = new THREE.AmbientLight(0xffffff, 0.8);
+        const ambientLight = new THREE.AmbientLight(0xffffff, 1);
         this.scene.add(ambientLight);
 
-        const directionalLight = new THREE.DirectionalLight(0xffffff, 0.8);
+        const directionalLight = new THREE.DirectionalLight(0xffffff, 1);
         directionalLight.position.set(-1.5, 2, -1.5);
         this.scene.add(directionalLight);
 
@@ -296,7 +296,7 @@
       loadAssets() {
         const textureLoader = new THREE.TextureLoader();
         this.textures = [
-          textureLoader.load('/png/alarm.png')
+          textureLoader.load(this.alarmUrl)
         ];
       },
       // 报警样式