From a2fe40a6232559f2bd2d5c818fc206395072b403 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 18:03:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/laboratory/measure/index.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index c32c063..0e01e41 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -118,11 +118,11 @@
</div>
</div>
<div
- :style="`position: absolute;top:${addTop}px;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;`">
+ :style="`position: absolute;top:${addTop}vh;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;`">
<Add ref="add" />
</div>
<div id="myMOdel"
- :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 99%; height: 85vh; background-color: #fff;z-index: 20;`">
+ :style="`position: absolute;transition: 1s;top:${mymodelTop}vh; left: 9px; width: 99%; height: 85vh; background-color: #fff;z-index: 20;`">
<el-col :span="10">
<p style="font-size: 13px;padding-left: 40px;">璁″垝淇℃伅</p>
</el-col>
@@ -329,8 +329,8 @@
createPerson: '鏌愭煇璐熻矗浜�',
createTime: '2021-09-08'
},
- mymodelTop: -700,//14
- addTop: -700,
+ mymodelTop: -85,//14
+ addTop: -85,
planId: 0
}
},
@@ -372,7 +372,7 @@
measureAdd() {
let add = this.$refs.add.add()
if (add) {
- this.addTop = -700
+ this.addTop = -82
this.$message({
message: '鎿嶄綔鎴愬姛锛�',
type: 'success'
@@ -389,7 +389,7 @@
await this.limitGetPlanMeasureInstrument()
},
addPlan() {
- this.addTop = 14
+ this.addTop = 2
this.lookVisible = true
this.$parent.mainShowAdd()
},
@@ -407,7 +407,7 @@
this.planId = id
this.getPlanAndInfoAndIns(id)
this.lookVisible = true
- this.mymodelTop = 10
+ this.mymodelTop = 2
this.$parent.triggerMainBtnPlan()
},
async getPlanAndInfoAndIns(id) {
@@ -428,7 +428,7 @@
},
combackLookPlan() {
this.lookVisible = false
- this.mymodelTop = -700
+ this.mymodelTop = -85
},
blurSearch() {
if (this.radioValue === 1) {
--
Gitblit v1.9.3