From 99e8c98928ef2a65cbabedc7dff3f786ea6d98ae Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 31 Mar 2025 12:56:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/SignMachineNest/components/MachineRight/MachineMonitor.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/SignMachineNest/components/MachineRight/MachineMonitor.vue b/src/views/SignMachineNest/components/MachineRight/MachineMonitor.vue
index 50303ca..f441252 100644
--- a/src/views/SignMachineNest/components/MachineRight/MachineMonitor.vue
+++ b/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>
\ No newline at end of file
--
Gitblit v1.9.3