From 30d147c4c92dbfd5ca1b2f8c24a617dc82d2d25b Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 18:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/aviationSafety/assets/main.less |  299 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 266 insertions(+), 33 deletions(-)

diff --git a/src/books/aviationSafety/assets/main.less b/src/books/aviationSafety/assets/main.less
index c1495a2..1110ddd 100644
--- a/src/books/aviationSafety/assets/main.less
+++ b/src/books/aviationSafety/assets/main.less
@@ -11,7 +11,7 @@
         background-color: #fff;
     }
 
-    .foreword{
+    .foreword {
         line-height: 10px !important;
         margin-top: 0;
     }
@@ -29,7 +29,7 @@
     }
 
     .mr-0 {
-        margin: 0;
+        margin: 0 !important;
     }
 
     .mr-9 {
@@ -44,6 +44,10 @@
         margin-left: 2em;
     }
 
+    .mt--25 {
+        margin-top: -25px !important;
+    }
+
     .mt-10 {
         margin-top: 10px !important;
     }
@@ -53,7 +57,8 @@
     }
 
     .mt-30 {
-        margin-top: 30px;
+        margin-top: 30px !important;
+        ;
     }
 
     .mt-50 {
@@ -85,7 +90,7 @@
         width: 80%;
     }
 
-    
+
     .b0 {
         border: 0;
     }
@@ -129,6 +134,10 @@
 
     .td-0 {
         text-indent: 0em !important;
+    }
+
+    .td-1 {
+        text-indent: 1em !important;
     }
 
     .td-2 {
@@ -191,6 +200,10 @@
         margin-right: 10px;
     }
 
+    .mr-5 {
+        margin-right: 5px;
+    }
+
     .ma-l {
         margin-left: 10%;
     }
@@ -246,6 +259,10 @@
         background-color: #6D84AE;
     }
 
+    .radioClass {
+        margin: 0 0 0 4px !important;
+
+    }
 
 
     .task-u2-c {
@@ -357,13 +374,18 @@
         }
     }
 
+    .w430 {
+        width: 430px;
+    }
+
     .w395 {
         width: 395px;
     }
 
