scorpio 2 年之前
父節點
當前提交
f8b8f57514

+ 11 - 4
src/layout/index.vue

@@ -8,11 +8,11 @@
         <el-aside style="width: 200px; position: fixed; left: 0" v-if="!mini">
           <left />
         </el-aside>
-        <el-main class="wt-main hide-scrollbar" @scroll="scroll">
+        <el-main class="wt-main hide-scrollbar">
           <div class="wrapper mb-20">
             <tips />
           </div>
-          <div class="wrapper">
+          <div class="wrapper" @scroll="scroll">
             <router-view v-slot="{ Component, route }">
               <keep-alive :include="keepAlive.list">
                 <component :is="Component" :key="route.fullPath" />
@@ -114,12 +114,19 @@ export default {
 }
 
 .wt-main {
-  width: 1200px;
   height: calc(100vh - 100px);
   background-color: #f6f7f8;
-  overflow-x: hidden;
+  overflow-x: scroll;
   padding: 0;
 }
+.content {
+  overflow-x: scroll;
+  height: calc(100vh - 100px);
+}
+
+.tips {
+  position: fixed;
+}
 
 :deep(.el-drawer) {
   --el-drawer-bg-color: #f6f7f8;

+ 13 - 9
src/layout/tips.vue

@@ -2,15 +2,19 @@
 <template>
   <div class="full-width flex flex-col">
     <div class="full-width flex flex-center flex-justify-between">
-      <span class="font-24">{{ nav.menus[nav.menus.length - 1].name }}</span>
-      <el-button
-        type="primary"
-        plain
-        icon="Back"
-        @click="$router.back()"
-        v-if="nav.menus[nav.menus.length - 1].meta.back !== undefined"
-        >返 回</el-button
-      >
+      <div class="flex flex-center">
+        <el-button
+          type="primary"
+          plain
+          icon="Back"
+          circle
+          @click="$router.back()"
+          v-if="nav.menus[nav.menus.length - 1].meta.back !== undefined"
+        ></el-button>
+        <span class="ml-10 font-24">{{
+          nav.menus[nav.menus.length - 1].name
+        }}</span>
+      </div>
       <el-tooltip>
         <template #content>
           <div style="max-width: 400px">

+ 4 - 1
src/layout/top.vue

@@ -8,7 +8,7 @@
         <div class="flex flex-justify-start flex-align-center padding">
           <el-button
             icon="Menu"
-            class="mr-20"
+            class="mr-20 white"
             circle
             @click="openMenu"
             v-if="mini"
@@ -314,6 +314,9 @@ export default {
   background: white;
   color: black;
 }
+:deep(.el-icon) {
+  --color: white !important;
+}
 
 .bread-g {
   background: #3978f1;

+ 1 - 1
src/views/database/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col full-height">
     <serach />
-    <el-card shadow="hover" class="full-width full-height mt-10">
+    <el-card shadow="hover" class="full-width mt-10">
       <list />
     </el-card>
   </div>

+ 1 - 1
src/views/home/component/left_bar.vue

@@ -78,7 +78,7 @@ export default {
 <style lang="scss" scoped>
 .top {
   width: 300px;
-  position: fixed;
+  position: sticky;
   background-color: white;
   height: calc(100vh - 100px);
 }

+ 1 - 1
src/views/home/component/pro_left.vue

@@ -303,7 +303,7 @@ export default {
 <style lang="scss" scoped>
 .top {
   width: 300px;
-  position: fixed;
+  position: sticky;
   height: calc(100vh - 155px);
   background-color: white;
 }

+ 1 - 1
src/views/home/details.vue

@@ -12,7 +12,7 @@
     <el-card
       shadow="hover"
       class="full-height full-width white-bg padding-left padding-top"
-      style="margin-left: 315px"
+      style="margin-left: 10px"
     >
       <proinfo
         v-if="type === '0'"

+ 1 - 1
src/views/home/pro_detail.vue

@@ -9,7 +9,7 @@
         @year="changeYear"
       />
     </div>
-    <div style="margin-left: 305px" class="full-width" ref="content">
+    <div style="margin-left: 10px" class="full-width" ref="content">
       <basic-container>
         <basic-tab :tabs="tabs" @change="change"></basic-tab>
       </basic-container>

+ 1 - 1
src/views/home/project.vue

@@ -2,7 +2,7 @@
   <div class="flex flex-col full-height full-width">
     <top-serach v-if="type === 0" />
     <owner-serach v-else-if="type === 1" />
-    <div class="full-width full-height mt-10">
+    <div class="full-width mt-10">
       <dash />
     </div>
   </div>