Merge branch 'dev-1.1.4' into 'dev-1.1.4'

排队取药页面自适应调整

See merge request lihong/thmz_system!18

src/main/resources/static/js/mz/pharmacy-cell.js

@@ -162,10 +162,10 @@ function currentTime(){
     //获取date中的秒，如果小于9，则在前面拼接一个0
     var seconds = date.getSeconds()>9?date.getSeconds():'0'+date.getSeconds();
 
-    //获取date中的年、月、日, 拼接星期
-    var dates = date.getFullYear()+'年'+(date.getMonth()+1)+'月'+date.getDate()+'日 '+week[date.getDay()];
-    //拼接时分秒
-    var times = hours+':'+minutes+':'+seconds;
+    //获取date中的年、月、日
+    var dates = date.getFullYear()+'年'+(date.getMonth()+1)+'月'+date.getDate()+'日';
+    //拼接时分秒, 拼接星期
+    var times = hours+':'+minutes+':'+seconds+' '+week[date.getDay()];
 
     //向dateNow节点添加dates(年、月、日, 星期)
     $("#dateNow").html(dates);

src/main/resources/templates/mz/pharmacy-cell.html

@@ -23,7 +23,7 @@
 
     #fulldiv {
         background: url('/thmz/images/back.png')no-repeat;
-        background-size: 100%;
+        background-size: cover;
         width: 100%;
         text-align: center;
         height: 100%;
@@ -53,26 +53,28 @@
             <div class="panel-body">
             </div>
             <div class="row" id="showDiv">
-                <div class="col-md-3 col-sm-3 col-xs-12">
-                    <img src="/thmz/images/logo.png" style="object-fit: cover;width: 300px;"/>
-                </div>
-                <div class="col-md-9 col-sm-9 col-xs-12" style="border-bottom: 6px solid #8ADCA3;height: 100px;padding-top: 10px;">
-                    <div class="col-md-6 col-sm-6 col-xs-12">
-                        <h1 class="title">&nbsp;&nbsp;&nbsp;发药排队&nbsp;&nbsp;&nbsp;</h1></div>
-                    <div class="col-md-6 col-sm-6 col-xs-12">
-                        <div style="text-align: right;padding-right: 50px;font-family: fantasy;">
-                            <span style="font-size: 32px;" id="timeNow"></span><br>
-                            <span style="font-size: 23px;" id="dateNow"></span>
+                <div style="display: flex">
+                    <div class="col-md-3 col-sm-3 col-xs-12" style="width: 300px">
+                        <img src="/thmz/images/logo.png" style="object-fit: cover;width: 300px;"/>
+                    </div>
+                    <div class="col-md-9 col-sm-9" style="border-bottom: 6px solid #8ADCA3;height: 100px;padding-top: 10px;">
+                        <div class="col-md-6 col-sm-6">
+                            <h1 class="title">&nbsp;发药排队&nbsp;</h1></div>
+                        <div class="col-md-6 col-sm-6 col-xs-12">
+                            <div style="text-align: right;padding-right: 30px;font-family: fantasy;">
+                                <span style="font-size: 24px;" id="timeNow"></span><br>
+                                <span style="font-size: 24px;" id="dateNow"></span>
+                            </div>
                         </div>
                     </div>
                 </div>
-                <div style="margin-top: 280px;">
+                <div style="margin-top: 200px;">
                     <button type="button" id="btn_med_in_cert" class="btn btn-primary button-click"
-                            style="background: url('/thmz/images/ybpz.png')no-repeat;margin-right: 100px;cursor:pointer"
+                            style="background: url('/thmz/images/ybpz.png')no-repeat;margin-left: 200px;cursor:pointer"
                             title="医保凭证">
                     </button>
                     <button type="button" id="btn_patient_id" class="btn btn-primary button-click"
-                            style="background: url('/thmz/images/jfpz.png')no-repeat;margin-left: 100px;cursor:pointer"
+                            style="background: url('/thmz/images/jfpz.png')no-repeat;margin-left: 200px;cursor:pointer"
                             title="缴费凭证">
                     </button>
                 </div>