zc

src/views/cengterMaxBox/alarmComponents/index.vue

@@ -97,7 +97,7 @@
           passageway:'',
           subIds:[this.alarmPropsData.subId],
           protocol:window.location.href.indexOf('https') !== -1?'wss':'ws',
-          streamType:0,//0.主 1.子
+          streamType:1,//0.主 1.子
           source:0,
         };
         iotCameraFindByCondition(obj).then(response => {

src/views/cengterMaxBox/canvasMap/index.vue

@@ -678,6 +678,16 @@
                       "<p style='font-size:34px;line-height:49px;margin-top:15px;'><span style='border:1px solid "+item.classLevelColor+";padding:0 10px;margin-right:20px;border-radius:20px;color:"+item.classLevelColor+";'>"+item.classLevelName+"</span>"+item.subName+"</p>"+
                       "</div>"
                     )
+                  }else{
+                    minItem.textList.splice(0,1)
+                    minItem.textList.push(
+                      "<div style='border-top:1px dashed #E90104;margin-top:35px;'>" +
+                      "<p style='color:#FF8400;font-size:34px;line-height:49px;margin-top:29px;'>"+item.riskPlanName+"</p>"+
+                      "<p style='font-size:34px;line-height:49px;margin-top:15px;'>"+this.parseTime(item.eventStartTime,"{y}-{m}-{d} {h}:{i}:{s}")+"</p>"+
+                      "<p style='font-size:34px;line-height:49px;margin-top:15px;'>"+item.floorName+"-"+item.roomNum+"-"+item.deptName+"</p>"+
+                      "<p style='font-size:34px;line-height:49px;margin-top:15px;'><span style='border:1px solid "+item.classLevelColor+";padding:0 10px;margin-right:20px;border-radius:20px;color:"+item.classLevelColor+";'>"+item.classLevelName+"</span>"+item.subName+"</p>"+
+                      "</div>"
+                    )
                   }
                 }
               })

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

@@ -58,7 +58,7 @@
         videoQueryParams:{
           page:1,
           pageSize:6,
-          streamType:0,
+          streamType:1,
           source:0,
         },
         //全屏视频参数
@@ -104,7 +104,7 @@
           pageSize:6,
           passageway:'',
           protocol:window.location.href.indexOf('https') !== -1?'wss':'ws',
-          streamType:0,
+          streamType:1,
           source:0,
         };
         if(data.level == 4){

src/views/home.vue

@@ -818,6 +818,8 @@
     background: url("../assets/ZDimages/icon_yujing@1x.png");
     background-size: 100% 100%;
     animation: alarmSlide 1s ease-in-out 1s infinite alternate;
+    transform:scaleX(1.4);
+    transform-origin: 50% 0;
     div{
       margin:220px 0 0 425px;
       width:810px;     padding: 0; /* 移除内边距以确保文字充分利用空间 */
@@ -846,6 +848,8 @@
     background: url("../assets/ZDimages/icon_yujing@1x.png");
     background-size: 100% 100%;
     animation: alarmSlide 1s ease-in-out 1s infinite alternate;
+    transform:scaleX(1.4);
+    transform-origin: 50% 0;
     div{
       margin:220px 0 0 425px;
       width:810px;     padding: 0; /* 移除内边距以确保文字充分利用空间 */
@@ -870,11 +874,14 @@
     25% {
       opacity:1;
     }
-    70% {
+    69% {
       opacity:1;
     }
+    70% {
+      opacity:0;
+    }
     85% {
-      opacity:0.5;
+      opacity:0;
     }
     100% {
       opacity:0;