zc

src/views/cengterMaxBox/canvasMap/index.vue

@@ -108,20 +108,20 @@
           {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:'/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:'/largeScreen/models/xiaoQuN.glb',
-        // modelsUrlB:'/largeScreen/models/xiaoQuB.glb',
-        // alarmUrl:'/largeScreen/png/alarm.png',
-        // noAlarmUrl:'/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:'',
       };
@@ -177,7 +177,7 @@
         this.controls.dampingFactor = 0.05;
 
         // 添加灯光
-        const ambientLight = new THREE.AmbientLight(0xffffff, 0.5);
+        const ambientLight = new THREE.AmbientLight(0xffffff, 0.8);
         this.scene.add(ambientLight);
 
         const directionalLight = new THREE.DirectionalLight(0xffffff, 0.8);
@@ -506,7 +506,8 @@
                         materialParams: {
                           transparent: true,
                           opacity: 1,
-                          color: 0xba2727//报警色
+                          // color: 0xba2727//报警色
+                          color: 0xb54c4c//报警色
                         }
                       });
                     }else{

src/views/cengterMaxBox/videoSurveillance/pageComponent/videoComponent.vue

@@ -126,73 +126,73 @@
         let self = this;
         self.$set(self, 'videoType', false);
         self.$set(self, 'videoList', []);
-        // iotCameraFindByCondition(this.videoQueryParams).then(response => {
-        //   let list = [];
-        //   for(let i=0;i<response.data.records.length;i++){
-        //     list.push(
-        //       {
-        //         width: this.width, //(宽度:非必传-默认600)
-        //         height: this.height, //(高度:非必传-默认338)
-        //         url: response.data.records[i].streamUrl,
-        //         cameraIndexCode: response.data.records[i].deviceNo,
-        //       }
-        //     )
-        //   }
-        //   this.$set(this,'videoList',list)
-        //   this.$set(this,'videoTotal',response.data.total);
-        //   this.$nextTick(()=>{
-        //     setTimeout(function(){
-        //       self.$set(self, 'videoType', true);
-        //     },1000);
-        //   })
-        // });
+        iotCameraFindByCondition(this.videoQueryParams).then(response => {
+          let list = [];
+          for(let i=0;i<response.data.records.length;i++){
+            list.push(
+              {
+                width: this.width, //(宽度:非必传-默认600)
+                height: this.height, //(高度:非必传-默认338)
+                url: response.data.records[i].streamUrl,
+                cameraIndexCode: response.data.records[i].deviceNo,
+              }
+            )
+          }
+          this.$set(this,'videoList',list)
+          this.$set(this,'videoTotal',response.data.total);
+          this.$nextTick(()=>{
+            setTimeout(function(){
+              self.$set(self, 'videoType', true);
+            },1000);
+          })
+        });
 
 
-        let list = [
-          {
-            width:this.width,
-            height:this.height,
-            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
-            cameraIndexCode:'c451e9f079874b6ea6ddb1eb4f55d410',
-          },
-          {
-            width:this.width,
-            height:this.height,
-            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
-            cameraIndexCode:'555848cb4ef64234817778ef48e07108',
-          },
-          {
-            width:this.width,
-            height:this.height,
-            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
-            cameraIndexCode:'87acbd68f5304e62b054de724d6a73c0',
-          },
-          {
-            width:this.width,
-            height:this.height,
-            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
-            cameraIndexCode:'c451e9f079874b6ea6ddb1eb4f55d411',
-          },
-          {
-            width:this.width,
-            height:this.height,
-            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
-            cameraIndexCode:'555848cb4ef64234817778ef48e07102',
-          },
-          {
-            width:this.width,
-            height:this.height,
-            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
-            cameraIndexCode:'87acbd68f5304e62b054de724d6a73c3',
-          },
-        ];
-        this.$set(this,'videoList',list)
-        // this.$set(this,'videoTotal',response.data.total);
-        this.$nextTick(()=>{
-          setTimeout(function(){
-            self.$set(self, 'videoType', true);
-          },1000);
-        })
+        // let list = [
+        //   {
+        //     width:this.width,
+        //     height:this.height,
+        //     url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+        //     cameraIndexCode:'c451e9f079874b6ea6ddb1eb4f55d410',
+        //   },
+        //   {
+        //     width:this.width,
+        //     height:this.height,
+        //     url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+        //     cameraIndexCode:'555848cb4ef64234817778ef48e07108',
+        //   },
+        //   {
+        //     width:this.width,
+        //     height:this.height,
+        //     url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+        //     cameraIndexCode:'87acbd68f5304e62b054de724d6a73c0',
+        //   },
+        //   {
+        //     width:this.width,
+        //     height:this.height,
+        //     url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+        //     cameraIndexCode:'c451e9f079874b6ea6ddb1eb4f55d411',
+        //   },
+        //   {
+        //     width:this.width,
+        //     height:this.height,
+        //     url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+        //     cameraIndexCode:'555848cb4ef64234817778ef48e07102',
+        //   },
+        //   {
+        //     width:this.width,
+        //     height:this.height,
+        //     url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+        //     cameraIndexCode:'87acbd68f5304e62b054de724d6a73c3',
+        //   },
+        // ];
+        // this.$set(this,'videoList',list)
+        // // this.$set(this,'videoTotal',response.data.total);
+        // this.$nextTick(()=>{
+        //   setTimeout(function(){
+        //     self.$set(self, 'videoType', true);
+        //   },1000);
+        // })
       },
       //全屏开启-关闭轮播
       stopTime(cameraIndexCode){