From 1c3655f7f193c103ad01179ec8ba8f4cf10977ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 16:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/threshold/index.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/system/work-order/threshold/index.vue b/src/views/system/work-order/threshold/index.vue
index 0ab6263..4287d0f 100644
--- a/src/views/system/work-order/threshold/index.vue
+++ b/src/views/system/work-order/threshold/index.vue
@@ -14,8 +14,8 @@
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
- <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
- <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">瑙嗛</div>
<div>
@@ -103,8 +103,8 @@
</div>
</el-card>
</el-col>
- <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
- <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">浜鸿劯</div>
<div>
@@ -193,8 +193,8 @@
</div>
</el-card></el-col
>
- <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
- <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">杞﹁締</div>
<div>
@@ -230,13 +230,13 @@
font-size: small;
display: flex;
flex-direction: row-reverse;
- width: 232px;
+ width: 206px;
"
>
宸ュ崟闃堝��
</div>
<div>
- <el-form ref="form" label-width="180px">
+ <el-form ref="form" label-width="160px">
<el-form-item
v-for="(item, index) in thresholdList.car"
:label="item.name + '锛�'"
@@ -774,6 +774,7 @@
.header鈥攖ext {
font-weight: bold;
+ font-size: large;
}
::v-deep .el-form-item {
margin-bottom: 0px; /* 鏍规嵁闇�姹傝皟鏁磋繖涓�� */
--
Gitblit v1.8.0