From bdedf68fbd9975879e42058d6673bc5c1dad86db Mon Sep 17 00:00:00 2001 From: xuhuihui <3548508071@qq.com> Date: Thu, 5 May 2022 14:02:47 +0800 Subject: [PATCH 1/2] commit --- .../Frontend/src/components/SynergyEvaluation.vue | 9 +++++++-- 04.系统编码/Frontend/src/index.less | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/04.系统编码/Frontend/src/components/SynergyEvaluation.vue b/04.系统编码/Frontend/src/components/SynergyEvaluation.vue index 39f8474..6545a5c 100644 --- a/04.系统编码/Frontend/src/components/SynergyEvaluation.vue +++ b/04.系统编码/Frontend/src/components/SynergyEvaluation.vue @@ -120,7 +120,7 @@ </el-col> </el-row> </div> - <div class="picture-view multi-picture-view scroll" v-if="currentTab === 'element-change-trend' || currentTab === 'element-monitor'" :style="{'marginTop': currentTab === 'element-change-trend' && currentCategory !== 'LST' ? 'calc(0.34rem + 2px)' : 0}"> + <div class="picture-view multi-picture-view scroll" v-if="currentTab === 'element-change-trend' || currentTab === 'element-monitor'" :style="{'marginTop': currentTab === 'element-change-trend' ? 'calc(0.34rem + 2px)' : 0}"> <el-row :gutter="20"> <el-col :span="12" v-for="(item, index) in trendItems" :key="index"> <el-image @@ -354,7 +354,11 @@ .synergy-container { height: calc(~"100% - 0.6rem"); padding: 0.2rem 0 0.2rem 0.2rem; + .save-btn { + z-index: 9999; + } .synergy-picture-view { + width: 100%; height: 100%; display: flex; @@ -385,7 +389,7 @@ } .multi-picture-view { width: 100%; - height: calc(~"100% - 0.76rem"); + height: calc(~"100% - 0.2rem"); :deep(.el-row) { height: 100%; padding-top: 10px; @@ -439,6 +443,7 @@ .save-btn { right: 0.2rem; top: 0.2rem; + z-index: 9999!important; } } } diff --git a/04.系统编码/Frontend/src/index.less b/04.系统编码/Frontend/src/index.less index 6cd1822..bfe6169 100644 --- a/04.系统编码/Frontend/src/index.less +++ b/04.系统编码/Frontend/src/index.less @@ -402,6 +402,7 @@ img { .save-btn { top: 0.6rem; right: 2rem; + z-index: 999; } //.title { @@ -484,7 +485,7 @@ img { position: absolute; right: 0.2rem; top: 0; - z-index: 10; + z-index: 9999; } } } From a6cc17704a218afd4b90ab7bf050e4b826c8db58 Mon Sep 17 00:00:00 2001 From: xuhuihui <3548508071@qq.com> Date: Thu, 5 May 2022 14:06:16 +0800 Subject: [PATCH 2/2] commit --- 04.系统编码/Frontend/src/index.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/04.系统编码/Frontend/src/index.less b/04.系统编码/Frontend/src/index.less index bfe6169..ac7e554 100644 --- a/04.系统编码/Frontend/src/index.less +++ b/04.系统编码/Frontend/src/index.less @@ -402,7 +402,6 @@ img { .save-btn { top: 0.6rem; right: 2rem; - z-index: 999; } //.title { @@ -485,7 +484,6 @@ img { position: absolute; right: 0.2rem; top: 0; - z-index: 9999; } } }