Browse Source

1.九宫格与搜索框间距去除 2.台架信息尺寸适配 3.右侧列表框架跳转

hao lei 1 year ago
parent
commit
0cde0d5d7e

+ 2 - 0
src/components/MyLayout/index.less

@@ -6,6 +6,8 @@ html {
 }
 .el-card__body,
 .el-main {
+  position: relative;
+  z-index: 1;
   padding: 0 !important;
   height: 100vh;
 }

+ 0 - 1
src/components/MyLayout/index.vue

@@ -132,7 +132,6 @@ export default {
 
 .audiLogoBox {
   position: absolute;
-  z-index: 5;
   right: 0;
   bottom: 50px;
   transform: scale(0.5);

+ 1 - 1
src/components/PlanList/index.vue

@@ -202,7 +202,7 @@ export default {
     }
 }
 .tab-content:before{
-    background: linear-gradient(322deg, rgba(255,255,255,0.63) 0%, rgba(255,255,255,0) 73%, rgba(84,84,84,0) 100%);
+    // background: linear-gradient(322deg, rgba(255,255,255,0.63) 0%, rgba(255,255,255,0) 73%, rgba(84,84,84,0) 100%);
     border-radius: 2.08vw;
     opacity: 0.55;
     content: "";

File diff suppressed because it is too large
+ 467 - 439
src/components/TabList/index.vue


+ 8 - 8
src/views/ordinaryPage/index.less

@@ -3,8 +3,8 @@
   .ordinary-left {
     display: flex;
     width: 63.48vw;
-    justify-content: center;
-    flex-wrap: wrap;
+    flex-direction: column;
+    align-items: center;
     .search-container {
       width: 44.9vw;
       height: 7.4vh;
@@ -18,7 +18,7 @@
       width: 63.34vw;
       height: 67.79vh;
       border-radius: 40px;
-      margin-top: -11vh;
+      // margin-top: -11vh;
       img {
         width: 100%;
         height: 100%;
@@ -90,7 +90,7 @@
   }
   .ordinary-list {
     width: 26.36vw;
-    margin-left: 1.56vw;
+    height: 100%;
   }
   .ordinary-list {
     .item-image {
@@ -353,10 +353,10 @@
   color: #DFDFDF !important;
 }
 
-.panel-container {
-  height: 60vh;
-  overflow: auto;
-}
+// .panel-container {
+//   height: 60vh;
+//   overflow: auto;
+// }
 .panel-bottom {
 
 }

+ 4 - 4
src/views/ordinaryPage/index.vue

@@ -372,13 +372,13 @@
     </div>
 
     <div class="origin-right">
-      <div class="square-count" v-show="!currentBench.selected && isOpenSquare">
+      <!-- <div class="square-count" v-show="!currentBench.selected && isOpenSquare">
         <status-bar
           :ready="readyCount"
           :occupied="occupiedCount"
           :offline="offlineCount"
         ></status-bar>
-      </div>
+      </div> -->
       <!-- <div
         class="origin-basic"
         v-show="currentBench.type == 2 && !isOpenSquare"
@@ -3177,11 +3177,11 @@ export default {
 .bmLogItemError {
   color: rgb(255, 113, 113);
 }
-.origin-basic {
+/* .origin-basic {
   padding: 15px 20px;
   color: #fff;
   font-size: 12px;
-}
+} */
 .origin-basic div {
   margin-bottom: 5px;
 }

+ 6 - 16
src/views/ordinaryPage/origin.less

@@ -4,10 +4,6 @@
     justify-content: center;
     height: 100%;
     .ordinary-left {
-      display: flex;
-      width: 63.48vw;
-      justify-content: center;
-      flex-wrap: wrap;
       .search-container {
         width: 44.9vw;
         margin-top: 11.29vh;
@@ -79,11 +75,13 @@
   
     .origin-right {
       // margin-top: 11.29vh;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
+      // display: flex;
+      // flex-direction: column;
+      // justify-content: center;
       padding: 0 20px;
-    }
+      margin-left: 1.56vw;
+      height: 100%;
+  }
   
     // .origin-basic {
     //   height: 130px;
@@ -276,14 +274,6 @@
     }
   }
 
-  .origin-right {
-    // margin-top: 11.29vh;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    padding: 0 20px;
-  }
-
   // .origin-basic {
   //   height: 130px;
   //   margin-bottom: 1.85vh;

+ 0 - 2
src/views/ordinaryPage/square.less

@@ -1,8 +1,6 @@
 .ordinary-container {
     display: flex;
     .ordinary-left {
-      display: flex;
-      width: 63.48vw;
       .search-container {
         height: 7.4vh;
         width: 44.9vw;