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:'',
       };
@@ -513,7 +513,7 @@
           self.buildingApplyTexture(list);
           // self.buildingColor(list);
           self.alarmTextLabel(list);
-        },1000);
+        },1500);
       },
       //预案停止模型加载
       delLoadModel(type) {
@@ -549,7 +549,7 @@
         setTimeout(function(){
           self.buildingApplyTexture([]);
           // self.buildingColor([]);
-        },1000);
+        },1500);
       },
       //初始化楼栋标记(报警时调用)
       buildingColor(list){

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

@@ -341,6 +341,7 @@
           color:#fff;
           text-align: center;
           border-radius:10px;
+          cursor: pointer;
         }
         .form-inquire-common-style-button{
           width:120px;
@@ -354,6 +355,7 @@
           margin:0 35px;
           text-align: center;
           border-radius:10px;
+          cursor: pointer;
         }
         ::placeholder{
           color:#fff;

src/views/home.vue

@@ -568,6 +568,7 @@
             this.$set(this,'alarmPropsData',response.data[response.data.length-1]);
             //报警窗口开启
             this.$set(this,'pageType',2);
+            this.$set(this,'deptVideoType',false);
             //判断报警楼栋属于南北校区
             setTimeout(function(){
               self.schoolModelList.forEach((item)=>{
@@ -575,7 +576,7 @@
                   self.$refs['canvasMap'].alarmTrigger(response.data,response.data[response.data.length-1],item.school);
                 }
               })
-            },500);
+            },1500);
             //报警声音
             if(this.audioType){
               /* 报警音频播放 */
@@ -593,9 +594,10 @@
           }else{
             //报警结束
             this.$set(this,'pageType',1);
+            this.$set(this,'deptVideoType',false);
             setTimeout(function(){
               self.$refs['canvasMap'].alarmOff();
-            },500);
+            },1500);
           }
         })
       },

src/views/rightMaxBox/sensorsAndIotDevices/index.vue

@@ -413,7 +413,7 @@
           left: 0;
           width:528px;
           height:214px;
-          background: url('../../../assets/ZDimages/icon_wlsb_wlsb@1x.png');
+          background: url('../../../assets/ZDimages/icon_wlsb_hxp@1x.png');
           -webkit-background-size: 100%;
           background-size: 100%;
           -webkit-animation-name: backImgSlide;
@@ -428,7 +428,7 @@
           left: 0;
           width:528px;
           height:214px;
-          background: url('../../../assets/ZDimages/icon_wlsb_hxp@1x.png');
+          background: url('../../../assets/ZDimages/icon_wlsb_wlsb@1x.png');
           -webkit-background-size: 100%;
           background-size: 100%;
           -webkit-animation-name: backImgSlide;