-    .w430 {
-        width: 430px;
+    .w365 {
+        width: 365px;
     }
+
 
     .w300 {
         width: 300px;
@@ -379,6 +401,10 @@
 
     .w270 {
         width: 270px;
+    }
+
+    .w260 {
+        width: 260px;
     }
 
     .w250 {
@@ -399,6 +425,10 @@
 
     .w200 {
         width: 200px;
+    }
+
+    .w190 {
+        width: 190px;
     }
 
     .w180 {
@@ -455,10 +485,17 @@
     .table-tr-bc {
         background-color: #E7DFEC;
         line-height: 25px;
+
         p {
             text-indent: 0em;
             line-height: 20px;
         }
+    }
+
+    .table-title-bc {
+        background-color: #8091BC;
+        color: #fff;
+        line-height: 25px;
     }
 
     .table-textarea {
@@ -472,7 +509,7 @@
     }
 
     .table-input-border {
-        width: 90%;
+        width: 80%;
         background-color: transparent;
         border: 0;
 
@@ -481,9 +518,48 @@
         }
     }
 
+    .table-input-border-w20 {
+        width: 20%;
+        background-color: transparent;
+        border: 0;
+
+        &:focus {
+            outline: none;
+        }
+    }
+
+    .table-input-border-w15 {
+        width: 15%;
+        background-color: transparent;
+        border: 0;
+
+        &:focus {
+            outline: none;
+        }
+    }
+
+    .table-input-border-w10 {
+        width: 10%;
+        background-color: transparent;
+        border: 0;
+
+        &:focus {
+            outline: none;
+        }
+    }
+
+    .table-input-border-w5 {
+        width: 5%;
+        background-color: transparent;
+        border: 0;
+
+        &:focus {
+            outline: none;
+        }
+    }
 
     .input-bottom-border {
-        width: 15%;
+        width: 11%;
         background-color: transparent;
         border: 0;
         border-bottom: 1px solid #000;
@@ -491,6 +567,75 @@
         &:focus {
             outline: none;
         }
+    }
+
+    .input-bottom-border1 {
+        width: 33%;
+        background-color: transparent;
+        border: 0;
+        border-bottom: 1px solid #000;
+
+        &:focus {
+            outline: none;
+        }
+    }
+
+
+    .input-bottom-border2 {
+        width: 21.5%;
+        background-color: transparent;
+        border: 0;
+        border-bottom: 1px solid #000;
+
+        &:focus {
+            outline: none;
+        }
+    }
+
+    // 瑙嗛  
+    .video-box-cover {
+        border: 1px dashed #895B2E;
+        padding: 2% 2%;
+    }
+
+    .video-box {
+        margin: 20px 0 20px 8%;
+        border: 1px dashed #895B2E;
+        padding: 2% 2%;
+    }
+
+    .video-box-left {
+        margin: 20px 8% 20px 0;
+        border: 1px dashed #895B2E;
+        padding: 2% 2%;
+    }
+
+    .videoname {
+        display: flex;
+        justify-content: center;
+    }
+
+    .sInput {
+        width: 60px;
+        border: 0;
+        outline: none;
+        text-align: center;
+    }
+
+    .collect-btn {
+        cursor: pointer;
+        width: 20px;
+        height: 20px;
+        margin-left: 10px;
+        margin-top: 0.8%;
+    }
+
+    .collect-btn1 {
+        cursor: pointer;
+        width: 10px;
+        height: 10px;
+        margin-left: 10px;
+        margin-top: 0.8%;
     }
 
     // 缁〃
@@ -523,7 +668,6 @@
         flex-direction: column;
         justify-content: space-between;
         align-items: flex-start;
-        margin-bottom: 20px;
 
         p {
             margin: 0;
@@ -547,7 +691,6 @@
                 margin-right: 15px;
                 padding: 0 15px;
                 border-radius: 5px;
-                margin-top: 15px;
 
                 span {
                     font-size: 14px;
@@ -628,6 +771,25 @@
         margin-bottom: 18px;
     }
 
+    .imgBox {
+        display: flex !important;
+        flex-direction: column-reverse !important;
+        position: relative !important;
+
+        .img {
+            margin: 0 !important;
+            font-size: 14px !important;
+            position: absolute !important;
+            left: 50% !important;
+            transform: translateX(-50%);
+            bottom: -2% !important;
+        }
+
+        img {
+            height: 80%;
+        }
+    }
+
     // 棰樼洰
     .textarea-box {
         background-color: transparent;
@@ -648,8 +810,8 @@
         background-color: transparent;
         margin-left: 2em;
         margin-right: 9%;
-        max-width: 85%;
-        min-width: 85%;
+        max-width: 95%;
+        min-width: 95%;
         outline: none;
     }
 
@@ -943,7 +1105,7 @@
     }
 
     .block2 {
-        font-family: "FANGSONG";
+        // font-family: "FANGSONG"
         font-size: 17px;
     }
 
@@ -967,7 +1129,7 @@
 
 
     p {
-        font-family: "BOYA";
+        // font-family: "BOYA";
         margin-top: 0.2em;
         margin-bottom: 0.2em !important;
         text-indent: 2em;
@@ -1063,7 +1225,7 @@
 
 
     .h1-bj {
-        font-family: 'ZHUNYUAN';
+        // font-family: 'ZHUNYUAN';
         font-weight: 100;
         color: #FFFFFF;
         background-color: #6E85AF;
@@ -1072,7 +1234,7 @@
     }
 
     .h1-bk {
-        font-family: 'FANGZHENG';
+        // font-family: 'FANGZHENG';
         box-shadow: inset 0em 0.1em 0em 0em #C3C2C0;
         border-top-style: solid;
         border-right-style: solid;
@@ -1085,9 +1247,9 @@
         margin-top: 1em;
     }
 
-    h1.jz{
-        text-align:center;
-        text-indent:0em;
+    h1.jz {
+        text-align: center;
+        text-indent: 0em;
     }
 
     .front {
@@ -1128,7 +1290,7 @@
 
     h4 {
         font-family: 'FZHTJW';
-        font-weight: bold;
+        font-weight: 500;
         margin-bottom: 0.5em;
         margin-top: 1em;
         font-size: 1.1em;
@@ -1197,7 +1359,7 @@
     }
 
     .img-a {
-        width: 95%;
+        width: 96%;
     }
 
     .img-b {
@@ -1324,6 +1486,8 @@
         font-size: 1.2em;
     }
 
+
+
     .bk {
         border: 0.15em dotted #FAAD70;
         padding: 1em;
@@ -1332,12 +1496,12 @@
         border-radius: 0em;
         position: relative;
 
-        p{
-            font-family: ZHONGDENGXIAN;
+        p {
+            // font-family: ZHONGDENGXIAN;
         }
 
-        span{
-            font-family: ZHUNYUAN;
+        span {
+            // font-family: ZHUNYUAN;
         }
     }
 
@@ -1365,6 +1529,8 @@
         font-weight: 100;
         padding: 0em 0.15em 0em 0.3em;
     }
+
+
 
 
 
@@ -1400,15 +1566,64 @@
         box-shadow: 0.3em 0.3em 0px 0px #C3C2C0;
     }
 
+    div.bk2 {
+        border: 3px solid #93A8D5;
+        padding: 0.2em 1em 0.2em 1em;
+        border-radius: 1em;
+        box-shadow: 0.5em 0.5em 0px 0px #DCDDDF;
+        margin-top: 2em;
+        margin-bottom: 1.5em;
+    }
 
 
-    .bj3 {
-        background-color: #F1F5E7;
-        padding: 20px 10px 10px 10px;
-        border-radius: 10px;
-        margin-bottom: 10px;
-        margin-top: 40px;
-        position: relative;
+    .zysx {
+        margin-top: -1.7em;
+        margin-left: -2em;
+    }
+
+
+    .zt-zysx {
+        font-family: "DK-HEITI", "鏂规鍏颁涵榛戠畝浣�", "榛戜綋";
+        background-color: #24b8bc;
+        border-radius: 1.5em;
+        color: #FFFFFF;
+        font-weight: bold;
+        padding: 4px;
+        font-size: 1.2em;
+        box-shadow: 0.2em 0.2em 0px 0px #c1e3e4;
+    }
+
+    .zt-zysx1 {
+        font-family: "DK-HEITI", "鏂规鍏颁涵榛戠畝浣�", "榛戜綋";
+        background-color: #96A7D5;
+        border-radius: 1.5em;
+        color: #FFFFFF;
+        font-weight: 100;
+        padding: 4px;
+        font-size: 1.2em;
+    }
+
+    .zt-zysx2 {
+        font-family: "DK-HEITI", "鏂规鍏颁涵榛戠畝浣�", "榛戜綋";
+        background-color: #0071BD;
+        font-size: 1.2em;
+    }
+
+    .zt-1 {
+        color: #6F84AF;
+        font-weight: bold;
+        font-size: 1.1em;
+
+    }
+
+    div.bj3 {
+        background-color: #DED5E8;
+        padding: 1em 1em 1em 1.5em;
+        border-radius: 1em;
+        margin-bottom: 0.2em;
+        margin-left: -0.6em;
+        margin-right: -0.6em;
+        margin-top: -0.6em;
     }
 
     span.bj3-xyx {
@@ -1427,6 +1642,9 @@
         left: -25px;
 
     }
+
+
+
 
     .ts-1 {
         font-weight: bold;
@@ -1651,7 +1869,6 @@
 }
 
 .custom-dialog {
-    overflow: hidden !important;
 
     .el-dialog__body {
         padding: 0;
@@ -1755,6 +1972,10 @@
         height: 80vh;
     }
 
+    h1 {
+        font-size: 1.1em;
+    }
+
     .custom-dialog {
         .el-dialog {
             width: 90vw !important;
@@ -1799,6 +2020,18 @@
         .btn-w {
             width: 42px;
         }
+
+        .pad-l-60 {
+            padding-left: 10px;
+        }
+
+        .mr-70 {
+            margin-right: 15px;
+        }
+
+        h1 {
+            font-size: 1.1em;
+        }
     }
 }
 

--
Gitblit v1.9.1