Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/ribao.ftl

@@ -148,16 +148,19 @@
                                 <input type="radio" name="radio" value="1" class="weui-check" id="s19" style="width: 10%"/>
                                 <i class="weui-icon-checked"></i>确诊
                             </label>
+                            <br/>
+                            <div style="height: 20px"></div>
                             <label class="weui-radio weui-cell_active weui-check__label" for="s20">
                                 <input type="radio" name="radio" value="2" class="weui-check" id="s20" style="width: 10%">
                                 <i class="weui-icon-checked"></i>疑似
                             </label>
-                            <br style="height: 100px"/>
                             <#--<div style="height: 10px"></div>-->
                             <label class="weui-radio weui-cell_active weui-check__label" for="s21" style="width: 25%">
                                 <input type="radio" name="radio" value="3" class="weui-check" id="s21">
                                 <i class="weui-icon-checked"></i>有接触史
                             </label>
+                            <br/>
+                            <div style="height: 20px"></div>
                             <label class="weui-radio weui-cell_active weui-check__label" for="s22" style="width: 25%">
                                 <input type="radio" name="radio" value="4" class="weui-check" id="s22">
                                 <i class="weui-icon-checked"></i>解除隔离
@@ -348,10 +351,9 @@
             <div id="rb_nav3" class="weui-tab__bd-item ">
                 <div class="weui-panel weui-panel_access">
                 <#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
-                    <div class="weui-panel__hd" style=" font-size: large">${linkman!''}
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工号<span id="doorplateMsg">${doorplate!''}</span></div>
-                    <div class="weui-panel__hd" style=" font-size: large"><span
-                            id="unitMsg">${ridgepole!''}${unit!''}</span></div>
+                    <div class="weui-panel__hd" style=" font-size: large">员工姓名：${linkman!''}</div>
+                    <div class="weui-panel__hd" style=" font-size: large">所在部门：<span id="unitMsg">${ridgepole!''}${unit!''}</span></div>
+                    <div class="weui-panel__hd" style=" font-size: large">员工编号：<span id="doorplateMsg">${doorplate!''}</span></div>
                     <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
                     <input id="uptownId" type="text" hidden="hidden" value="${uptownId!''}"/>
                     <div class="weui-cell weui-cell_select weui-cell_select-after">
@@ -380,7 +382,6 @@
                     <div class="weui-form__opr-area">
                         <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeDoorplate();">确定工号更改</a>
                     </div>
-                    <br/><br/>
                 </div>
             </div>
         </div>