Merge remote-tracking branch 'supervisionVue/hc-dataAnalysis-1023'

riku

2024-10-24 fab51ed95159ffb71d58030a0d9f303c36733add

 src/App.vue

@@ -19,17 +19,17 @@
          <el-scrollbar>
            <div class="el-main__content">
              <Content></Content>
              <el-backtop
              <!-- <el-backtop
                target=".el-main .el-scrollbar__wrap"
                :right="40"
                :right="10"
                :bottom="100"
                style="width: 120px"
                style="z-index: 1000;"
              >
                <div class="back-top">
                  <el-icon><ArrowUpBold /></el-icon>
                  <span style="">返回顶部</span>
                </div>
              </el-backtop>
              </el-backtop> -->
            </div>
          </el-scrollbar>
        </el-main>
@@ -82,7 +82,7 @@
}

.el-main__content {
  padding: var(--el-main-padding);
  padding: var(--el-main-padding) calc(var(--el-main-padding) / 2);
  max-height: calc(100vh - 60px - var(--el-main-padding) * 2);
  /* background-color: aqua; */
  /* overflow: auto; */