Merge remote-tracking branch 'origin/master'

jiangping

2024-11-12 0f272e2cd2ce4363453213dc9861cc8a5614d9db

 screen/src/views/FireFighting.vue

@@ -1347,7 +1347,7 @@
          margin-right: 7px;
        }
      }

      
      .static_wrap {
        display: flex;
        justify-content: space-evenly;
@@ -1401,7 +1401,7 @@
        overflow: auto;
        margin-top: 15px;
        scrollbar-width: none;
        

        .item {
          display: flex;
          font-size: 13px;