commit

FTT.Board.VueUI/src/views/board/workShopList/searchSOP.vue

@@ -80,7 +80,7 @@
             </div>
             <div class="banner">
               <div class="block">
-                <el-carousel trigger="click" height="570px">
+                <el-carousel trigger="click" height="530px">
                   <el-carousel-item v-for="(item, index) in IEPictures" :key="index">
                     <img :src="item">
                   </el-carousel-item>
@@ -125,7 +125,7 @@
             </div>
             <div class="banner">
               <div class="block">
-                <el-carousel trigger="click" height="570px">
+                <el-carousel trigger="click" height="530px">
                   <el-carousel-item v-for="item in IEPictures" :key="item">
                     <img :src="item">
                   </el-carousel-item>
@@ -169,7 +169,7 @@
             </div>
             <div class="banner">
               <div class="block">
-                <el-carousel trigger="click" height="570px">
+                <el-carousel trigger="click" height="530px">
                   <el-carousel-item v-for="item in IEPictures" :key="item">
                     <img :src="item">
                   </el-carousel-item>
@@ -214,7 +214,7 @@
             </div>
             <div class="banner">
               <div class="block">
-                <el-carousel trigger="click" height="570px">
+                <el-carousel trigger="click" height="530px">
                   <el-carousel-item v-for="item in IEPictures" :key="item">
                     <img :src="item">
                   </el-carousel-item>
@@ -374,6 +374,7 @@ export default {
   );
   box-sizing: border-box;
   padding: 10px 30px 0px;
+  font-size: 20px;
 }
 
 li {
@@ -465,7 +466,7 @@ h1 span {
 }
 
 .modelShow .IEDetail {
-  width: 25%;
+  width: 30%;
   height: 685px;
   border-right: 1px solid #ccc;
   box-sizing: border-box;
@@ -521,7 +522,7 @@ div::-webkit-scrollbar {
 
 .modelShow .banner {
   overflow: hidden !important;
-  width: 75%;
+  width: 70%;
 }
 
 .el-carousel__item:nth-child(2n) {
@@ -534,7 +535,7 @@ div::-webkit-scrollbar {
 
 .el-carousel__item img {
     display: flex;
-    height: 570px;
+    height: 530px;
     margin: 0 auto;
 }
 
@@ -555,7 +556,7 @@ div::-webkit-scrollbar {
 .right .content {
   border-top: 1px solid #ccc;
   margin-top: 15px;
-  height: 120px;
+  height: 160px;
   display: flex;
 }
 
@@ -575,6 +576,7 @@ div::-webkit-scrollbar {
 
 .el-table {
   width: 172px;
+  font-size: 20px;
 }
 
 .el-table li {

FTT.Board.VueUI/src/views/chart/Table2.vue

@@ -324,13 +324,6 @@ export default {
 };
 </script>
 <style >
-<<<<<<< HEAD
-=======
-.el-progress-bar{
-  display: flex;
-align-items: center;
-}
->>>>>>> 14f09182f403625ae423bf2b3e12000d1ae64703
 .seamless-warp {
   height: 95%;
   overflow: hidden;