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/MachineRight.vue | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/views/SignMachineNest/components/MachineRight/MachineRight.vue b/src/views/SignMachineNest/components/MachineRight/MachineRight.vue
index 5b6e65e..3705b78 100644
--- a/src/views/SignMachineNest/components/MachineRight/MachineRight.vue
+++ b/src/views/SignMachineNest/components/MachineRight/MachineRight.vue
@@ -1,7 +1,29 @@
<template>
- <div class="machine-right">右边</div>
+ <div class="machine-right">
+ <UserOperate/>
+ <MachineStatus/>
+ <MachineMonitor/>
+ <InspectionRaskList/>
+ </div>
</template>
-<script setup></script>
+<script setup>
+import UserOperate from '@/components/UserOperate.vue';
+import MachineStatus from './MachineStatus.vue';
+import MachineMonitor from './MachineMonitor.vue';
+import InspectionRaskList from './InspectionRaskList.vue';
+</script>
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss">
+.machine-right {
+ position: absolute;
+ top: 122px;
+ right: 31px;
+ width: 404px;
+
+ .titleBox {
+ width: 404px;
+ height: 43px;
+ }
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3