Merge remote-tracking branch 'origin/master'

罗广辉

2025-03-31 99e8c98928ef2a65cbabedc7dff3f786ea6d98ae

 src/views/SignMachineNest/components/MachineRight/MachineMonitor.vue

@@ -2,12 +2,15 @@
<template>
  <CommonTitle title="机巢监控" />
  <div :style="{ marginLeft: pxToRem(14) }">
    <div class="machine-monitor"></div>
    <div class="machine-monitor">
      <liveVideo></liveVideo>
    </div>
  </div>
</template>

<script setup>
import CommonTitle from '@/components/CommonTitle.vue';
import LiveVideo from '@/components/LiveVideo.vue';
</script>

<style lang="scss" scoped>
@@ -24,6 +27,6 @@
    margin: 2px 0 13 0;
    display: flex;
    justify-content: space-between;
    padding: 11px 27px 0;
    padding: 12px 10px 0;
 }
</style>