Merge branch 'master' of http://112.124.40.88:5510/root/NanJingLamanRadarProject

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;
             }
         }
     }

04.系统编码/Frontend/src/index.less

@@ -484,7 +484,6 @@ img {
             position: absolute;
             right: 0.2rem;
             top: 0;
-            z-index: 10;
         }
     }
 }