Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

src/views/login.vue

@@ -193,7 +193,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background: url("../assets/images/背景-denglu.png") center no-repeat;
+  background: url("../images/背景图片这是.png") center no-repeat;
   // background-size: cover;
 }
 .title {

src/views/pt.vue

@@ -110,7 +110,7 @@
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
           </ul>
-          <hr />
+          <!-- <hr /> -->
           <ul class="ul">
             <li>
               <div class="demo-box">
@@ -212,7 +212,7 @@
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
           </ul>
-          <hr />
+          <!-- <hr /> -->
           <ul class="ul">
             <li>
               <div class="demo-box">
@@ -273,7 +273,7 @@
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
           </ul>
-          <hr />
+          <!-- <hr /> -->
           <ul class="ul">
             <li>
               <div class="demo-box">
@@ -1118,6 +1118,7 @@ li {
   background: url("../images/tx.png") no-repeat;
   text-align: center;
   margin-top: 10%;
+  /* margin-bottom: 10px; */
   /* margin: 0 80px; */
 }
 .demo img {
@@ -1143,7 +1144,7 @@ li {
   align-items: center;
 }
 .ul {
-  /* margin-bottom: 7vh; */
+  margin-bottom: 20px;
   height: 23%;
   display: flex;
   flex-flow: wrap;
@@ -1157,6 +1158,11 @@ li {
 }
 .li-img {
   width: 100%;
+  /* height: 2px;
+  background-color: #06668a;
+  border: none;
+  margin-bottom: 20px; */
+  
 }
 .boxx {
   padding: 0 0 0 80px;
@@ -1376,9 +1382,9 @@ hr {
   text-align: center;
   font-size: 16px;
   cursor: pointer;
-  /* margin-left: 851px; */
+  /* margin-left: 3.5px; */
   position: absolute;
-  right: 4%;
+  right: 3.5%;
   top: 9%;
 }
 ::v-deep .el-dialog {