From d1c6a4460355766d3ae67fc7330785a1cc748f9e Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 20 十一月 2024 17:01:29 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/civilAviationServices/assets/main.less | 714 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 615 insertions(+), 99 deletions(-)
diff --git a/src/books/civilAviationServices/assets/main.less b/src/books/civilAviationServices/assets/main.less
index afaf281..6043e71 100644
--- a/src/books/civilAviationServices/assets/main.less
+++ b/src/books/civilAviationServices/assets/main.less
@@ -11,11 +11,15 @@
background-color: #fff;
}
- .c-g{
+ .wh-no {
+ white-space: nowrap;
+ }
+
+ .c-g {
color: green;
}
- .c-r{
+ .c-r {
color: red;
}
@@ -24,10 +28,23 @@
}
.mr-0 {
- margin: 0 !important;
+ margin: 0;
+ }
+
+ .mt-10 {
+ margin-top: 10px !important;
}
.mt-20 {
+ margin-top: 20px !important;
+ }
+
+ .table-pad {
+ padding: 1em 0.8em !important;
+ }
+
+
+ .mt-30 {
margin-top: 30px;
}
@@ -35,9 +52,21 @@
margin-bottom: 10px;
}
+ .mb-30 {
+ margin-bottom: 30px !important;
+ }
+
+ .ma-l {
+ margin-left: 8%;
+ }
+
+ .ma-0 {
+ margin: 0% !important;
+ }
+
.pd-5 {
padding: 0 5px;
- }
+ }
.w100 {
width: 100%;
@@ -45,6 +74,18 @@
.w80 {
width: 80%;
+ }
+
+ .w70 {
+ width: 70%;
+ }
+
+ .w25 {
+ width: 25%;
+ }
+
+ .w20 {
+ width: 20%;
}
.fz-13 {
@@ -63,6 +104,9 @@
font-size: 18px !important;
}
+ .fz-20 {
+ font-size: 20px;
+ }
.img-0 {
width: 100%;
@@ -77,7 +121,11 @@
}
.td-0 {
- text-indent: 0em;
+ text-indent: 0em !important;
+ }
+
+ td {
+ padding: 5px 10px;
}
.fl {
@@ -92,6 +140,14 @@
justify-content: space-evenly;
}
+ .jc-fs {
+ justify-content: flex-start;
+ }
+
+ .fw-w {
+ flex-wrap: wrap;
+ }
+
.fd-c {
flex-direction: column;
}
@@ -102,6 +158,10 @@
.al-c {
align-items: center;
+ }
+
+ .al-fe {
+ align-items: flex-end;
}
.ac-f {
@@ -116,7 +176,7 @@
justify-content: center;
}
- .jc-sa{
+ .jc-sa {
justify-content: space-around
}
@@ -132,12 +192,29 @@
padding-top: 55px;
}
+ .ma-t-30 {
+ margin-top: 30px;
+ }
+
+ .ma-t-20 {
+ margin-top: 20px;
+ }
+
.pad-l-60 {
padding-left: 60px;
}
+ .pad-l-80 {
+ padding-left: 80px;
+ }
+
+
.mb-45 {
margin-bottom: 45px;
+ }
+
+ .mb-20 {
+ margin-bottom: 20px !important;
}
.headerImg {
@@ -171,23 +248,94 @@
background-color: #0082D4;
}
+ table {
+ border-color: none !important;
+ }
+
+ .table-th-bc {
+ background-color: #FEDDB4;
+ color: #000;
+ }
+
.table-tr-bc {
- color: #fff;
+ background-color: #FEF4E4;
+ color: #000;
+ }
+
+ .table-textarea {
+ font-size: 14px;
+ font-family: "Times New Roman", "瀹嬩綋";
+ resize: none;
+
+ &:focus {
+ outline: none;
+ }
+ }
+
+ .textarea-box {
+ border: none;
+ text-align: center;
+ width: 84px;
+ height: 36px;
+ overflow: auto;
+ word-break: break-all;
+ resize: none;
+ }
+
+
+ .b0 {
+ border: 0;
}
.task {
- width: 12%;
+ width: 16%;
margin-bottom: 5em;
margin-top: 0;
border-top: 0.7em solid #5192C6;
}
+ .task2 {
+ width: 16%;
+ margin-bottom: 5em;
+ margin-top: 0;
+ border-top: 0.7em solid #F89C1C;
+ }
+
+ .task3 {
+ width: 16%;
+ margin-bottom: 5em;
+ margin-top: 0;
+ border-top: 0.7em solid #448D9C;
+ }
+
+ .task4 {
+ width: 16%;
+ margin-bottom: 5em;
+ margin-top: 0;
+ border-top: 0.7em solid #9EAA60;
+ }
+
+ hr{
+ margin-left: 0;
+ margin-bottom: 4px;
+ width: 15.5%;
+ border: none;
+ height: 1.5px;
+ background-color: #000;
+ }
+
.p-odd {
- padding-right: 10%;
+ padding-right: 8%;
}
.p-even {
- padding-left: 10%;
+ padding-left: 8%;
+ }
+
+ .p-continued {
+ text-align: right;
+ font-size: 14px;
+ margin-bottom: 10px;
}
.img-float {
@@ -220,6 +368,62 @@
p {
margin: 0 !important;
}
+ }
+
+ .w430 {
+ width: 430px;
+ }
+
+ .w395 {
+ width: 395px;
+ }
+
+ .w350 {
+ width: 350px;
+ }
+
+ .w290 {
+ width: 290px;
+ }
+
+ .w280 {
+ width: 280px;
+ }
+
+ .w275 {
+ width: 275px;
+ }
+
+ .w270 {
+ width: 270px;
+ }
+
+ .w250 {
+ width: 250px;
+ }
+
+ .w230 {
+ width: 230px;
+ }
+
+ .w220 {
+ width: 220px;
+ }
+
+ .w200 {
+ width: 200px;
+ }
+
+ .w180 {
+ width: 180px;
+ }
+
+ .w150 {
+ width: 150px;
+ }
+
+ .w115 {
+ width: 115px;
}
.pdf-text {
@@ -318,11 +522,10 @@
.link-float {
- width: 120px;
+ width: 150px;
float: left;
height: auto;
margin: auto;
- margin-top: 12px;
margin-right: 20px;
}
@@ -332,12 +535,12 @@
margin-bottom: 18px;
}
- // 棰樼洰
- .textarea-box {
+ // 棰樼洰}
+
+ .textarea-main {
background-color: transparent;
- margin-left: 80px;
- max-width: 85%;
- min-width: 85%;
+ max-width: 95%;
+ min-width: 95%;
outline: none;
}
@@ -395,7 +598,118 @@
.event-header-text-bc {
background-color: #bbd4ec;
- }
+ }
+
+ .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;
+ }
+
+ .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%;
+ }
+
+ .unitImg {
+ position: relative;
+ z-index: 1;
+ }
+
+ .unitBox {
+ z-index: 99;
+ position: absolute;
+ top: -5px;
+ left: 40px;
+ }
+
+ .unit2Box {
+ z-index: 99;
+ position: absolute;
+ top: -200px;
+ left: 40px;
+ }
+
+ .unitGraphic {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background-color: #5192C6;
+ border-radius: 50%;
+ margin-right: 15px;
+ }
+
+ .unit2Graphic {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background-color: #F89C1C;
+ border-radius: 50%;
+ margin-right: 15px;
+ }
+
+ .unit3Graphic {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background-color: #448D9C;
+ border-radius: 50%;
+ margin-right: 15px;
+ }
+
+ .unit4Graphic {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background-color: #9EAA60;
+ border-radius: 50%;
+ margin-right: 15px;
+ }
+
+
+ .unitText {
+ color: #5192C6;
+ font-size: 18px;
+ }
+
+ .unit2Text {
+ color: #F89C1C;
+ font-size: 16px;
+ }
+
+ .unit3Text {
+ color: #448D9C;
+ font-size: 16px;
+ }
+
+ .unit4Text {
+ color: #9EAA60;
+ font-size: 16px;
+ }
+
+
// 杩佺Щ
.bk-bwh {
@@ -632,12 +946,10 @@
.block {
- font-family: "瀹嬩綋";
- margin-top: 0.2em;
- margin-bottom: 0.2em !important;
+ font-family: "kaiTi";
text-indent: 2em;
line-height: 30px;
- font-size: 16px;
+ font-size: 17px;
text-align: justify;
}
@@ -648,7 +960,7 @@
.img {
font-family: 'FZLTXIHJW';
text-align: center;
- font-size: 0.85em;
+ font-size: 14px;
margin-left: 0%;
margin-right: 0%;
text-indent: 0em;
@@ -666,11 +978,10 @@
p {
font-family: "瀹嬩綋";
- margin-top: 0.2em;
- margin-bottom: 0.2em !important;
+ margin-top: 0em;
+ margin-bottom: 0.2em;
text-indent: 2em;
line-height: 30px;
- // font-size: 18px;
text-align: justify;
}
@@ -695,8 +1006,14 @@
text-indent: 0em;
}
- .left{
+ .left {
text-indent: 0em;
+ margin-bottom: 0px;
+ line-height: 20px;
+ }
+
+ .left3 {
+ margin: 20 0 0 0 !important;
line-height: 20px;
}
@@ -713,6 +1030,16 @@
margin-left: 0%;
margin-right: 0%;
}
+ .input-bottom-border{
+ background-color: transparent;
+ border-top:none ;
+ border-left:none ;
+ border-right:none ;
+ &:focus {
+ outline: none;
+ }
+ }
+
.left1 {
text-indent: 0em;
@@ -768,10 +1095,10 @@
h2 {
font-family: 'FZLTZHJW';
+ font-size: 30px;
line-height: 2em;
- font-weight: bold;
+ font-weight: 400;
color: #5192C6;
- font-size: 1.3em;
margin-bottom: 0.5cm;
margin-top: 0.5cm;
}
@@ -779,8 +1106,8 @@
h3 {
font-family: 'FZHTJW';
color: #5192C6;
- font-weight: 300;
- font-size: 1.2em;
+ font-weight: 500;
+ font-size: 1.5em;
margin-top: 1.5em;
margin-bottom: 5px;
text-indent: 0em;
@@ -799,13 +1126,12 @@
h5 {
font-family: 'FZHTJW';
- color: #5192C6;
text-align: left;
font-weight: 400;
margin-bottom: 0.5em;
margin-top: 0.5em;
- font-size: 0.9em;
- text-indent: 0em;
+ font-size: 18px;
+ text-indent: 2em;
}
h6 {
@@ -819,12 +1145,9 @@
}
.zt-h6 {
-
- font-family: 'FZHTJW';
- color: #65C097;
margin-bottom: 0.5em;
- margin-top: 1em;
- font-size: 1.15em;
+ margin-top: 0.5em;
+ font-weight: 200;
text-indent: 2em;
}
@@ -924,7 +1247,7 @@
}
.zt-ls1 {
- color: #000;
+ color: #1B7EBF;
font-size: 16px;
font-weight: bold;
}
@@ -957,46 +1280,137 @@
}
.h2-zt1 {
- padding: 5px 25px 5px 25px;
- border-radius: 10px 0px 0px 10px;
- background-color: #5392C7;
- font-size: 1.2em;
- color: #FFFFFF;
+ padding: 5px 5px 5px 0px;
+ color: #5192C6;
+ }
+
+ .unit2-c {
+ color: #F89C1C !important;
+ }
+
+ .unit3-c {
+ color: #448D9C !important;
+ }
+
+ .unit4-c {
+ color: #9EAA60 !important;
}
.h2-zt2 {
padding: 10px;
- background-color: #B1DDE0;
margin-right: 2em;
- color: #FFFFFF;
- padding: 5px 50px 5px 25px;
- border-radius: 0px 5px 80px 0px;
- font-size: 1.2em;
+ color: #5192C6;
+ padding: 5px 5px 5px 25px;
}
.bk {
- border: 0.15em dotted #5593C6;
+ border: 0.15em dashed #5593C6;
padding: 0.5em;
margin-bottom: 2em;
margin-top: 0.5em;
- border-radius: 1em;
+ border-radius: 0em;
+ position: relative;
+ }
+
+ .bk2 {
+ border: 0.15em dashed #F89C1C;
+ padding: 15px 10px;
+ margin-bottom: 2em;
+ margin-top: 0.5em;
+ border-radius: 0em;
+ position: relative;
+ }
+
+ .bk3 {
+ border: 0.15em dashed #448D9C;
+ padding: 15px 10px;
+ margin-bottom: 2em;
+ margin-top: 0.5em;
+ border-radius: 0em;
+ position: relative;
+ }
+
+ .bk4 {
+ border: 0.15em dashed #9EAA60;
+ padding: 15px 10px;
+ margin-bottom: 2em;
+ margin-top: 0.5em;
+ border-radius: 0em;
+ position: relative;
+ }
+
+
+ .bk1 {
+ border: 0.15em dashed #CBE6D3;
+ padding: 1.5em 5px;
+ margin-bottom: 2em;
+ margin-top: 0.5em;
+ border-radius: 0em;
position: relative;
}
p.bj1-qjms {
- background-color: #5392C7;
- color: #FFFFFF;
- display: inline-block;
- font-size: 1em;
- padding: 0.1em 0.7em 0.12em 0.7em;
+ background-color: #fff;
+ color: #5192C6;
+ font-size: 20px;
font-weight: bold;
border-radius: 1.5em;
margin-left: 0em;
text-align: center;
text-indent: 0em;
position: absolute;
- top: -2em;
+ top: -16px;
+ }
+
+ p.bj2-qjms {
+ background-color: #fff;
+ line-height: 20px;
+ color: #61C29C;
+ font-size: 20px;
+ font-weight: bold;
+ border-radius: 1.5em;
+ margin-left: 0em;
+ text-align: center;
+ text-indent: 0em;
+ position: absolute;
+ top: -1em;
+ left: 1em;
+ }
+
+ .span-box {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #5192C6;
+ }
+
+ .span-box2 {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #F89C1C;
+ }
+
+ .span-box3 {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #448D9C;
+ }
+
+ .span-box4 {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #9EAA60;
+ }
+ .span-text {
+ padding: 0em 0.15em 0em 0.3em;
+ }
+
+ .span-svg {
+ padding: 0.1em 0.15em 0em 0.3em;
}
.bj {
@@ -1005,50 +1419,71 @@
}
.bj2 {
- background-color: #3D8B9F;
- padding: 0.2em 0.8em 0.2em 0.8em;
- font-size: 1.3em;
+ background-color: #5192C6;
+ padding: 0.2em 0.1em 0.2em 0.1em;
font-weight: bold;
- border-radius: 0.5em;
+ border-radius: 0.2em;
+ color: #FFFFFF;
+ }
+
+ .bj2-unit2 {
+ background-color: #F89C1C;
+ padding: 0.2em 0.1em 0.2em 0.1em;
+ font-weight: bold;
+ border-radius: 0.2em;
+ color: #FFFFFF;
+ }
+
+ .bj2-unit3 {
+ background-color: #448D9C;
+ padding: 0.2em 0.1em 0.2em 0.1em;
+ font-weight: bold;
+ border-radius: 0.2em;
+ color: #FFFFFF;
+ }
+
+ .bj2-unit4 {
+ background-color: #9EAA60;
+ padding: 0.2em 0.1em 0.2em 0.1em;
+ font-weight: bold;
+ border-radius: 0.2em;
color: #FFFFFF;
}
.bj3 {
- background-color: #FDE6BC;
- padding: 20px;
- border-radius: 1.5em;
- margin-bottom: 2em;
- margin-top: 2.5em;
+ background-color: #FEDDB4;
+ padding: 20px 10px 10px 15px;
+ margin-bottom: 10px;
+ position: relative;
}
span.bj3-xyx {
background-color: #F5A101;
color: #FFFFFF;
- box-shadow: 0.3em 0.3em 0px 0px #FDF0D8;
- border-radius: 1.5em;
- padding: 5px 20px 5px 20px;
- font-size: 1em;
+ border-radius: 5px;
+ padding: 5px 10px 5px 10px;
font-weight: bold;
-
}
div.bj3-xyx {
- margin-top: -3em;
- margin-bottom: 1.5em;
- margin-left: -3em;
+ position: absolute;
+ top: -15px;
+ left: 10px;
+
+ }
+
+ div.bj3-xyx-left {
+ background-color: #FEDDB4;
+ border-radius: 10px;
+ padding: 20px 10px;
+ position: relative;
}
.ts-1 {
font-weight: bold;
}
- .zt-h4 {
- background-color: #F0BD40;
- padding: 10px;
- color: #FFFFFF;
- margin-left: -2em;
- border-radius: 1.5em;
- }
+
.qyls-h4 {
font-family: "HiFont Hei GB";
@@ -1060,21 +1495,63 @@
}
.bj4 {
- background-color: #D7E2F0;
- padding: 10px 20px;
+ background-color: #CBE6D3;
+ padding: 30px 15px 10px 15px;
border-radius: 0.1em;
- margin-bottom: 2em;
+ margin-bottom: 1em;
margin-top: 1em;
+ position: relative;
+
+ b{
+ font-weight: 600;
+ font-family: "kaiTi";
+ text-indent: 2em;
+ line-height: 30px;
+ font-size: 17px;
+ text-align: justify;
+ }
+
+ .block{
+ font-family: "kaiTi";
+ text-indent: 2em;
+ line-height: 30px;
+ font-size: 17px;
+ text-align: justify;
+ }
+ }
+
+ .bj4-1 {
+ background-color: #CBE6D3;
+ padding: 10px 15px 10px 15px;
+ border-radius: 0.1em;
+ margin-bottom: 3em;
+ margin-top: 1em;
+ position: relative;
+ }
+
+ .bj4-2 {
+ background-color: #D7E2F0;
+ padding: 10px 15px 10px 15px;
+ border-radius: 0.1em;
+ margin-bottom: 1em;
+ margin-top: 1em;
+ position: relative;
+ }
+
+ .pad-t-10 {
+ padding-top: 10px;
}
div.bj4-xyx {
font-size: 18px;
color: #fff;
line-height: 20px;
- padding: 12.5px 15px 12.5px 15px;
+ padding: 1px 10px 1px 8px;
margin-right: 10px;
- background-color: #5192C6;
- border-radius: 5px;
+ background-color: #61C29C;
+ border-radius: 8px;
+ position: absolute;
+ top: -15px;
}
.bj4-xyx-icon {
@@ -1087,25 +1564,31 @@
border-radius: 0.1em;
margin-bottom: 2em;
margin-top: 2.5em;
- }
-
- span.bj5-xyx {
- background-color: #95B321;
- color: #FFFFFF;
- border-radius: 1.5em;
- padding: 5px 20px 5px 20px;
- font-size: 1em;
- font-weight: bold;
-
+ position: relative;
}
div.bj5-xyx {
margin-top: -3em;
margin-bottom: 1.5em;
margin-left: -2.5em;
+ position: absolute;
+ top: 40px;
+ left: 30px;
}
+ span.bj5-xyx {
+ background-color: #95B321;
+ color: #FFFFFF;
+ border-radius: 6px;
+ padding: 5px 10px 5px 10px;
+ font-size: 1em;
+ font-weight: bold;
+ }
+
+
+
.zt-lvs1 {
+ font-size: 15px;
color: #95B321;
}
@@ -1254,6 +1737,11 @@
}
}
+// 琛ㄦ牸鏍峰紡
+table {
+ border-collapse: collapse; //琛ㄦ牸鐨勮竟妗嗗悎骞讹紝濡傛灉鐩搁偦锛屽垯鍏辩敤涓�涓竟妗嗐��
+ border-spacing: 0px; //璁剧疆琛屼笌鍗曞厓鏍艰竟妗嗙殑闂磋窛銆�
+}
@font-face {
font-family: 'FZLTZHJW';
@@ -1268,6 +1756,14 @@
@font-face {
font-family: 'FZHTJW';
src: url('./Fonts/FZHTJW.ttf');
+}
+
+
+// 闅愯棌椤甸潰
+.hidePage {
+ min-height: 0 !important;
+ height: 0 !important;
+ box-shadow: none !important;
}
/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@@ -1314,12 +1810,32 @@
.img-float {
width: 130px;
}
+
.img-rights {
width: 130px;
}
- .btn-w{
+
+ .btn-w {
width: 42px;
}
+
+ .unitText {
+ color: #5192C6;
+ font-size: 10px;
+ }
+
+ .unit2Text {
+ color: #F89C1C;
+ font-size: 10px;
+ }
+
+ .wh-no {
+ white-space: wrap;
+ }
+
+ td {
+ padding: 5px 10px;
+ }
}
}
--
Gitblit v1.9.1