Merge remote-tracking branch 'origin/master'

yinet-admin/src/main/resources/static/raio/ncss/style.css

@@ -26,6 +26,7 @@ header{
 .time{
 	font-size: 40px;
 	font-weight: 400;
+	margin-right: 185px;
 	color: #FFFFFF;
 }
 .list a{

yinet-admin/src/main/resources/static/rlzy/css/saomiao.css

@@ -12,7 +12,7 @@ body {
   height: 100%;
 }
 body {
-  background-image: url("../images//bg.jpg");
+  background-image: url("/print/images//bg.jpg");
   background-repeat: no-repeat;
   background-size: cover;
 }
@@ -49,7 +49,9 @@ header {
   margin: 0 40px;
 }
 /* 头部区域 */
-
+.mt-sm-2, .my-sm-2 {
+    margin-top: 15px !important;
+}
 article {
   overflow: hidden;
   width: 1850px;
@@ -62,7 +64,7 @@ article .divider {
   position: relative;
   width: 1400px;
   height: 7px;
-  margin: 80px auto 90px;
+  margin: 80px auto 60px;
   background: #84bdff;
 }
 article .divider span {
@@ -139,5 +141,67 @@ footer {
 .jiantou img {
   width: 100px;
   height: 100px;
-}
+}.form-check-inline {
+  display: inline-flex;
+  align-items: center;
+  padding-left: 0;
+  margin-right: 1.4em;
+} .form-check-input {
+    position: static;
+    margin-top: 0;
+    margin-right: $form-check-inline-input-margin-x;
+    margin-left: 0;
+  }
+.content form span, .content form div {
+            font-size: 31px;
+            color: #333;
+            font-weight: 100;
+        }
+
+        .form-control {
+            padding: 0.75rem 0.75rem;
+        }
+
+        .ft18 {
+            font-size: 24px !important;
+        }
+
+        .form-check-inline .form-check-input {
+            width: 18px;
+            height: 18px;
+        }
+
+        .form-check-label {
+            margin-bottom: 0.5rem;
+			font-weight:100
+        }
+
+        header {
+            display: flex !important;
+        }
+.form-control {
+  display: block;
+  width: 100%;
+  padding: 20px !important;
+  font-size: 30px !important;
+  height:46px!important;
+  line-height: $input-line-height;
+  color: $input-color;
+  background-color: $input-bg;
+  background-clip: padding-box;
+  border: $input-border-width solid $input-border-color;
+}
+.btn-primary{
+	margin-top:30px;
+	width:150px;
+	font-size:24px !important;
+	height:60px;
+	}
+	.content2{
+		width:1400px;
+		margin:0 auto;
+		}
+.content2 .title,.content2 .info,.content2 .gaopai .btn{
+	font-size:30px !important;
+	}
 

yinet-admin/src/main/resources/templates/rlzy/print/apply.html

@@ -424,7 +424,7 @@
         </div>
 
 
-        <div id="content2" class="con write"  style="display:none">
+        <div id="content2" class="con write  content2"  style="display:none;">
             <div class="row clearfix" style="width:98%;margin:0 auto;padding:1% 0;height: 663px">
                 <div class="col-md-12 column" style="height:100%">
                     <div class="row" style="height:100%">
@@ -451,11 +451,11 @@
                             <div class="gaopaiyi" id="CameraCtl" style="width:100%;height:80%;background-color:#fff">
 
                             </div>
-                            <div class="gaopai" style="padding-left: 200px;position:absolute;bottom:0">
-                                <button class="btn btn-lg btn-success" onclick = "cl_openidA4photos(1,1)">打开高拍仪</button>
-                                <button class="btn btn-lg btn-warning" onclick = "cl_closeidA4photos()">关闭高拍仪</button>
+                            <div class="gaopai" style="position:absolute;bottom:0 ; margin-left: 33%;">
+<!--                                <button class="btn btn-lg btn-success" onclick = "cl_openidA4photos(1,1)">打开高拍仪</button>-->
+<!--                                <button class="btn btn-lg btn-warning" onclick = "cl_closeidA4photos()">关闭高拍仪</button>-->
                                 <button class="btn btn-lg btn-info" onclick="cl_takePhotos()">拍照</button>
-                                <button class="btn btn-lg btn-warning" onclick="submit()">提交并关闭</button>
+                                <button class="btn btn-lg btn-warning" onclick="submit()">提交</button>
                                 <!--<button class="btn btn-lg btn-info">拍照</button>
                                 <button class="btn btn-lg btn-success">上传</button>
                                 <button class="btn btn-lg btn-warning">重置</button><button class="btn btn-lg btn-info">拍照</button>
@@ -600,10 +600,10 @@
         Toast('', '高拍仪正在打开');
         if (size == 0 || size == 1) {
             // 设置A3 A4窗口
-            topWidth=535
+            topWidth=635
             topHeight=360
-            offsetWidth=850;
-            offsetHeight=525;
+            offsetWidth=656;
+            offsetHeight=508;
         } else if (size == 2) {
             // 设置身份证窗口
             topWidth=565

yinet-admin/src/main/resources/templates/sample/zhuxiao/search.html

@@ -14,7 +14,7 @@
 	<body class="bluebg">
 		<header>
             <img class="fl" style="width: 800px;padding: 20px 90px;" src="/print/img/logo_03.png" />
-            <div class="anniu"><a class="button" href="/apply/print/index"><img src="/print/img/index.png"/></a>
+            <div class="anniu"><a class="button" href="/zhuxiao/index"><img src="/print/img/index.png"/></a>
 			<a class="button" onclick="goBack()"><img src="/print/img/fh.png"/></a></div>
 		</header>
         <audio style="display: none"  autoplay="autoplay" id="myaudio" controls>

yinet-admin/src/main/resources/templates/sample/zhuxiao/secound.html

@@ -29,7 +29,7 @@
       <!-- 头部 -->
         <article>
             <div class="divider">
-                <span>赵县行政审批局</span>
+                <span>[[${selfService.name}]]</span>
             </div>
             <div class="content">
                 <div>