From 3010e03e2f2d0add9d111067f02eac49e23cc9be Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期四, 14 八月 2025 10:16:47 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/testResultReport/components/experimentResultDialog.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/laboratory/src/views/dataManagement/testResultReport/components/experimentResultDialog.vue b/laboratory/src/views/dataManagement/testResultReport/components/experimentResultDialog.vue
index 8e74a96..e1565e2 100644
--- a/laboratory/src/views/dataManagement/testResultReport/components/experimentResultDialog.vue
+++ b/laboratory/src/views/dataManagement/testResultReport/components/experimentResultDialog.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-dialog title="实验方案详情" :visible="dialogVisible" width="80%" :close-on-click-modal="false" @close="handleClose">
+ <el-dialog title="实验方案详情" :visible="dialogVisible" width="90%" top="5vh" :close-on-click-modal="false" @close="handleClose">
<div class="approval-dialog">
<!-- 左侧审批内容 -->
<div class="approval-content">
@@ -66,7 +66,7 @@
</div>
</div>
<div class="content-box">
- <AiEditor ref="purposeEditor" :readOnly="true" :value="form.experimentObjective" height="200px"
+ <AiEditor ref="purposeEditor" :readOnly="true" :value="form.experimentObjective" height="400px"
placeholder="请输入实验目的..." />
</div>
@@ -77,7 +77,7 @@
</div>
</div>
<div class="content-box">
- <AiEditor ref="processEditor" :readOnly="true" :value="form.experimentParamRoute" height="200px"
+ <AiEditor ref="processEditor" :readOnly="true" :value="form.experimentParamRoute" height="400px"
placeholder="请输入工艺参数及路线..." />
</div>
@@ -450,7 +450,7 @@
}
::v-deep .el-dialog__body {
- padding: 20px;
+ // padding: 20px;
max-height: 80vh;
overflow: hidden;
}
@@ -464,7 +464,8 @@
.approval-dialog {
display: flex;
- height: 60vh;
+ min-height: 60vh;
+ max-height: 80vh;
padding: 20px;
overflow: hidden;
@@ -492,8 +493,8 @@
.approval-flow {
flex: 3;
- min-width: 350px;
- padding: 40px 20px;
+ max-width: 305px;
+ padding: 20px 0px;
background: #ffffff;
box-shadow: 0px 4px 12px 4px rgba(0, 0, 0, 0.08);
border-radius: 10px;
@@ -518,11 +519,11 @@
}
.approval-dialog-approve {
- margin-top: 26px;
+ margin-top: 18px;
}
.approval-content-card {
- height: calc(100% - 100px) !important;
+ height: calc(100% - 10px) !important;
box-shadow: none !important;
}
--
Gitblit v1.7.1