From 1427584584848e1a8c7997d84945c0d19488d698 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 29 八月 2024 14:05:49 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Web/src/views/device/deviceInfo/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index 8a5440e..e6210df 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -6,21 +6,18 @@
<el-collapse-item title="璁惧鎺у埗" name="1">
<el-card
class="box-card"
- shadow="hover"
- body-style="height:30px; padding: 0 20px; display: flex; align-items: center;">
+ shadow="hover">
<el-switch v-model="value1" active-text="" inactive-text="绋嬪簭鏈嶅姟"></el-switch>
</el-card>
<el-card
class="box-card"
shadow="hover"
- body-style="height:30px; padding: 0 20px; display: flex; align-items: center;"
style="margin-top: 3px;">
<el-switch v-model="value2" active-text="" inactive-text="鑴辨満妯″紡"></el-switch>
</el-card>
<el-card
class="box-card"
shadow="hover"
- body-style="height:30px; padding: 0 20px; display: flex; align-items: center;"
style="margin-top: 3px;">
<el-switch v-model="value3" active-text="" inactive-text="鑷埛鏂�"></el-switch>
</el-card>
@@ -33,7 +30,6 @@
:key="index"
class="box-card"
shadow="hover"
- body-style="height:30px; padding: 0 20px; display: flex; align-items: center;"
style="margin-top: 3px;">
<el-switch v-model="stacker.value" :inactive-text="`${index + 1}鍙峰爢鍨涙満`"></el-switch>
</el-card>
@@ -46,7 +42,6 @@
:key="index"
class="box-card"
shadow="hover"
- body-style="height:30px; padding: 0 20px; display: flex; align-items: center;"
style="margin-top: 3px;">
<el-switch v-model="conveyor.value" :inactive-text="`${index + 1}妤艰緭閫佺嚎`"></el-switch>
</el-card>
@@ -1960,6 +1955,12 @@
</script>
<style scoped>
+ .box-card{
+ height:30px;
+ padding: 0;
+ display: flex;
+ align-items: center;
+ }
.card-page{
width: 100%;
height: 30px;
--
Gitblit v1.8.0