From 9ef61aec5e8b218db9d60941ef3ad576a927338b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 26 四月 2024 11:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/SimulatAssess.vue | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index e9a7e3e..d87c221 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -22,6 +22,11 @@
<template slot="append">鍒嗛挓</template>
</el-input>
</zt-form-item>
+ <zt-form-item label="浠跨湡鏃堕暱" prop="simulatTime">
+ <el-input type="number" :min="1" v-model="dataForm.simulatTime">
+ <template slot="append">鍒嗛挓</template>
+ </el-input>
+ </zt-form-item>
<zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
<el-input type="number" :min="1" v-model="dataForm.simulatFrequency">
<template slot="append">娆℃暟</template>
@@ -35,8 +40,8 @@
</div>
</div>
</el-col>
- <el-col :span="17">
- <div style="height: calc(100vh - 165px);background: white">
+ <el-col :span="18">
+ <div class="fa-card-a">
<SimulatCurve ref="SimulatCurve"></SimulatCurve>
<SimulatData></SimulatData>
</div>
@@ -64,6 +69,7 @@
isRepair: '',
samplPeriod: '',
simulatFrequency: '',
+ simulatTime:''
}
}
},
@@ -132,15 +138,15 @@
</script>
<style>
.mod-taskReliability-simulatAssess {
- height: calc(100vh - 165px);
+ height: calc(100vh - 175px);
}
.mod-taskReliability-simulatAssess .el-form-item__label {
- line-height: calc((100vh - 165px) / 7);
+ line-height: calc((100vh - 175px) / 8);
}
.mod-taskReliability-simulatAssess .el-form-item__content {
- line-height: calc((100vh - 165px) / 7);
+ line-height: calc((100vh - 175px) / 8);
}
.mod-taskReliability-simulatAssess .el-form-item__content > .el-input-group--append {
@@ -150,4 +156,7 @@
div.el-col.el-col-17 {
background: white;
}
+ div.el-select-dropdown.el-popper{
+ /*top: calc((100vh - 155px) / 4) !important;*/
+ }
</style>
--
Gitblit v1.9.1