1
0

2 Ревизии 143b11c132 ... f83d7c1354

Автор SHA1 Съобщение Дата
  hao lei f83d7c1354 Merge branch 'master' of http://121.42.8.157:13000/zengminguo/D-MAP преди 1 година
  hao lei b4866cbe4d 右侧tab列表美化 преди 1 година
променени са 4 файла, в които са добавени 32 реда и са изтрити 17 реда
  1. 9 3
      src/components/MyTable/index.vue
  2. 3 1
      src/views/ordinaryPage/index.less
  3. 12 7
      src/views/ordinaryPage/index.vue
  4. 8 6
      src/views/ordinaryPage/square.less

+ 9 - 3
src/components/MyTable/index.vue

@@ -25,8 +25,14 @@ export default {
 <style>
 .el-table__header-wrapper,.el-table__body-wrapper,.el-table__cell,tr {
   background-color: transparent !important;
-  color: #fbfbfb! important;
-  font-size: 12px!important;
+  color: #ebebeb !important;
+  font-size: 12px !important;
+}
+
+.el-table__header-wrapper .el-table__cell{
+  color: #fff !important;
+  font-size: 14px !important;
+  font-weight: bold;
 }
 .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
   border-bottom: 0!important;
@@ -44,7 +50,7 @@ tbody tr {
   /* background-color: #141414 !important; */
 }
 .el-table .el-table__cell{
-  padding: 0;
+  padding: 5px 0;
   height: 4.4vh!important;
 }
 

+ 3 - 1
src/views/ordinaryPage/index.less

@@ -159,7 +159,8 @@
 
         .item-title {
           height: 4.17vh;
-          font-size: 22px;
+          font-size: 20px;
+          letter-spacing: -1px;
           font-family: PingFang SC-Bold, PingFang SC;
           font-weight: 400;
           color: #fbfbfb;
@@ -461,6 +462,7 @@
   border-radius: 53px 53px 53px 53px;
   opacity: 1;
   border: 1px solid #DFDFDF;
+  display: none;
 }
 
 .el-icon-circle-check {

+ 12 - 7
src/views/ordinaryPage/index.vue

@@ -27,12 +27,6 @@
                 class="grid-item-background"
                 style="
                   background-color: black;
-                  padding-top: 35px;
-                  padding-bottom: 25px;
-                  padding-left: 9px;
-                  padding-right: 5px;
-                  margin: 10px;
-                  border-radius: 20px;
                 "
               >
                 <div class="grid-item">
@@ -1340,7 +1334,7 @@ export default {
                   <div class="item-right">
                       <div class="item-text">
                           <div class="item-title">${item.name}
-                            <span onClick="selectBench(${item.id})" class="el-icon-s-platform ${item.status}"></span>
+                            <span onClick="selectBench(${item.id})" class="el-icon-monitor ${item.status}"></span>
                           </div>
                           <div class="item-description">Automation Lab-7E</div>
                           <div class="item-tag">
@@ -4072,4 +4066,15 @@ export default {
 .benchBtnActive {
   filter: brightness(5) drop-shadow(0 2px 3px rgb(255, 255, 255));
 }
+
+.grid-item-background{
+  height: 20vh;
+  width: calc(100% - 10px);
+  border-radius: 10px;
+  margin: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
 </style>

+ 8 - 6
src/views/ordinaryPage/square.less

@@ -16,17 +16,19 @@
         // margin-top: -30vh;
   
         .grid-item-close {
-          margin-left: 16.69vw;
-          margin-top: -21.94vh;
-          margin-bottom: 14.5vh;
-  
+          // margin-left: 16.69vw;
+          // margin-top: -21.94vh;
+          // margin-bottom: 14.5vh;
+          position: absolute;
+          right: 0;
+          top: 0;
         }
   
         .grid-item {
           width: 18.6vw;
           height: 16.74vh;
-          margin-right: 1.39vw;
-          margin-bottom: 1.94vh;
+          // margin-right: 1.39vw;
+          // margin-bottom: 1.94vh;
   
           img {
             width: 100%;