From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/threshold/index.vue | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/views/system/work-order/threshold/index.vue b/src/views/system/work-order/threshold/index.vue
index 848a2b4..412791e 100644
--- a/src/views/system/work-order/threshold/index.vue
+++ b/src/views/system/work-order/threshold/index.vue
@@ -13,9 +13,9 @@
<!-- </el-button>-->
<!-- </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">
+ <div style="display: flex;overflow-x: auto;" >
+ <div>
+ <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>
@@ -71,8 +71,8 @@
v-if="ifEditVideo"
></el-input>
<span v-else>{{ item.value }}</span>
- <span v-if="item.countType=='percent'">%</span>
- <span v-if="item.countType=='second'">绉�</span>
+ <span class="unit" v-if="item.countType=='percent'">%</span>
+ <span class="unit" v-if="item.countType=='second'">绉�</span>
</el-form-item>
</el-form>
</div>
@@ -94,17 +94,17 @@
v-if="ifEditVideo"
></el-input>
<span v-else>{{ item.valueAuto }}</span>
- <span v-if="item.countType=='percent'">%</span>
- <span v-if="item.countType=='second'">绉�</span>
+ <span class="unit" v-if="item.countType=='percent'">%</span>
+ <span class="unit" v-if="item.countType=='second'">绉�</span>
</el-form-item>
</el-form>
</div>
</div>
</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">
+ </div>
+ <div>
+ <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>
@@ -160,8 +160,8 @@
v-if="ifEditFace"
></el-input>
<span v-else>{{ item.value }}</span>
- <span v-if="item.countType=='percent'">%</span>
- <span v-if="item.countType=='second'">绉�</span>
+ <span class="unit" v-if="item.countType=='percent'">%</span>
+ <span class="unit" v-if="item.countType=='second'">绉�</span>
</el-form-item>
</el-form>
</div>
@@ -183,18 +183,18 @@
v-if="ifEditFace"
></el-input>
<span v-else>{{ item.valueAuto }}</span>
- <span v-if="item.countType=='percent'">%</span>
- <span v-if="item.countType=='second'">绉�</span>
+ <span class="unit" v-if="item.countType=='percent'">%</span>
+ <span class="unit" v-if="item.countType=='second'">绉�</span>
</el-form-item
>
</el-form>
</div>
</div>
</div>
- </el-card></el-col
+ </el-card></div
>
- <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
- <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px">
+ <div>
+ <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 + '锛�'"
@@ -250,8 +250,8 @@
v-if="ifEditCar"
></el-input>
<span v-else>{{ item.value }}</span>
- <span v-if="item.countType=='percent'">%</span>
- <span v-if="item.countType=='second'">绉�</span>
+ <span class="unit" v-if="item.countType=='percent'">%</span>
+ <span class="unit" v-if="item.countType=='second'">绉�</span>
</el-form-item>
</el-form>
</div>
@@ -273,16 +273,15 @@
v-if="ifEditCar"
></el-input>
<span v-else>{{ item.valueAuto }}</span>
- <span v-if="item.countType=='percent'">%</span>
- <span v-if="item.countType=='second'">绉�</span>
+ <span class="unit" v-if="item.countType=='percent'">%</span>
+ <span class="unit" v-if="item.countType=='second'">绉�</span>
</el-form-item>
</el-form>
</div>
</div>
</div>
- </el-card></el-col
- >
- </el-row>
+ </el-card></div>
+ </div>
</div>
</template>
@@ -774,8 +773,16 @@
.header鈥攖ext {
font-weight: bold;
+ font-size: large;
}
::v-deep .el-form-item {
margin-bottom: 0px; /* 鏍规嵁闇�姹傝皟鏁磋繖涓�� */
}
+::v-deep .el-form-item__label {
+ color: #8d8d8d;
+}
+.unit {
+ margin-left: 5px;
+ display: inline-block;
+}
</style>
--
Gitblit v1.8.0