caotao 5 роки тому
батько
коміт
83a1c7f56d

+ 1 - 64
whepi-ui/templates/home/frag.head.ftl

@@ -20,74 +20,11 @@
             font-weight: 300;
             margin: 0 15%;
         }
-        .cx-reset-userhome::before {
-            display: none;
-        }
-        .cx-reset-userhome::after {
-            display: none;
-        }
 
-        .cx-reset-role {
-            height: 100%;
-        }
-        .cx-reset-role .user-header {
-            box-sizing: border-box;
-            height: 50%;
-            padding: 0;
-            position: relative;
-            padding-top: 20%;
-        }
-        .cx-reset-role .weui-form {
-            width: 150px;
-            margin: auto;
-        }
-        .cx-reset-role .weui-cells::after {
-            display: none;
-        }
-        .cx-reset-role .weui-cells::before {
-            display: none;
-        }
-        .cx-reset-role .weui-cells .weui-cell::before {
-            display: none;
-        }
-        .cx-reset-home .page__bd {
-            height: 100%;
-        }
-        .cx-reset-home .weui-cells::before,.cx-reset-home .weui-cells::after {
-            display: none;
-        }
-        .cx-reset-ribao .resetpanel {
-            position: absolute;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-        }
-        .cx-reset-ribao .resetpanel .weui-cell {
-            text-align: center;
-        }
-        .cx-reset-ribao .resetpanel .resetinfo{
-            margin: 0;
-            padding: 0 10px 61px 10px;
-        }
-        .cx-reset-ribao .resetpanel .resetinfo .resetRibaoDigiBaseBtn{
-            height: 46px;
-            background-color: #fff;
-            padding: 5px 0 5px 0;
-            border-top: 1px solid #e5e5e5;
-            z-index: 999;
-        }
-        .cx-reset-ribao .resetpanel .resetinfo .resetRibaoDigiBtn{
-            position: fixed;
-            bottom: 0;
-            left: 0;
-            right: 0;
-        }
 
-        .user-header {
 
+        .user-header {
             padding: 15px 0 5px 0;
-
             /*background-color: #16ae9d;*/
         }
         .user-title {

+ 4 - 44
whepi-ui/templates/home/home.ftl

@@ -4,7 +4,7 @@
 <div class="weui-tab">
     <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
     <input id="uptownId" type="text" hidden="hidden" value=${uptown_id!}/>
-    <div class="weui-tab__bd cx-reset-home">
+    <div class="weui-tab__bd">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
             <#include "/home/ribao.ftl" /></div>
         <#if uptownId != 1238790987234 && uptownId != 5 && uptownId != 100000002>
@@ -16,7 +16,7 @@
     <#--<div id="tab4" class="weui-tab__bd-item">-->
     <#--<h1>页面四</h1> </div>-->
     </div>
-    <div class="weui-tabbar" style="display: none">
+    <div class="weui-tabbar">
         <a id="jt1" href="#tab1" class="weui-tabbar__item weui-bar__item--on">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/order.png" alt=""></div>
             <p class="weui-tabbar__label">健康日报</p>
@@ -51,8 +51,6 @@
     var autoAddr='';
     var longitude = '';
     var latitude = '';
-    var userFamilyStatus = '';
-    var userFamilyStatusStr = '';
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
     <#include "/home/getLocation.js" />
@@ -89,8 +87,8 @@
             }
 
         }
-        // $("#commit").attr("disabled",true).css("pointer-events","none");
-        // $("#commit").css("background-color","#EBEBE4").css("color","#757575");
+        $("#commit").attr("disabled",true).css("pointer-events","none");
+        $("#commit").css("background-color","#EBEBE4").css("color","#757575");
         ribao_init();
         family_init();
         ribao_add();
@@ -405,42 +403,4 @@
         }
     }
 
-    $(function () {
-        var noIos = isAndroidFun()
-        //微信内置浏览器浏览H5页面弹出的键盘遮盖文本框的解决办法
-        if(noIos){
-            window.addEventListener("resize", function () {
-                if (document.activeElement.tagName == "INPUT" || document.activeElement.tagName == "TEXTAREA") {
-                    window.setTimeout(function () {
-                        document.activeElement.scrollIntoViewIfNeeded();
-                    }, 0);
-                }
-            });
-            var clientHeight = $(window).height();
-            $(window).on('resize',function () {
-                var height = $(this).height();
-                if (height < clientHeight) {
-                    $('#resetRibaoDigiBtn').removeClass('resetRibaoDigiBtn');
-                } else {
-                    $('#resetRibaoDigiBtn').addClass('resetRibaoDigiBtn');
-                }
-            })
-        }else {
-            ;(/iphone|ipod|ipad/i.test(navigator.appVersion)) && document.addEventListener('blur', (e) => {
-                ['input', 'textarea'].includes(e.target.localName) && document.body.scrollIntoView(false)
-            }, true)
-        }
-        function isAndroidFun() {
-            var u = navigator.userAgent;
-            var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
-            var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-            if (isAndroid) {
-                return true;
-            }
-            if (isIOS) {
-                return false;
-            }
-        }
-    })
-
 </script>

+ 344 - 386
whepi-ui/templates/home/ribao.ftl

@@ -19,426 +19,385 @@
             </#if>
         </div>
         <div class="weui-tab__panel">
-            <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active" style="position: relative">
-                <div class="weui-panel weui-panel_access resetpanel">
-                    <div style="height: 100%;overflow-y: auto;position: relative">
-                        <div id="notOpenRibao" style="height: 100%;position: relative;">
-                            <div class="weui-cells weui-cells_form" style="margin-top: 0;display: none">
-                                <div class="weui-cell" style="padding: 20px 20px 10px 20px">
-                                    <div class="weui-cell__hd">
-                                        <label class="weui-label">今日居家</label>
-                                    </div>
-                                    <div class="weui-cell__bd" id="ribao_jinrijujian" style="display: none">
-
-                                    </div>
-                                    <div class="">
+            <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
+                <div class="weui-panel weui-panel_access">
+                    <div id="notOpenRibao">
+                        <div class="weui-cells weui-cells_form">
+                            <div class="weui-cell weui-cell_vcode" style="height: 7vh">
+                                <div class="weui-cell__hd">
+                                    <label class="weui-label">今日居家</label>
+                                </div>
+                                <div class="weui-cell__bd" id="ribao_jinrijujian">
 
-                                    </div>
-                                    <button id="" href="javascript:"
+                                </div>
+                                <div class="weui-cell__ft">
+                                    <button id="btnAdd" href="javascript:" style="height:5vh; margin-right: 3vh;"
                                             class="weui-btn weui-btn_mini weui-btn_primary">添加人员
                                     </button>
                                 </div>
                             </div>
-                            <div id="rb_family">
-                            <#--<div class="weui-media-box weui-media-box_text">-->
-                            <#--<h4 class="weui-media-box__title">家人1:咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
-                            <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体,叫做星球。星球有一定的形状,有自己的运行轨道。</p>-->
-                            <#--</div>-->
-                            </div>
-                            <div class="weui-cells__tips" style="margin: 0"> <span style="color: red; display: none">
+                        </div>
+                        <div id="rb_family">
+                        <#--<div class="weui-media-box weui-media-box_text">-->
+                        <#--<h4 class="weui-media-box__title">家人1:咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
+                        <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体,叫做星球。星球有一定的形状,有自己的运行轨道。</p>-->
+                        <#--</div>-->
+                        </div>
+                        <div class="weui-cells__tips"> <span style="color: red; display: none">
                         <br/>
                         注:请如实上报情况,便以相互帮助,小区是我家,团结就是力量!后期会有医生跟踪分析,给予大家医疗建议,请认真填报!
                     </span></div>
-                            <div class="weui-btn-area"
-                                 style="position: absolute;bottom: 0;left: 0;width: 100%;margin: 0;padding-bottom:10px;text-align: center">
-                        <span style="color: red;font-size:20px" id="txt_shangbao">
+                        <div class="weui-btn-area" style="text-align: center">
+                        <span style="color: red;font-size:x-large" id="txt_shangbao">
                             今日未上报
-                       </span><br/> <span style="color: red;font-size:20px" id="txt_shangbaotime">
+                       </span><br/> <span style="color: red;font-size:x-large" id="txt_shangbaotime">
                        </span>
-                                <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:"
-                                   id="showTooltips"
-                                   style="background-color: #D9D9D9;width: 200px"
-                                   onclick="addReport()">上报</a>
-                                <a id="btnAdd" class="weui-btn weui-btn_primary" href="javascript:"
-                                   style="width: 200px;display: none;">填报</a>
-                            </div>
+                            <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
+                               style="background-color: #D9D9D9"
+                               onclick="addReport()">上报</a>
                         </div>
-                        <div id="ribao" class="weui-btn-area resetinfo" style="display: none;">
-                            <#--<div style="text-align: center;padding: 5px 0;font-size: 16px;font-weight: 600;">基本信息</div>-->
-                                <div class="weui-loadmore weui-loadmore_line" style="margin: 20px 0 0 0;width: 100%;height: 20px;">
-                                    <span class="weui-loadmore__tips">基本信息</span>
-                                </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between;">
-                                <input id="js_input_user_name" class="weui-input" autofocus="" type="text"
-                                       placeholder="请输入姓名"
-                                       maxlength="20"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px; width: 30%; text-align: center;"/>
-                                <input id="js_input_user_sex" class="weui-input" autofocus="" type="text"
-                                       placeholder="性别"
-                                       maxlength="20"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px; width: 25%; text-align: center;"/>
-                                <input id="js_input_user_age" class="weui-input" autofocus="" type="number"
-                                       pattern="[0-9]*"
-                                       placeholder="年龄"
-                                       maxlength="3"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px; width: 25%; text-align: center;"/>
-                            </div>
-                            <div id="ribao_jbqk">
-                                <div style="height: 30px; line-height: 30px;margin-left: 2vw; display: none;">健康情况</div>
-                                <div class="weui-cells weui-cells_checkbox" style="display: none;">
-                                    <label class="weui-cell weui-cell_active weui-check__label" for="s11">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" class="weui-check" name="checkbox1" id="s11">
-                                            <i class="weui-icon-checked"></i>
-                                        </div>
-                                        <div class="weui-cell__bd">
-                                            <p>心脑血管疾病(服用ARB)</p>
-                                        </div>
-                                    </label>
-                                    <label class="weui-cell weui-cell_active weui-check__label" for="s12">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox2" class="weui-check" id="s12">
-                                            <i class="weui-icon-checked"></i>
-                                        </div>
-                                        <div class="weui-cell__bd">
-                                            <p>心脑血管疾病(未服ARB)</p>
-                                        </div>
-                                    </label>
-                                    <label class="weui-cell weui-cell_active weui-check__label" for="s13">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox3" class="weui-check" id="s13">
-                                            <i class="weui-icon-checked"></i>
-                                        </div>
-                                        <div class="weui-cell__bd">
-                                            <p>呼吸系统病史</p>
-                                        </div>
-                                    </label>
-                                    <label class="weui-cell weui-cell_active weui-check__label" for="s14">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox4" class="weui-check" id="s14">
-                                            <i class="weui-icon-checked"></i>
-                                        </div>
-                                        <div class="weui-cell__bd">
-                                            <p>肿瘤病史</p>
-                                        </div>
-                                    </label>
-                                    <label class="weui-cell weui-cell_active weui-check__label" for="s15">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox5" class="weui-check" id="s15">
-                                            <i class="weui-icon-checked"></i>
-                                        </div>
-                                        <div class="weui-cell__bd">
-                                            <p>糖尿病史</p>
-                                        </div>
-                                    </label>
-                                    <label class="weui-cell weui-cell_active weui-check__label" for="s16">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox6" class="weui-check" id="s16">
-                                            <i class="weui-icon-checked"></i>
-                                        </div>
-                                        <div class="weui-cell__bd">
-                                            <p>服用过激素药物</p>
-                                        </div>
-                                    </label>
-                                    <label class="weui-cell weui-cell_active weui-check__label" for="s17">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox7" class="weui-check" id="s17">
-                                            <i class="weui-icon-checked"></i>
-                                        </div>
-                                        <div class="weui-cell__bd">
-                                            <p>妊娠期</p>
-                                        </div>
-                                    </label>
-                                </div>
-                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 10px;">
-                                    <div style="color: black;height: 30px;line-height: 30px; width: 35%;">健康情况</div>
-                                    <input id="js_input_user_status"
-                                           class="weui-input" autofocus=""
-                                           type="text"
-                                           placeholder="请选择"
-                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
-                                </div>
-
+                    </div>
+                    <div id="ribao" class="weui-btn-area" style="display: none">
+                        <div style="text-align: center;">基本信息</div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between;">
+                            <input id="js_input_user_name" class="weui-input" autofocus="" type="text"
+                                   placeholder="请输入姓名"
+                                   maxlength="20"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 30%; text-align: center;"/>
+                            <input id="js_input_user_sex" class="weui-input" autofocus="" type="text" placeholder="性别"
+                                   maxlength="20"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;"/>
+                            <input id="js_input_user_age" class="weui-input" autofocus="" type="text" placeholder="年龄"
+                                   maxlength="3"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;"/>
+                        </div>
+                        <div id="ribao_jbqk">
+                            <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">基本情况</div>
+                            <div class="weui-cells weui-cells_checkbox">
+                                <label class="weui-cell weui-cell_active weui-check__label" for="s11">
+                                    <div class="weui-cell__hd">
+                                        <input type="checkbox" class="weui-check" name="checkbox1" id="s11">
+                                        <i class="weui-icon-checked"></i>
+                                    </div>
+                                    <div class="weui-cell__bd">
+                                        <p>心脑血管疾病(服用ARB)</p>
+                                    </div>
+                                </label>
+                                <label class="weui-cell weui-cell_active weui-check__label" for="s12">
+                                    <div class="weui-cell__hd">
+                                        <input type="checkbox" name="checkbox2" class="weui-check" id="s12">
+                                        <i class="weui-icon-checked"></i>
+                                    </div>
+                                    <div class="weui-cell__bd">
+                                        <p>心脑血管疾病(未服ARB)</p>
+                                    </div>
+                                </label>
+                                <label class="weui-cell weui-cell_active weui-check__label" for="s13">
+                                    <div class="weui-cell__hd">
+                                        <input type="checkbox" name="checkbox3" class="weui-check" id="s13">
+                                        <i class="weui-icon-checked"></i>
+                                    </div>
+                                    <div class="weui-cell__bd">
+                                        <p>呼吸系统病史</p>
+                                    </div>
+                                </label>
+                                <label class="weui-cell weui-cell_active weui-check__label" for="s14">
+                                    <div class="weui-cell__hd">
+                                        <input type="checkbox" name="checkbox4" class="weui-check" id="s14">
+                                        <i class="weui-icon-checked"></i>
+                                    </div>
+                                    <div class="weui-cell__bd">
+                                        <p>肿瘤病史</p>
+                                    </div>
+                                </label>
+                                <label class="weui-cell weui-cell_active weui-check__label" for="s15">
+                                    <div class="weui-cell__hd">
+                                        <input type="checkbox" name="checkbox5" class="weui-check" id="s15">
+                                        <i class="weui-icon-checked"></i>
+                                    </div>
+                                    <div class="weui-cell__bd">
+                                        <p>糖尿病史</p>
+                                    </div>
+                                </label>
+                                <label class="weui-cell weui-cell_active weui-check__label" for="s16">
+                                    <div class="weui-cell__hd">
+                                        <input type="checkbox" name="checkbox6" class="weui-check" id="s16">
+                                        <i class="weui-icon-checked"></i>
+                                    </div>
+                                    <div class="weui-cell__bd">
+                                        <p>服用过激素药物</p>
+                                    </div>
+                                </label>
+                                <label class="weui-cell weui-cell_active weui-check__label" for="s17">
+                                    <div class="weui-cell__hd">
+                                        <input type="checkbox" name="checkbox7" class="weui-check" id="s17">
+                                        <i class="weui-icon-checked"></i>
+                                    </div>
+                                    <div class="weui-cell__bd">
+                                        <p>妊娠期</p>
+                                    </div>
+                                </label>
                             </div>
+                        </div>
 
-                        <#--<textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"-->
-                        <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 5px;"></textarea>-->
-                            <input id="suspectedId" type="text" hidden="hidden" value=""/>
-                            <#--<div style="height: 30px; line-height: 30px;">病情描述</div>-->
-                                <div class="weui-loadmore weui-loadmore_line" style="margin: 20px 0 0 0;width: 100%;height: 20px">
-                                    <span class="weui-loadmore__tips">病情描述</span>
-                                </div>
+                    <#--<textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"-->
+                    <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>-->
+                        <input id="suspectedId" type="text" hidden="hidden" value=""/>
+                        <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
 
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">新冠肺炎</div>
-                            <#--<input id="switchQuezhen" class="weui-input" autofocus="" type="text" placeholder="请选择"-->
-                            <#--maxlength="20"-->
-                            <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>-->
-                                <div class="weui-cells_checkbox" style="width: 125%;display: none;">
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s18">
-                                        <input type="radio" name="radio" value="0" class="weui-check" id="s18"
-                                               style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>无
-                                    </label>
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s19">
-                                        <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>
-                                <#--<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>解除隔离
-                                    </label>
-                                </div>
-                                <input id="js_input_user_crov19"
-                                       class="weui-input"
-                                       autofocus=""
-                                       type="text"
-                                       placeholder="请选择"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
-                            </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 60px; line-height: 30px; flex: 8">
-                                    家庭成员中有新冠肺炎疫情或有过病例接触史人员
-                                </div>
-                                <div class="weui-cells_checkbox" style="flex: 5; margin-top: 15px;">
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s28" style="padding: 10px 0 10px 10px;">
-                                        <input type="radio" name="radio1" value="0" class="weui-check" id="s28"
-                                               style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>否
-                                    </label>
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s29" style="padding: 10px 0 10px 10px;">
-                                        <input type="radio" name="radio1" value="1" class="weui-check" id="s29"
-                                               style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>是
-                                    </label>
-                                </div>
-                            </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 60px; line-height: 30px;flex: 8;">
-                                    近期接触的家庭成员中有感冒、发热、咳嗽等症状
-                                </div>
-                                <div class="weui-cells_checkbox" style="flex: 5; margin-top: 15px;">
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s38" style="padding: 10px 0 10px 10px;">
-                                        <input type="radio" name="radio2" value="0" class="weui-check" id="s38"
-                                               style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>否
-                                    </label>
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s39" style="padding: 10px 0 10px 10px;">
-                                        <input type="radio" name="radio2" value="1" class="weui-check" id="s39"
-                                               style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>是
-                                    </label>
-                                </div>
-                            </div>
-                        <#--<div id="ribao_djgl">-->
-                        <#--<div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">-->
-                        <#--<div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>-->
-                        <#--<input id="switchDanjiangeli" class="weui-input" autofocus="" type="text"-->
-                        <#--placeholder="请选择"-->
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">新冠肺炎</div>
+                        <#--<input id="switchQuezhen" class="weui-input" autofocus="" type="text" placeholder="请选择"-->
                         <#--maxlength="20"-->
                         <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>-->
-                        <#--</div>-->
-                        <#--</div>-->
-
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">体温</div>
-                                <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="number"
-                                       placeholder="请输入"
-                                       maxlength="4"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
+                            <div class="weui-cells_checkbox" style="width: 125%">
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s18">
+                                    <input type="radio" name="radio" value="0" class="weui-check" id="s18"
+                                           style="width: 10%"/>
+                                    <i class="weui-icon-checked"></i>无
+                                </label>
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s19">
+                                    <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>
+                            <#--<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>解除隔离
+                                </label>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">咳嗽现象</div>
-                                <input id="js_input_user_kesou" class="weui-input" autofocus="" type="text"
-                                       placeholder="请选择"
-                                       maxlength="20"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 150%;">
+                                家庭成员中有新冠肺炎疫情或有过病例接触史人员
+                            </div>
+                            <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s28">
+                                    <input type="radio" name="radio1" value="0" class="weui-check" id="s28"
+                                           style="width: 10%"/>
+                                    <i class="weui-icon-checked"></i>否
+                                </label>
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s29">
+                                    <input type="radio" name="radio1" value="1" class="weui-check" id="s29"
+                                           style="width: 10%"/>
+                                    <i class="weui-icon-checked"></i>是
+                                </label>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px;line-height: 30px; width: 35%;">肌肉酸痛</div>
-                                <input id="js_input_user_jirou" class="weui-input" autofocus="" type="text"
-                                       placeholder="请选择"
-                                       maxlength="20"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 150%;">
+                                近期接触的家庭成员中有感冒、发热、咳嗽等症状
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px;line-height: 30px; width: 35%;">呼吸困难</div>
-                                <input id="js_input_user_huxi" class="weui-input" autofocus="" type="text"
-                                       placeholder="请选择"
-                                       maxlength="20"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
+                            <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s38">
+                                    <input type="radio" name="radio2" value="0" class="weui-check" id="s38"
+                                           style="width: 10%"/>
+                                    <i class="weui-icon-checked"></i>否
+                                </label>
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s39">
+                                    <input type="radio" name="radio2" value="1" class="weui-check" id="s39"
+                                           style="width: 10%"/>
+                                    <i class="weui-icon-checked"></i>是
+                                </label>
+                            </div>
+                        </div>
+                    <#--<div id="ribao_djgl">-->
+                    <#--<div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">-->
+                    <#--<div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>-->
+                    <#--<input id="switchDanjiangeli" class="weui-input" autofocus="" type="text"-->
+                    <#--placeholder="请选择"-->
+                    <#--maxlength="20"-->
+                    <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>-->
+                    <#--</div>-->
+                    <#--</div>-->
+
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">体温</div>
+                            <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="number"
+                                   placeholder="请输入"
+                                   maxlength="4"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">咳嗽现象</div>
+                            <input id="js_input_user_kesou" class="weui-input" autofocus="" type="text"
+                                   placeholder="请选择"
+                                   maxlength="20"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh;line-height: 5vh; width: 55%;">肌肉酸痛</div>
+                            <input id="js_input_user_jirou" class="weui-input" autofocus="" type="text"
+                                   placeholder="请选择"
+                                   maxlength="20"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh;line-height: 5vh; width: 55%;">呼吸困难</div>
+                            <input id="js_input_user_huxi" class="weui-input" autofocus="" type="text" placeholder="请选择"
+                                   maxlength="20"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">乏力现象</div>
+                            <input id="js_input_user_fali" class="weui-input" autofocus="" type="text" placeholder="请选择"
+                                   maxlength="20"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">腹泻现象</div>
+                            <input id="js_input_user_fuxie" class="weui-input" autofocus="" type="text"
+                                   placeholder="请选择"
+                                   maxlength="20"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh;width: 55%;">其他描述</div>
+                            <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容(300字内)" rows="5"
+                                      style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh;width: 55%;">
+                                <button id="ribao_score" style="height:5vh;"
+                                        class="weui-btn weui-btn_mini weui-btn_primary">健康评估
+                                </button>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">乏力现象</div>
-                                <input id="js_input_user_fali" class="weui-input" autofocus="" type="text"
-                                       placeholder="请选择"
-                                       maxlength="20"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
+                            <input id="js_input_score_rezult" class="weui-input" autofocus="" readonly="readonly"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                            <input id="js_input_score_rezult_value" type="text" hidden="hidden"/>
+                            <input id="js_input_temperature_score" type="text" hidden="hidden"/>
+                            <input id="js_input_score_histroy" type="text" hidden="hidden"/>
+                            <input id="js_input_score" type="text" hidden="hidden"/>
+                        </div>
+                    <#--<div style="display: flex; justify-content: center;">-->
+                    <#--<div style="width: 70%;color: red; text-align: center;">-->
+                    <#--<br/>-->
+                    <#--自愿填写病情描述(温度为必填项),提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议-->
+                    <#--</div>-->
+                    <#--</div>-->
+                        <div id="ribao_trip" class="weui-btn-area"><#--style="display: none"-->
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">工作驻地</div>
+                                <input id="js_input_gzzd" class="weui-input" type="text" placeholder="请选择"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                       onchange="selectinput1(this)"/>
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <input id="js_input_qtdd" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
+                                       style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">腹泻现象</div>
-                                <input id="js_input_user_fuxie" class="weui-input" autofocus="" type="text"
-                                       placeholder="请选择"
-                                       maxlength="20"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">今晚住地</div>
+                                <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                       onchange="selectinput2(this)"/>
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <input id="js_input_jrszq" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
+                                       style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px;width: 35%;">其他描述</div>
-                                <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容(300字内)" rows="2"
-                                          style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 5px;"></textarea>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">是否跨市出行</div>
+                                <input id="js_input_sf" class="weui-input" type="text" placeholder="请选择"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 90%"
+                                       onchange="selectinput6(this)"/>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px;width: 35%;">
-                                    <button id="ribao_score" style="height:30px;"
-                                            class="weui-btn weui-btn_mini weui-btn_primary">健康评估
-                                    </button>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="height: 5vh; line-height: 5vh; color: red">
+                                    注:本地区出行无需填写行程,到达今晚住地后请重新填写行程,保证行程正确
                                 </div>
-                                <input id="js_input_score_rezult" class="weui-input" autofocus="" readonly="readonly"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
-                                <input id="js_input_score_rezult_value" type="text" hidden="hidden"/>
-                                <input id="js_input_temperature_score" type="text" hidden="hidden"/>
-                                <input id="js_input_score_histroy" type="text" hidden="hidden"/>
-                                <input id="js_input_score" type="text" hidden="hidden"/>
                             </div>
-                        <#--<div style="display: flex; justify-content: center;">-->
-                        <#--<div style="width: 70%;color: red; text-align: center;">-->
-                        <#--<br/>-->
-                        <#--自愿填写病情描述(温度为必填项),提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议-->
-                        <#--</div>-->
-                        <#--</div>-->
-                                <div class="weui-loadmore weui-loadmore_line" style="margin: 20px 0 0 0;width: 100%;height: 20px">
-                                    <span class="weui-loadmore__tips">驻地情况</span>
+                            <br/>
+                        <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
+
+                            <div id="none">
+                                <div class="weui-loadmore weui-loadmore_line" style="width: 100%;height: 1vh;">
+                                    <span class="weui-loadmore__tips">出行情况上报</span>
                                 </div>
-                            <div id="ribao_trip" class="weui-btn-area" style="margin: 0"><#--style="display: none"-->
-                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 0;">
-                                    <div style="height: 30px; line-height: 30px; width: 35%;">工作驻地</div>
-                                    <input id="js_input_gzzd" class="weui-input" type="text" placeholder="请选择"
-                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 50%"
-                                           onchange="selectinput1(this)"/>
+                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
+                                    <div style="height: 5vh; line-height: 5vh; width: 55%;">出发地</div>
+                                    <input id="js_input_cfd" class="weui-input" type="text" placeholder="请选择"
+                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                           onchange="selectinput3(this)"/>
                                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <input id="js_input_qtdd" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
-                                           style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 30px;font-size:inherit;color:inherit;"/>
+                                    <input id="js_input_cfdq" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
+                                           style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                                 </div>
-                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                    <div style="height: 30px; line-height: 30px; width: 35%;">今晚住地</div>
-                                    <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择"
-                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 50%"
-                                           onchange="selectinput2(this)"/>
+                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                    <div style="height: 5vh; line-height: 5vh; width: 55%;">目的地</div>
+                                    <input id="js_input_mdd" class="weui-input" type="text" placeholder="请选择"
+                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                           onchange="selectinput4(this)"/>
                                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <input id="js_input_jrszq" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
-                                           style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 30px;font-size:inherit;color:inherit;"/>
+                                    <input id="js_input_mddq" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
+                                           style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                                 </div>
-                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                    <div style="height: 30px; line-height: 30px; width: 50%;">是否跨市出行</div>
-                                    <input id="js_input_sf" class="weui-input" type="text" placeholder="请选择"
-                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 90%"
-                                           onchange="selectinput6(this)"/>
+                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                    <div style="height: 5vh; line-height: 5vh; width: 55%;">出行方式</div>
+                                    <input id="js_input_cxfs" class="weui-input" type="text" placeholder="请选择出行方式"
+                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                           onchange="selectinput5(this)"/>
+                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <input id="js_input_cxfsq" placeholder="车次/航班/车牌" type="text"
+                                           style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
+
                                 </div>
-                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 10px;">
-                                    <div style="height: 30px; line-height: 30px; color: red">
-                                        注:本地区出行无需填写行程,到达今晚住地后请重新填写行程,保证行程正确
-                                    </div>
+                                <div class="weui-cell__ft" style="margin-top: 1vh;">
+                                    <button href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
+                                            class="weui-btn weui-btn_mini weui-btn_primary" onclick="insertlingyun()">添加
+                                    </button>
                                 </div>
-                                <br/>
-                            <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
-
-                                <div id="none">
-                                    <div class="weui-loadmore weui-loadmore_line" style="width: 100%;height: 5px;">
-                                        <span class="weui-loadmore__tips">出行情况上报</span>
-                                    </div>
-                                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 30px;">
-                                        <div style="height: 30px; line-height: 30px; width: 35%;">出发地</div>
-                                        <input id="js_input_cfd" class="weui-input" type="text" placeholder="请选择"
-                                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 50%"
-                                               onchange="selectinput3(this)"/>
-                                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                        <input id="js_input_cfdq" placeholder="仅填市级如,上海市" disabled="disabled"
-                                               type="text"
-                                               style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 30px;font-size:inherit;color:inherit;"/>
-                                    </div>
-                                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 10px;">
-                                        <div style="height: 30px; line-height: 30px; width: 35%;">目的地</div>
-                                        <input id="js_input_mdd" class="weui-input" type="text" placeholder="请选择"
-                                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 50%"
-                                               onchange="selectinput4(this)"/>
-                                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                        <input id="js_input_mddq" placeholder="仅填市级如,上海市" disabled="disabled"
-                                               type="text"
-                                               style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 30px;font-size:inherit;color:inherit;"/>
-                                    </div>
-                                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 10px;">
-                                        <div style="height: 30px; line-height: 30px; width: 35%;">出行方式</div>
-                                        <input id="js_input_cxfs" class="weui-input" type="text" placeholder="请选择出行方式"
-                                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 50%"
-                                               onchange="selectinput5(this)"/>
-                                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                        <input id="js_input_cxfsq" placeholder="车次/航班/车牌" type="text"
-                                               style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 30px;font-size:inherit;color:inherit;"/>
-
-                                    </div>
-                                    <div class="weui-cell__ft" style="margin-top: 10px;">
-                                        <button href="javascript:" style="height:30px; margin-right: 0;width: 70px;"
-                                                class="weui-btn weui-btn_mini weui-btn_primary"
-                                                onclick="insertlingyun()">添加
-                                        </button>
-                                    </div>
-                                    <div class="weui-loadmore tt" style="width: 100%;height: 10px;margin-top: 10px;">
-                                    </div>
-                                    <div>
-                                        <table cellspacing="0" cellpadding="0" style="width: 100%">
-                                            <tbody id="tabtr"><#--border="1" cellspacing="0" cellpadding="0"-->
-                                            <tr style="background-color: #f8f8f8;">
-                                            <#-- <td style="text-align: center;">序号</td>
+                                <div class="weui-loadmore tt" style="width: 100%;height: 1vh;margin-top: 1vh;">
+                                </div>
+                                <div>
+                                    <table cellspacing="0" cellpadding="0" style="width: 100%">
+                                        <tbody id="tabtr"><#--border="1" cellspacing="0" cellpadding="0"-->
+                                        <tr style="background-color: #f8f8f8;">
+                                        <#-- <td style="text-align: center;">序号</td>
                                 <td style="text-align: center;">出发地</td>
                                 <td style="text-align: center;">目的地</td>
                                 <td style="text-align: center;">出行方式</td>
                                 <td style="text-align: center;">车次/航班/车牌</td>-->
-                                            </tr>
-                                            </tbody>
-                                        </table>
-                                        <table id="tab5" class="new_tab" align="left" cellpadding="0" cellspacing="0"
-                                               style="width: 100%;">
-                                        </table>
-                                    </div>
-                                </div>
-
-                            </div>
-                            <div style="display: flex; justify-content: center;">
-                                <div style="color: red">
-                                    <br/>
-                                    本人郑重声明,上述信息是我本人或代他人填写,本人对信息内容真实性和完整性负责,因信息填报不实导致相关后果的,本人愿承担相应责任。
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <table id="tab5" class="new_tab" align="left" cellpadding="0" cellspacing="0"
+                                           style="width: 100%;">
+                                    </table>
                                 </div>
                             </div>
-                            <div class="resetRibaoDigiBtn resetRibaoDigiBaseBtn" id="resetRibaoDigiBtn">
-                                <div style="display:flex; flex-direction: row; justify-content: space-between;">
-                                    <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default"
-                                       style="width: 100px;">取消</a>
-                                    <a id="commit" href="javascript:;" onclick="ribaoCommit();"
-                                       class="weui-btn weui-btn_primary"
-                                       style="margin-top: 0;width: 100px;">提交</a>
-                                </div>
+
+                        </div>
+                        <div style="display: flex; justify-content: center;">
+                            <div style="color: red">
+                                <br/>
+                                本人郑重声明,上述信息是我本人或代他人填写,本人对信息内容真实性和完整性负责,因信息填报不实导致相关后果的,本人愿承担相应责任。
                             </div>
-                            <div id="dingwei" style="display: flex; justify-content: center;">
-                                <div style="color: blue">
-                                    正在获取定位信息,请保证开启手机定位和微信定位
-                                </div>
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh; margin-bottom: 5vh;">
+                            <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default"
+                               style="width: 30%;">取消</a>
+                            <a id="commit" href="javascript:;" onclick="ribaoCommit();"
+                               class="weui-btn weui-btn_primary"
+                               style="margin-top: 0;width: 30%;">提交</a>
+                        </div>
+                        <div id="dingwei" style="display: flex; justify-content: center;">
+                            <div style="color: blue">
+                                正在获取定位信息,请保证开启手机定位和微信定位
                             </div>
                         </div>
                     </div>
@@ -449,7 +408,7 @@
             <div id="rb_nav2" class="weui-tab__bd-item ">
                 <div id="my-input-ribao"></div>
                 <div class="weui-panel weui-panel_access">
-                    <div class="weui-panel__hd" style="font-size: 16px">个人信息</div>
+                    <div class="weui-panel__hd" style="color: #0bb20c; font-size: large">我的家人</div>
                     <div class="weui-panel__bd" id="ribao_famliy">
                     <#--<div class="weui-media-box weui-media-box_text">-->
                     <#--<h4 class="weui-media-box__title">家人1:咳嗽、乏力、未确诊</h4>-->
@@ -470,7 +429,7 @@
                     <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="departmentMsg">${departmentName!''}</span></div>
+                                id="departmentMsg">${departmentName!''}</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!''}"/>
@@ -492,13 +451,12 @@
                         </div>
                         <div class="weui-cell__bd">
                             <select class="weui-select" id="newDepartmentId">
-                            <#--                                <option>请选择</option>-->
+<#--                                <option>请选择</option>-->
                             </select>
                         </div>
                     </div>
                     <div class="weui-form__opr-area">
-                        <a class="weui-btn weui-btn_primary" href="javascript:;"
-                           onclick="changeDepartmentId();">确定部门更改</a>
+                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeDepartmentId();">确定部门更改</a>
                     </div>
                     <div>
                         <div class="weui-cells__title" id="menpaiTitle">更改工号</div>

+ 124 - 364
whepi-ui/templates/home/ribao.js

@@ -182,113 +182,42 @@ function ribao_init() {
       }]
   });
 
-  var userStatus = [
-      {
-          title: "无病史",
-          value: 0,
-      },
+  $("#js_input_user_status").select({
+    title: "选择基本状况",
+    items: [
       {
-          title: "心脑血管疾病(服用ARB)",
-          value: 1,
+        title: "无病史",
+        value: "0",
+      }, {
+        title: "心脑血管疾病(服用ARB)",
+        value: "1",
       },
       {
-          title: "心脑血管疾病(未服ARB)",
-          value: 2,
+        title: "心脑血管疾病(未服ARB)",
+        value: "2",
       },
       {
-          title: "呼吸系统病史",
-          value: 3,
+        title: "呼吸系统病史",
+        value: "3",
       },
       {
-          title: "肿瘤病史",
-          value: 4,
+        title: "肿瘤病史",
+        value: "4",
       },
       {
-          title: "糖尿病史",
-          value: 5,
+        title: "糖尿病史",
+        value: "5",
       },
       {
-          title: "服用过激素药物",
-          value: 6,
+        title: "服用过激素药物",
+        value: "6",
       },
       {
-          title: "妊娠期",
-          value: 7,
-      }
-      ];
-
-  $("#js_input_user_status").select({
-    title: "选择基本状况",
-      multi: true,
-    items: userStatus,
-      // onOpen:function (e) {
-      //   var target = $("#js_input_user_status");
-      //   console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
-      //   target.val(userFamilyStatusStr);
-      //   target.data('values',userFamilyStatus);
-      //     console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
-      // }
-    // onChange:function(e){
-    //   var selectStr = e.values
-    //   if(!selectStr){
-    //     $("#js_input_user_status").select('update',{
-    //       multi: true,
-    //     })
-    //   }else {
-    //     if(selectStr.indexOf('0')>-1){
-    //       $("#js_input_user_status").select('update',{
-    //         multi: false,
-    //       })
-    //     }else {
-    //       $("#js_input_user_status").select('update',{
-    //         multi: true,
-    //       })
-    //     }
-    //   }
-    //     // var target = $("#js_input_user_status");
-    //     // console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
-    //   console.log(e)
-    // },
-    beforeClose:function (e) {
-      if(e){
-        if(e.indexOf('0')>-1 && e.length>1){
-          $.toast("无病史不能与其他项同时被选中", "text");
-          return false
-        }else {
-          return true
-        }
-      }
-    }
-
-  });
-
-  $("#js_input_user_crov19").select({
-    title: "选择基本状况",
-    items: [
-        {
-            title: "无",
-            value: "0",
-        },
-        {
-            title: "确诊",
-            value: "1",
-        },
-        {
-            title: "疑似",
-            value: "2",
-        },
-        {
-            title: "有接触史",
-            value: "3",
-        },
-        {
-            title: "解除隔离",
-            value: "4",
-        },
-    ],
+        title: "妊娠期",
+        value: "7",
+      }]
   });
 
-
   $("#js_input_user_kesou").select({
     title: "选择咳嗽情况",
     items: [
@@ -735,7 +664,7 @@ function tab() {
     html += "<td style='text-align: center;' >" + listcx[i].endlocalStr + " </td>";
     html += "<td style='text-align: center;' >" + listcx[i].tripTypeStr + " </td>";
     html += "<td style='text-align: center;' >" + listcx[i].tripTypeDesp + " </td>";
-    html += "<td style='text-align: center;' ><button value=" + i + " style='height:30px;padding:0 10px;background-color: red;text-align: center;' class='weui-btn weui-btn_mini weui-btn_primary' onclick='splice(this.value)'>" + "删除" + " </button></td>";
+    html += "<td style='text-align: center;' ><button value=" + i + " style='height:5vh;background-color: red;text-align: center; with:60%' class='weui-btn weui-btn_mini weui-btn_primary' onclick='splice(this.value)'>" + "删除" + " </button></td>";
 
     html += "</tr>";
     $("#tabtr").html(html);
@@ -747,36 +676,6 @@ function splice(obj) {
   tab()
 }
 
-function changeReportBtnState(list) {
-  console.log(list)
-    if(!list){
-        $('#btn_shangbao').css({
-            display: 'none'
-        })
-        $('#btnAdd').css({
-            display: 'block'
-        })
-    }else {
-        if(list.length){
-            $('#btn_shangbao').css({
-                display: 'block'
-            })
-            $('#btnAdd').css({
-                display: 'none'
-            })
-        }else {
-            $('#btn_shangbao').css({
-                display: 'none'
-            })
-            $('#btnAdd').css({
-                display: 'block'
-            })
-        }
-
-    }
-
-}
-
 //首次近日报告
 function ribaoInitialization(reportId) {
   if (reportId == null)
@@ -794,17 +693,13 @@ function ribaoInitialization(reportId) {
         $('#rb_family').empty();
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
         canSahngbao = false;
-        changeReportBtnState(data.data)
       }
       else {
         if (data.data.length > 0) {
           hasData = true;
-            changeReportBtnState(data.data)
           data.data.forEach(function (v) {
             ribao_cell(v);
           });
-        }else {
-            changeReportBtnState(data.data)
         }
       }
     },
@@ -826,18 +721,15 @@ function ribao_refrash() {
       if (data.data == undefined || data.data == "") {
         $('#rb_family').empty();
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
-          changeReportBtnState(data.data)
       }
       else {
         $('#rb_family').empty();
         if (data.data.length > 0) {
-            changeReportBtnState(data.data)
           hasData = true;
           data.data.forEach(function (v) {
             ribao_cell(v);
           });
         } else {
-            changeReportBtnState(data.data)
         }
       }
     },
@@ -847,12 +739,12 @@ function ribao_refrash() {
 }
 
 function ribao_cell(v) {
-  var userName = v.userName;
+  var userName = v.userName + ":";
   var grender = getGreder(v.grender);
   var age = v.age;
   var familyStatus = "";
   if (v.familyStatus != 0)
-    familyStatus = getFamilyStatus(v.familyStatus) + ";";
+    familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
   var medical = "";
   if (v.medical != 0)
     medical = "新冠肺炎:" + getMedical(v.medical) + ";";
@@ -922,35 +814,16 @@ function ribao_cell(v) {
 
   }
 
-  // $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: auto">\n' +
-  //   '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
-  //   '                                      &nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改上报</a></h4>\n' +
-  //   '                                      <div style="height: auto">' + familyStatus + medical + isContact + isSuspected + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</>\n' +
-  //   '                                    </div>\n' +
-  //   '                              '));
-  $('#rb_family').append($('<div class="weui-form-preview">\n' +
-      '  <div class="weui-form-preview__hd">\n' +
-      '    <label class="weui-form-preview__label">员工</label>\n' +
-      '    <em class="weui-form-preview__value">'+userName + '&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;' +
-      '    </em>\n' +
-      '  </div>\n' +
-      '  <div class="weui-form-preview__bd">\n' +
-      '    <div class="weui-form-preview__item">\n' +
-      '      <label class="weui-form-preview__label">基本情况</label>\n' +
-      '      <span class="weui-form-preview__value" style="text-align: left;">'+familyStatus + medical + isContact + isSuspected + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet+'</span>\n' +
-      '    </div>\n' +
-      '  </div>\n' +
-      '  <div class="weui-form-preview__ft">\n' +
-      '    <a class="weui-form-preview__btn weui-form-preview__btn_default" style="color: #bc4246" href="javascript:" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
-      '    <button class="weui-form-preview__btn weui-form-preview__btn_primary" style="color:#2a62bc" href="javascript:" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改上报</button>\n' +
-      '  </div>\n' +
-      '</div>'));
+  $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: auto">\n' +
+    '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
+    '                                      &nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改上报</a></h4>\n' +
+    '                                      <div style="height: auto">' + familyStatus + medical + isContact + isSuspected + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</>\n' +
+    '                                    </div>\n' +
+    '                              '));
 }
 
 function ribao_add() {
   $('#btnAdd').on('click', function () {
-    userFamilyStatus = '';
-    userFamilyStatusStr = '';
     if ($('#ribao')[0].style.display == 'none') {
       $('#notOpenRibao').toggle();
       $('#ribao')[0].style.display = '';
@@ -959,25 +832,13 @@ function ribao_add() {
       $('#ribao')[0].style.display = 'none';
     }
     //基本情况
-    // $("input[name='checkbox1']").removeAttr("checked");
-    // $("input[name='checkbox2']").removeAttr("checked");
-    // $("input[name='checkbox3']").removeAttr("checked");
-    // $("input[name='checkbox4']").removeAttr("checked");
-    // $("input[name='checkbox5']").removeAttr("checked");
-    // $("input[name='checkbox6']").removeAttr("checked");
-    // $("input[name='checkbox7']").removeAttr("checked");
-
-      $("#js_input_user_sex").val('男');
-      $("#js_input_user_sex").attr("data-values", 1);
-
-      $("#js_input_user_status").val('');
-      $("#js_input_user_status").attr("data-values", '');
-      $("#js_input_user_crov19").val('无');
-      $("#js_input_user_crov19").attr("data-values", 0);
-
-      $("input[id='s28']").prop("checked", "checked");
-      $("input[id='s38']").prop("checked", "checked");
-
+    $("input[name='checkbox1']").removeAttr("checked");
+    $("input[name='checkbox2']").removeAttr("checked");
+    $("input[name='checkbox3']").removeAttr("checked");
+    $("input[name='checkbox4']").removeAttr("checked");
+    $("input[name='checkbox5']").removeAttr("checked");
+    $("input[name='checkbox6']").removeAttr("checked");
+    $("input[name='checkbox7']").removeAttr("checked");
 
     $("#switchQuezhen").val(getMedical(0));
     $("#switchQuezhen").attr("data-values", 0);
@@ -985,7 +846,7 @@ function ribao_add() {
     $("#switchDanjiangeli").val(getSingleRoom(0));
     $("#switchDanjiangeli").attr("data-values", 0);
 
-    $("#js_input_user_tiwen").val(36.5);
+    $("#js_input_user_tiwen").val(0);
 
     $("#js_input_user_kesou").val(getCough(0));
     $("#js_input_user_kesou").attr("data-values", 0);
@@ -1160,8 +1021,6 @@ function ribao_add() {
     //   },
     // });
 
-    getLocation()
-
   });
 }
 
@@ -1204,11 +1063,6 @@ function ribao_cancel() {
   });
 }
 
-function filterUserStatus(values) {
-    if(!values) return []
-    return values.split(',')
-}
-
 function ribaoCommit() {
   if (cantijiao == false) {
     return
@@ -1236,55 +1090,51 @@ function ribaoCommit() {
   var userName = $("#js_input_user_name").val();
   var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
   var age = $("#js_input_user_age").val();
-  var userStatus = filterUserStatus($("#js_input_user_status").data().values)
   //不能同时选择服用和未服用
-  if (userStatus.indexOf('1')>-1 && userStatus.indexOf('2')>-1) {
+  if ($("input[name='checkbox1']:checked").val() == "on" && $("input[name='checkbox2']:checked").val() == "on") {
     cantijiao = true;
     $.alert("心脑血管不能同时选择服用和未服用");
     return;
   }
   //男性不能选择妊娠期
-  if ($("#js_input_user_sex").attr("data-values") == 1 && userStatus.indexOf('7')>-1) {
+  if ($("#js_input_user_sex").attr("data-values") == 1 && $("input[name='checkbox7']:checked").val() == "on") {
     cantijiao = true;
     $.alert("男性不能选择妊娠期");
     return;
   }
   //家庭状态
   var familyStatus = "";
-  if(!userStatus.length){
-      familyStatus += '0,0,0,0,0,0,0'
-  }else {
-      if (userStatus.indexOf('1')>-1)
-          familyStatus += "1";
-      else
-          familyStatus += "0";
-      if (userStatus.indexOf('2')>-1)
-          familyStatus += ",1";
-      else
-          familyStatus += ",0";
-      if (userStatus.indexOf('3')>-1)
-          familyStatus += ",1";
-      else
-          familyStatus += ",0";
-      if (userStatus.indexOf('4')>-1)
-          familyStatus += ",1";
-      else
-          familyStatus += ",0";
-      if (userStatus.indexOf('5')>-1)
-          familyStatus += ",1";
-      else
-          familyStatus += ",0";
-      if (userStatus.indexOf('6')>-1)
-          familyStatus += ",1";
-      else
-          familyStatus += ",0";
-      if (userStatus.indexOf('7')>-1)
-          familyStatus += ",1";
-      else
-          familyStatus += ",0";
-  }
-
-  var medical = $("#js_input_user_crov19").data().values;
+  if ($("input[name='checkbox1']:checked").val() == "on")
+    familyStatus += "1";
+  else
+    familyStatus += "0";
+  if ($("input[name='checkbox2']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox3']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox4']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox5']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox6']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox7']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+
+
+  var medical = $("input[name='radio']:checked").val();
   if (medical == undefined) {
     cantijiao = true;
     $.alert("请选择新冠肺炎");
@@ -1464,18 +1314,12 @@ function ribaoCommit() {
     "tripDet": listcx,
   };
 
-  //loading
-    var tempTimes = $.toast.prototype.defaults.duration
-    $.toast.prototype.defaults.duration = 0
-    $.toast("处理中...", 'loading');
-
   $.ajax({
     url: '/home/addRibaoTrip',
     type: "post",
     contentType: "application/json; charset=utf-8",
     data: JSON.stringify(pdata),
     success: function (data) {
-        $.toast.prototype.defaults.duration = tempTimes
 
       console.log('data:', data.msgReport);
       if (data == {} || data == '' || data == null || data == undefined) {
@@ -1549,7 +1393,6 @@ function ribaoCommit() {
         $('#txt_shangbaotime').empty();
         // $.toast("请点击上报");
       }
-        $.toast("操作成功");
       ribao_refrash();
       clearShow();
     },
@@ -1577,9 +1420,7 @@ function deleteSuspected(suspectedId) {
           $('#txt_shangbao').empty();
           $('#txt_shangbao').append("今日未上报");
           $('#txt_shangbaotime').empty();
-            $('#ribao_famliy').empty();
           ribao_refrash();
-          clearShow();
           $.toast("删除后请重新添加上报");
         },
       });
@@ -1588,44 +1429,8 @@ function deleteSuspected(suspectedId) {
     }
   });
 }
-//重新填报
-function goReport() {
-    $("#suspectedId").val("");
-    if ($('#ribao')[0].style.display == 'none') {
-        $('#notOpenRibao').toggle();
-        $('#ribao')[0].style.display = '';
-    } else {
-        $('#notOpenRibao')[0].style.display = '';
-        $('#ribao')[0].style.display = 'none';
-    }
-}
 
-//修改上报
 function updateSuspected(suspectedId) {
-    userFamilyStatus = ''
-    userFamilyStatusStr = ''
-  var crov19States = [
-          {
-              title: "无",
-              value: "0",
-          },
-          {
-              title: "确诊",
-              value: "1",
-          },
-          {
-              title: "疑似",
-              value: "2",
-          },
-          {
-              title: "有接触史",
-              value: "3",
-          },
-          {
-              title: "解除隔离",
-              value: "4",
-          },
-      ];
   $("#suspectedId").val("");
   if ($('#ribao')[0].style.display == 'none') {
     $('#notOpenRibao').toggle();
@@ -1653,60 +1458,52 @@ function updateSuspected(suspectedId) {
         $("#js_input_user_name").val(suspected.userName);
         $("#js_input_user_age").val(suspected.age);
         //基本情况
-        // if (suspected.familyStatus != "") {
-        //   var familyStatusList = suspected.familyStatus.split(",");
-        //   if (familyStatusList[0] == 1)
-        //     $("input[name='checkbox1']").prop("checked", "checked");
-        //   else
-        //     $("input[name='checkbox1']").removeAttr("checked");
-        //   if (familyStatusList[1] == 1)
-        //     $("input[name='checkbox2']").prop("checked", "checked");
-        //   else
-        //     $("input[name='checkbox2']").removeAttr("checked");
-        //   if (familyStatusList[2] == 1)
-        //     $("input[name='checkbox3']").prop("checked", "checked");
-        //   else
-        //     $("input[name='checkbox3']").removeAttr("checked");
-        //   if (familyStatusList[3] == 1)
-        //     $("input[name='checkbox4']").prop("checked", "checked");
-        //   else
-        //     $("input[name='checkbox4']").removeAttr("checked");
-        //   if (familyStatusList[4] == 1)
-        //     $("input[name='checkbox5']").prop("checked", "checked");
-        //   else
-        //     $("input[name='checkbox5']").removeAttr("checked");
-        //   if (familyStatusList[5] == 1)
-        //     $("input[name='checkbox6']").prop("checked", "checked");
-        //   else
-        //     $("input[name='checkbox6']").removeAttr("checked");
-        //   if (familyStatusList[6] == 1)
-        //     $("input[name='checkbox7']").prop("checked", "checked");
-        //   else
-        //     $("input[name='checkbox7']").removeAttr("checked");
-        //
-        // }
-          userFamilyStatus = formatUserStatus(suspected.familyStatus)
-          userFamilyStatusStr = getFamilyStatus(suspected.familyStatus)
-        $("#js_input_user_status").val(userFamilyStatusStr);
-        // $("#js_input_user_status").attr("data-values", formatUserStatus(suspected.familyStatus));
-
-        $("#js_input_user_status").data("values", userFamilyStatus);
-
-        // $("#jibenmiaoshu").val(suspected.statusDesp);
-        // if (suspected.medical == 0)
-        //   $("input[id='s18']").prop("checked", "checked");
-        // if (suspected.medical == 1)
-        //   $("input[id='s19']").prop("checked", "checked");
-        // if (suspected.medical == 2)
-        //   $("input[id='s20']").prop("checked", "checked");
-        // if (suspected.medical == 3)
-        //   $("input[id='s21']").prop("checked", "checked");
-        // if (suspected.medical == 4)
-        //   $("input[id='s22']").prop("checked", "checked");
-          $("#js_input_user_crov19").val(crov19States[suspected.medical].title);
-          $("#js_input_user_crov19").attr("data-values", suspected.medical);
+        if (suspected.familyStatus != "") {
+          var familyStatusList = suspected.familyStatus.split(",");
+          if (familyStatusList[0] == 1)
+            $("input[name='checkbox1']").prop("checked", "checked");
+          else
+            $("input[name='checkbox1']").removeAttr("checked");
+          if (familyStatusList[1] == 1)
+            $("input[name='checkbox2']").prop("checked", "checked");
+          else
+            $("input[name='checkbox2']").removeAttr("checked");
+          if (familyStatusList[2] == 1)
+            $("input[name='checkbox3']").prop("checked", "checked");
+          else
+            $("input[name='checkbox3']").removeAttr("checked");
+          if (familyStatusList[3] == 1)
+            $("input[name='checkbox4']").prop("checked", "checked");
+          else
+            $("input[name='checkbox4']").removeAttr("checked");
+          if (familyStatusList[4] == 1)
+            $("input[name='checkbox5']").prop("checked", "checked");
+          else
+            $("input[name='checkbox5']").removeAttr("checked");
+          if (familyStatusList[5] == 1)
+            $("input[name='checkbox6']").prop("checked", "checked");
+          else
+            $("input[name='checkbox6']").removeAttr("checked");
+          if (familyStatusList[6] == 1)
+            $("input[name='checkbox7']").prop("checked", "checked");
+          else
+            $("input[name='checkbox7']").removeAttr("checked");
 
+        }
+        // $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
+        // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
 
+        // $("#jibenmiaoshu").val(suspected.statusDesp);
+        if (suspected.medical == 0)
+          $("input[id='s18']").prop("checked", "checked");
+        if (suspected.medical == 1)
+          $("input[id='s19']").prop("checked", "checked");
+        if (suspected.medical == 2)
+          $("input[id='s20']").prop("checked", "checked");
+        if (suspected.medical == 3)
+          $("input[id='s21']").prop("checked", "checked");
+        if (suspected.medical == 4)
+          $("input[id='s22']").prop("checked", "checked");
         if (suspected.isContact == 0)
           $("input[id='s28']").prop("checked", "checked");
         if (suspected.isContact == 1)
@@ -1872,6 +1669,7 @@ function addReport() {
         $('#txt_shangbaotime').empty();
         $('#txt_shangbaotime').append("上报时间:" + time);
       }
+
     },
   });
 }
@@ -2010,12 +1808,10 @@ function getGreder(greder) {
 
 function getFamilyStatus(familyStatus) {
   var familyStatusList = familyStatus.split(",");
-  console.log(familyStatusList)
   var familyStatusString = "";
-  if (familyStatus == '0,0,0,0,0,0,0'){
-    familyStatusString += "无病史";
-    return familyStatusString
-  } else {
+  if (familyStatus == '0,0,0,0,0,0,0')
+    familyStatusString += "无病史,";
+  else {
     if (familyStatusList[0] == 1)
       familyStatusString += "心脑血管疾病(服用ARB),";
     if (familyStatusList[1] == 1)
@@ -2034,26 +1830,6 @@ function getFamilyStatus(familyStatus) {
   return familyStatusString.substring(0, familyStatusString.length - 1);
 }
 
-function formatUserStatus(str) {
-    var statusList = str.split(',');
-    console.log(statusList)
-    var resultStr = '';
-    for(var i = 0;i<statusList.length;i++){
-      if(statusList[i] == 1){
-        resultStr += i+','
-      }
-    }
-    if(resultStr){
-        var tempArr = resultStr.split(',')
-        tempArr.pop()
-        resultStr = tempArr.join(',')
-    }else {
-      resultStr = '0'
-    }
-    console.log(resultStr)
-    return resultStr
-}
-
 function getCough(cough) {
   if (cough == 0)
     return "无咳嗽";
@@ -2200,12 +1976,6 @@ function getDiarrhea(diarrhea) {
 function clearShow() {
   console.log("qingkong")
   $("#suspectedId").val("");
-    $("#js_input_user_name").val("");
-    $("#js_input_user_age").val("");
-
-    $("#js_input_user_sex").val('男');
-    $("#js_input_user_sex").attr("data-values", 1);
-
 
   $("#switchQuezhen").attr("data-values", "");
 
@@ -2251,21 +2021,13 @@ function clearShow() {
   $('#none')[0].style.display = 'none';
 
 
-  // $("input[id='s18']").removeAttr("checked");
-  // $("input[id='s19']").removeAttr("checked");
-  // $("input[id='s20']").removeAttr("checked");
-  // $("input[id='s21']").removeAttr("checked");
-  // $("input[id='s22']").removeAttr("checked");
-    $("#js_input_user_status").val('');
-    $("#js_input_user_status").attr("data-values", '');
-    $("#js_input_user_crov19").val('无');
-    $("#js_input_user_crov19").attr("data-values", '0');
-
-
+  $("input[id='s18']").removeAttr("checked");
+  $("input[id='s19']").removeAttr("checked");
+  $("input[id='s20']").removeAttr("checked");
+  $("input[id='s21']").removeAttr("checked");
+  $("input[id='s22']").removeAttr("checked");
   $("input[id='s28']").removeAttr("checked");
   $("input[id='s29']").removeAttr("checked");
-  $("input[id='s38']").removeAttr("checked");
-  $("input[id='s39']").removeAttr("checked");
 }
 
 //健康评估
@@ -2358,5 +2120,3 @@ function getScoreRezult(scoreRezult, temperatureScore) {
 
 
 
-
-

+ 14 - 4
whepi-ui/templates/user/changeRole.ftl

@@ -7,14 +7,24 @@
         <input id="uptownId" type="text" hidden="hidden" value=${uptown_id!}/>
         <input id="uptownName" type="text" hidden="hidden" value=${uptown_name!}/>
             <div class="weui-tab__bd-item weui-tab__bd-item--active">
-                <div class="page__bd cx-reset-role">
+                <div class="page__bd">
                     <header class="user-header">
-                        <#--<h1 class="user-title">家园互助平台</h1>-->
-                        <h1 class="user-title" style="padding: 10px 0;"><#if uptown_name ??>${uptown_name!''}</#if></h1>
+                        <br/>
+                        <br/>
+                        <br/>
+                        <br/>
+                        <h1 class="user-title">家园互助平台</h1>
+                        <br/>
+                        <h1 class="user-title"><#if uptown_name ??>${uptown_name!''}</#if></h1>
+                        <br/>
                         <h1 class="user-title"><#if user ??>${user.nickName!''}</#if>登录</h1>
+                        <br/>
+                        <br/>
+                        <br/>
+                        <br/>
                     </header>
                     <div class="weui-form" id="fromMsg">
-                        <div class="weui-cells weui-cells_checkbox" style="margin-top: 0">
+                        <div class="weui-cells weui-cells_checkbox">
                             <label class="weui-cell weui-cell_active weui-check__label" for="s11">
                                 <div class="weui-cell__hd">
                                     <input type="radio" name="radio" value="1" class="weui-check" id="s11">

+ 389 - 474
whepi-ui/templates/user/home.ftl

@@ -1,4 +1,4 @@
-<#assign title="健康上报"/>
+<#assign title="用户登录"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
@@ -9,10 +9,9 @@
                     <header class="user-header">
                         <br/>
                         <br/>
-                        <h1 class="user-title">凌云集团</h1>
+                        <h1 class="user-title">家园互助平台</h1>
                         <br/>
-<#--                        <h1 class="user-title">用户登录</h1>-->
-                        <h1 class="user-title">用户绑定</h1>
+                        <h1 class="user-title">用户登录</h1>
                     </header>
                     <br/>
                     <br/>
@@ -26,43 +25,35 @@
                     <#--                        </div>-->
                         <hr class="user-hr">
                         <div class="maindiv">
-<#--                            <div class="leftdiv">-->
-<#--                                <br/>-->
-<#--                                <div class="weui-cells__title user-font" style="font-weight: 300;">&nbsp;&nbsp;&nbsp;&nbsp;<#if user ??>${user.nickName!''}</#if></div>-->
-<#--                                <div class="weui-cells__title user-font">&nbsp;&nbsp;&nbsp;&nbsp;用户登录</div>-->
-<#--                                <br/>-->
-<#--                            </div>-->
-<#--                            <div class="centerdiv"></div>-->
-<#--                            <div class="rightdiv">-->
-<#--&lt;#&ndash;                                <div class="weui-cells__title">联系人</div>&ndash;&gt;-->
-<#--&lt;#&ndash;                                <div class="weui-cells">&ndash;&gt;-->
-<#--&lt;#&ndash;                                    <div class="weui-cell">&ndash;&gt;-->
-<#--&lt;#&ndash;                                        <div class="weui-cell__bd">&ndash;&gt;-->
-<#--&lt;#&ndash;                                            <input class="weui-input" type="text" id="linkman" placeholder="请填写真实姓名"/>&ndash;&gt;-->
-<#--&lt;#&ndash;                                        </div>&ndash;&gt;-->
-<#--&lt;#&ndash;                                    </div>&ndash;&gt;-->
-<#--&lt;#&ndash;                                </div>&ndash;&gt;-->
-<#--&lt;#&ndash;                                <div class="weui-cells__title">手机号</div>&ndash;&gt;-->
-<#--                                <div class="weui-cells">-->
-<#--                                    <div class="weui-cell">-->
-<#--                                        <div class="weui-cell__bd">-->
-<#--                                            <input class="weui-input" type="text" id="phone" placeholder="请填写手机号码!"/>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </div>-->
-<#--                            </div>-->
-
-                            <div class="weui-cells cx-reset-userhome" style="width: 90%;margin: 0 auto;border:1px solid #e5e5e5;border-radius: 5px;">
-                                <div class="weui-cell">
-                                    <div class="weui-cell__bd">
-                                        <input class="weui-input" type="text" id="phone" placeholder="请填写您在家园互助平台上注册的手机号码!"/>
+                            <div class="leftdiv">
+                                <br/>
+                                <div class="weui-cells__title user-font" style="font-weight: 300;">&nbsp;&nbsp;&nbsp;&nbsp;<#if user ??>${user.nickName!''}</#if></div>
+                                <div class="weui-cells__title user-font">&nbsp;&nbsp;&nbsp;&nbsp;用户登录</div>
+                                <br/>
+                            </div>
+                            <div class="centerdiv"></div>
+                            <div class="rightdiv">
+                                <div class="weui-cells__title">联系人</div>
+                                <div class="weui-cells">
+                                    <div class="weui-cell">
+                                        <div class="weui-cell__bd">
+                                            <input class="weui-input" type="text" id="linkman" placeholder="请填写真实姓名"/>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="weui-cells__title">手机号</div>
+                                <div class="weui-cells">
+                                    <div class="weui-cell">
+                                        <div class="weui-cell__bd">
+                                            <input class="weui-input" type="text" id="phone" placeholder="请填写您的手机号码"/>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <br/>
-                        <div class="weui-form__opr-area" style="width: 90%;margin: 0 auto;">
-                            <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="goOn();" id="goOn">手机号绑定</a>
+                        <div class="weui-form__opr-area">
+                            <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="goOn();" id="goOn">下一步</a>
                         </div>
                     </div>
                     <div class="page" id="tpl_msg_warn_userType" hidden="hidden">
@@ -116,72 +107,71 @@
                 <div class="page__bd">
                     <header class="user-header">
                         <br/>
-                        <h1 class="user-title">请继续完善信息</h1>
+                        <h1 class="user-title"><#if user ??>${user.nickName!''}</#if>,请完善住址信息</h1>
                         <br/>
                     </header>
                     <br/>
                     <br/>
-<#--                    <div class="weui-cell weui-cell_select weui-cell_select-after">-->
-<#--                        <div class="weui-cell__hd">-->
-<#--                            <label for="" class="weui-label">城市</label>-->
-<#--                        </div>-->
-<#--                        <div class="weui-cell__bd">-->
-<#--                            <select class="weui-select" id="city" name="select1">-->
-<#--                                <option value="420100">武汉市</option>-->
-<#--                                <option value="420200">黄石市</option>-->
-<#--                                <option value="420300">十堰市</option>-->
-<#--                                <option value="420500">宜昌市</option>-->
-<#--                                <option value="420600">襄阳市</option>-->
-<#--                                <option value="420700">鄂州市</option>-->
-<#--                                <option value="420800">荆门市</option>-->
-<#--                                <option value="420900">孝感市</option>-->
-<#--                                <option value="421000">荆州市</option>-->
-<#--                                <option value="421100">黄冈市</option>-->
-<#--                                <option value="421200">咸宁市</option>-->
-<#--                                <option value="421300">随州市</option>-->
-<#--                                <option value="422800">恩施土家族苗族自治州</option>-->
-<#--                                <option value="429000">省直辖县级行政区划</option>-->
-<#--                            </select>-->
-<#--                        </div>-->
-<#--                    </div>-->
-<#--                    <div class="weui-cell weui-cell_select weui-cell_select-after">-->
-<#--                        <div class="weui-cell__hd">-->
-<#--                            <label for="" class="weui-label">区/县</label>-->
-<#--                        </div>-->
-<#--                        <div class="weui-cell__bd">-->
-<#--                            <select class="weui-select" id="area" name="select2">-->
-<#--                                <option value="420102">江岸区</option>-->
-<#--                                <option value="420103">江汉区</option>-->
-<#--                                <option value="420104">硚口区</option>-->
-<#--                                <option value="420105">汉阳区</option>-->
-<#--                                <option value="420106">武昌区</option>-->
-<#--                                <option value="420107">青山区</option>-->
-<#--                                <option value="420111">洪山区</option>-->
-<#--                                <option value="420112">东西湖区</option>-->
-<#--                                <option value="420113">汉南区</option>-->
-<#--                                <option value="420114">蔡甸区</option>-->
-<#--                                <option value="420115">江夏区</option>-->
-<#--                                <option value="420116">黄陂区</option>-->
-<#--                                <option value="420117">新洲区</option>-->
-<#--                            </select>-->
-<#--                        </div>-->
-<#--                    </div>-->
-<#--                    <div class="weui-cell weui-cell_select weui-cell_select-after">-->
-<#--                        <div class="weui-cell__hd">-->
-<#--                            <label for="" class="weui-label">小区</label>-->
-<#--                        </div>-->
-<#--                        <div class="weui-cell__bd">-->
-<#--                            <select class="weui-select" id="uptownId" name="select3">-->
-<#--                            </select>-->
-<#--                        </div>-->
-<#--                    </div>-->
-
-                    <div>
-                        <div class="weui-cells__title" >姓名</div>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">城市</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="city" name="select1">
+                                <option value="420100">武汉市</option>
+                                <option value="420200">黄石市</option>
+                                <option value="420300">十堰市</option>
+                                <option value="420500">宜昌市</option>
+                                <option value="420600">襄阳市</option>
+                                <option value="420700">鄂州市</option>
+                                <option value="420800">荆门市</option>
+                                <option value="420900">孝感市</option>
+                                <option value="421000">荆州市</option>
+                                <option value="421100">黄冈市</option>
+                                <option value="421200">咸宁市</option>
+                                <option value="421300">随州市</option>
+                                <option value="422800">恩施土家族苗族自治州</option>
+                                <option value="429000">省直辖县级行政区划</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">区/县</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="area" name="select2">
+                                <option value="420102">江岸区</option>
+                                <option value="420103">江汉区</option>
+                                <option value="420104">硚口区</option>
+                                <option value="420105">汉阳区</option>
+                                <option value="420106">武昌区</option>
+                                <option value="420107">青山区</option>
+                                <option value="420111">洪山区</option>
+                                <option value="420112">东西湖区</option>
+                                <option value="420113">汉南区</option>
+                                <option value="420114">蔡甸区</option>
+                                <option value="420115">江夏区</option>
+                                <option value="420116">黄陂区</option>
+                                <option value="420117">新洲区</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">小区</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="uptownId" name="select3">
+                            </select>
+                        </div>
+                    </div>
+                    <div id="yaoqingmaSS" style="display: none">
+                        <div class="weui-cells__title">邀请码</div>
                         <div class="weui-cells">
                             <div class="weui-cell">
                                 <div class="weui-cell__bd">
-                                    <input class="weui-input" type="text" id="linkman" placeholder="请填写真实姓名"/>
+                                    <input class="weui-input" type="text" id="yaoqingma" placeholder="请输入邀请码"/>
                                 </div>
                             </div>
                         </div>
@@ -189,7 +179,7 @@
 
                     <div class="weui-cell weui-cell_select weui-cell_select-after" id="unitMsg">
                         <div class="weui-cell__hd">
-                            <label for="" class="weui-label" id="danweiTitle">部门</label>
+                            <label for="" class="weui-label" id="danweiTitle">栋/单元</label>
                         </div>
                         <div class="weui-cell__bd">
                             <select class="weui-select" id="unitId" name="select4">
@@ -197,30 +187,16 @@
                             </select>
                         </div>
                     </div>
-                    <div id="doorplateMsg" >
-                        <div class="weui-cells__title" id="menpaiTitle">工号</div>
-                        <div class="weui-cells">
-                            <div class="weui-cell">
-                                <div class="weui-cell__bd">
-                                    <input class="weui-input" type="text" id="doorplate" placeholder="请输入工号或身份证号"/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-                    <div id="yaoqingmaSS" style="display: none">
-                        <div class="weui-cells__title">邀请码</div>
+                    <div id="doorplateMsg">
+                        <div class="weui-cells__title" id="menpaiTitle">门牌号码</div>
                         <div class="weui-cells">
                             <div class="weui-cell">
                                 <div class="weui-cell__bd">
-                                    <input class="weui-input" type="text" id="yaoqingma" placeholder="请输入邀请码"/>
+                                    <input class="weui-input" type="text" id="doorplate" placeholder="请输入门牌号码: 如 108"/>
                                 </div>
                             </div>
                         </div>
                     </div>
-
-
                     <br/>
                     <br/>
                     <br/>
@@ -241,318 +217,303 @@
 <script>
 
     $(document).ready(function () {
-        // $("#area").on("change", function () {
-        //     var area = $("#area").val();
-        //     $("#uptownId").empty();
-        //     $("#houseId").empty();
-        //     getUptownData(area);
-        // });
-        //
-        // $("#city").on("change", function () {
-        //     var city = $("#city").val();
-        //
-        //     $("#area").empty();
-        //     $("#uptownId").empty();
-        //     $("#houseId").empty();
-        //
-        //     var areaData = [];
-        //     switch (parseInt(city)) {
-        //         case 420100 : {
-        //
-        //             areaData = [
-        //                 {value: 420102, text: "江岸区"},
-        //                 {value: 420103, text: "江汉区"},
-        //                 {value: 420104, text: "硚口区"},
-        //                 {value: 420105, text: "汉阳区"},
-        //                 {value: 420106, text: "武昌区"},
-        //                 {value: 420107, text: "青山区"},
-        //                 {value: 420111, text: "洪山区"},
-        //                 {value: 420112, text: "东西湖区"},
-        //                 {value: 420113, text: "汉南区"},
-        //                 {value: 420114, text: "蔡甸区"},
-        //                 {value: 420115, text: "江夏区"},
-        //                 {value: 420116, text: "黄陂区"},
-        //                 {value: 420117, text: "新洲区"}
-        //             ];
-        //             break;
-        //         }
-        //         case 420200 : {
-        //             areaData = [
-        //                 {value: 420202, text: "黄石港区"},
-        //                 {value: 420203, text: "西塞山区"},
-        //                 {value: 420204, text: "下陆区"},
-        //                 {value: 420205, text: "铁山区"},
-        //                 {value: 420222, text: "阳新县"},
-        //                 {value: 420281, text: "大冶市"}
-        //             ];
-        //             break;
-        //         }
-        //         case 420300 : {
-        //             areaData = [
-        //                 {value: 420302, text: "茅箭区"},
-        //                 {value: 420303, text: "张湾区"},
-        //                 {value: 420321, text: "郧县"},
-        //                 {value: 420322, text: "郧西县"},
-        //                 {value: 420323, text: "竹山县"},
-        //                 {value: 420324, text: "竹溪县"},
-        //                 {value: 420325, text: "房县"},
-        //                 {value: 420381, text: "丹江口市"}
-        //             ];
-        //             break;
-        //         }
-        //         case 420500 : {
-        //             areaData = [
-        //                 {value: 420502, text: "西陵区"},
-        //                 {value: 420503, text: "伍家岗区"},
-        //                 {value: 420504, text: "点军区"},
-        //                 {value: 420505, text: "猇亭区"},
-        //                 {value: 420506, text: "夷陵区"},
-        //                 {value: 420525, text: "远安县"},
-        //                 {value: 420526, text: "兴山县"},
-        //                 {value: 420527, text: "秭归县"},
-        //                 {value: 420528, text: "长阳土家族自治县"},
-        //                 {value: 420529, text: "五峰土家族自治县"},
-        //                 {value: 420581, text: "宜都市"},
-        //                 {value: 420582, text: "当阳市"},
-        //                 {value: 420583, text: "枝江市"},
-        //             ];
-        //             break;
-        //         }
-        //         case 420600 : {
-        //             areaData = [
-        //                 {value: 420602, text: "襄城区"},
-        //                 {value: 420606, text: "樊城区"},
-        //                 {value: 420607, text: "襄州区"},
-        //                 {value: 420624, text: "南漳县"},
-        //                 {value: 420625, text: "谷城县"},
-        //                 {value: 420626, text: "保康县"},
-        //                 {value: 420682, text: "老河口市"},
-        //                 {value: 420683, text: "枣阳市"},
-        //                 {value: 420684, text: "宜城市"},
-        //             ];
-        //             break;
-        //         }
-        //         case 420700 : {
-        //             areaData = [
-        //                 {value: 420702, text: "梁子湖区"},
-        //                 {value: 420703, text: "华容区"},
-        //                 {value: 420704, text: "鄂城区"},
-        //             ];
-        //             break;
-        //         }
-        //         case 420800 : {
-        //             areaData = [
-        //                 {value: 420802, text: "东宝区"},
-        //                 {value: 420804, text: "掇刀区"},
-        //                 {value: 420821, text: "京山县"},
-        //                 {value: 420822, text: "沙洋县"},
-        //                 {value: 420881, text: "钟祥市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 420900 : {
-        //             areaData = [
-        //                 {value: 420902, text: "孝南区"},
-        //                 {value: 420921, text: "孝昌县"},
-        //                 {value: 420922, text: "大悟县"},
-        //                 {value: 420923, text: "云梦县"},
-        //                 {value: 420981, text: "应城市"},
-        //                 {value: 420982, text: "安陆市"},
-        //                 {value: 420984, text: "汉川市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 421000 : {
-        //             areaData = [
-        //                 {value: 421002, text: "沙市区"},
-        //                 {value: 421003, text: "荆州区"},
-        //                 {value: 421022, text: "公安县"},
-        //                 {value: 421023, text: "监利县"},
-        //                 {value: 421024, text: "江陵县"},
-        //                 {value: 421081, text: "石首市"},
-        //                 {value: 421083, text: "洪湖市"},
-        //                 {value: 421087, text: "松滋市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 421100 : {
-        //             areaData = [
-        //                 {value: 421102, text: "黄州区"},
-        //                 {value: 421121, text: "团风县"},
-        //                 {value: 421122, text: "红安县"},
-        //                 {value: 421123, text: "罗田县"},
-        //                 {value: 421124, text: "英山县"},
-        //                 {value: 421125, text: "浠水县"},
-        //                 {value: 421126, text: "蕲春县"},
-        //                 {value: 421127, text: "黄梅县"},
-        //                 {value: 421181, text: "麻城市"},
-        //                 {value: 421182, text: "武穴市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 421200 : {
-        //             areaData = [
-        //                 {value: 421202, text: "咸安区"},
-        //                 {value: 421221, text: "嘉鱼县"},
-        //                 {value: 421222, text: "通城县"},
-        //                 {value: 421223, text: "崇阳县"},
-        //                 {value: 421224, text: "通山县"},
-        //                 {value: 421281, text: "赤壁市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 421300 : {
-        //             areaData = [
-        //                 {value: 421303, text: "曾都区"},
-        //                 {value: 421321, text: "随县"},
-        //                 {value: 421381, text: "广水市"},
-        //             ];
-        //             break;
-        //         }
-        //         case 422800 : {
-        //             areaData = [
-        //                 {value: 422801, text: "恩施市"},
-        //                 {value: 422802, text: "利川市"},
-        //                 {value: 422822, text: "建始县"},
-        //                 {value: 422823, text: "巴东县"},
-        //                 {value: 422825, text: "宣恩县"},
-        //                 {value: 422826, text: "咸丰县"},
-        //                 {value: 422827, text: "来凤县"},
-        //                 {value: 422828, text: "鹤峰县"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 429000 : {
-        //             areaData = [
-        //                 {value: 429004, text: "仙桃市"},
-        //                 {value: 429005, text: "潜江市"},
-        //                 {value: 429006, text: "天门市"},
-        //                 {value: 429021, text: "神农架林区"},
-        //             ];
-        //             break;
-        //         }
-        //     }
-        //     var html = "";
-        //     for (var i = 0; i < areaData.length; i++) {
-        //         html += '<option value="' + areaData[i].value + '">' + areaData[i].text + '</option>';
-        //     }
-        //     $('#area').append(html);
-        //     $("#area").val(areaData[0].value);
-        // });
-
-        // $("#uptownId").on("change", function () {
-        //     getUptownUnitData();
-        //     $("#houseId").empty()
-        // })
-
-
-
-        // $("#danweiTitle").text("单位");
-        // $("#menpaiTitle").text("工号");
-        // $("#doorplate").attr("placeholder", "输入工号或身份证号");
-
-        getUptownUnitData();
+        $("#area").on("change", function () {
+            var area = $("#area").val();
+            $("#uptownId").empty();
+            $("#houseId").empty();
+            getUptownData(area);
+        });
 
-        $("#unitId").on("change", function () {
-            var unitId = $("#unitId").val();
-            console.log("unitId:" + unitId)
-            if(unitId=='002'){
-                $("#yaoqingmaSS")[0].style.display = '';
-                $("#doorplateMsg")[0].style.display = 'none';
-            }else{
-                $("#yaoqingmaSS")[0].style.display = 'none';
-                $("#doorplateMsg")[0].style.display = '';
+        $("#city").on("change", function () {
+            var city = $("#city").val();
+
+            $("#area").empty();
+            $("#uptownId").empty();
+            $("#houseId").empty();
+
+            var areaData = [];
+            switch (parseInt(city)) {
+                case 420100 : {
+
+                    areaData = [
+                        {value: 420102, text: "江岸区"},
+                        {value: 420103, text: "江汉区"},
+                        {value: 420104, text: "硚口区"},
+                        {value: 420105, text: "汉阳区"},
+                        {value: 420106, text: "武昌区"},
+                        {value: 420107, text: "青山区"},
+                        {value: 420111, text: "洪山区"},
+                        {value: 420112, text: "东西湖区"},
+                        {value: 420113, text: "汉南区"},
+                        {value: 420114, text: "蔡甸区"},
+                        {value: 420115, text: "江夏区"},
+                        {value: 420116, text: "黄陂区"},
+                        {value: 420117, text: "新洲区"}
+                    ];
+                    break;
+                }
+                case 420200 : {
+                    areaData = [
+                        {value: 420202, text: "黄石港区"},
+                        {value: 420203, text: "西塞山区"},
+                        {value: 420204, text: "下陆区"},
+                        {value: 420205, text: "铁山区"},
+                        {value: 420222, text: "阳新县"},
+                        {value: 420281, text: "大冶市"}
+                    ];
+                    break;
+                }
+                case 420300 : {
+                    areaData = [
+                        {value: 420302, text: "茅箭区"},
+                        {value: 420303, text: "张湾区"},
+                        {value: 420321, text: "郧县"},
+                        {value: 420322, text: "郧西县"},
+                        {value: 420323, text: "竹山县"},
+                        {value: 420324, text: "竹溪县"},
+                        {value: 420325, text: "房县"},
+                        {value: 420381, text: "丹江口市"}
+                    ];
+                    break;
+                }
+                case 420500 : {
+                    areaData = [
+                        {value: 420502, text: "西陵区"},
+                        {value: 420503, text: "伍家岗区"},
+                        {value: 420504, text: "点军区"},
+                        {value: 420505, text: "猇亭区"},
+                        {value: 420506, text: "夷陵区"},
+                        {value: 420525, text: "远安县"},
+                        {value: 420526, text: "兴山县"},
+                        {value: 420527, text: "秭归县"},
+                        {value: 420528, text: "长阳土家族自治县"},
+                        {value: 420529, text: "五峰土家族自治县"},
+                        {value: 420581, text: "宜都市"},
+                        {value: 420582, text: "当阳市"},
+                        {value: 420583, text: "枝江市"},
+                    ];
+                    break;
+                }
+                case 420600 : {
+                    areaData = [
+                        {value: 420602, text: "襄城区"},
+                        {value: 420606, text: "樊城区"},
+                        {value: 420607, text: "襄州区"},
+                        {value: 420624, text: "南漳县"},
+                        {value: 420625, text: "谷城县"},
+                        {value: 420626, text: "保康县"},
+                        {value: 420682, text: "老河口市"},
+                        {value: 420683, text: "枣阳市"},
+                        {value: 420684, text: "宜城市"},
+                    ];
+                    break;
+                }
+                case 420700 : {
+                    areaData = [
+                        {value: 420702, text: "梁子湖区"},
+                        {value: 420703, text: "华容区"},
+                        {value: 420704, text: "鄂城区"},
+                    ];
+                    break;
+                }
+                case 420800 : {
+                    areaData = [
+                        {value: 420802, text: "东宝区"},
+                        {value: 420804, text: "掇刀区"},
+                        {value: 420821, text: "京山县"},
+                        {value: 420822, text: "沙洋县"},
+                        {value: 420881, text: "钟祥市"},
+
+                    ];
+                    break;
+                }
+                case 420900 : {
+                    areaData = [
+                        {value: 420902, text: "孝南区"},
+                        {value: 420921, text: "孝昌县"},
+                        {value: 420922, text: "大悟县"},
+                        {value: 420923, text: "云梦县"},
+                        {value: 420981, text: "应城市"},
+                        {value: 420982, text: "安陆市"},
+                        {value: 420984, text: "汉川市"},
+
+                    ];
+                    break;
+                }
+                case 421000 : {
+                    areaData = [
+                        {value: 421002, text: "沙市区"},
+                        {value: 421003, text: "荆州区"},
+                        {value: 421022, text: "公安县"},
+                        {value: 421023, text: "监利县"},
+                        {value: 421024, text: "江陵县"},
+                        {value: 421081, text: "石首市"},
+                        {value: 421083, text: "洪湖市"},
+                        {value: 421087, text: "松滋市"},
+
+                    ];
+                    break;
+                }
+                case 421100 : {
+                    areaData = [
+                        {value: 421102, text: "黄州区"},
+                        {value: 421121, text: "团风县"},
+                        {value: 421122, text: "红安县"},
+                        {value: 421123, text: "罗田县"},
+                        {value: 421124, text: "英山县"},
+                        {value: 421125, text: "浠水县"},
+                        {value: 421126, text: "蕲春县"},
+                        {value: 421127, text: "黄梅县"},
+                        {value: 421181, text: "麻城市"},
+                        {value: 421182, text: "武穴市"},
+
+                    ];
+                    break;
+                }
+                case 421200 : {
+                    areaData = [
+                        {value: 421202, text: "咸安区"},
+                        {value: 421221, text: "嘉鱼县"},
+                        {value: 421222, text: "通城县"},
+                        {value: 421223, text: "崇阳县"},
+                        {value: 421224, text: "通山县"},
+                        {value: 421281, text: "赤壁市"},
+
+                    ];
+                    break;
+                }
+                case 421300 : {
+                    areaData = [
+                        {value: 421303, text: "曾都区"},
+                        {value: 421321, text: "随县"},
+                        {value: 421381, text: "广水市"},
+                    ];
+                    break;
+                }
+                case 422800 : {
+                    areaData = [
+                        {value: 422801, text: "恩施市"},
+                        {value: 422802, text: "利川市"},
+                        {value: 422822, text: "建始县"},
+                        {value: 422823, text: "巴东县"},
+                        {value: 422825, text: "宣恩县"},
+                        {value: 422826, text: "咸丰县"},
+                        {value: 422827, text: "来凤县"},
+                        {value: 422828, text: "鹤峰县"},
+
+                    ];
+                    break;
+                }
+                case 429000 : {
+                    areaData = [
+                        {value: 429004, text: "仙桃市"},
+                        {value: 429005, text: "潜江市"},
+                        {value: 429006, text: "天门市"},
+                        {value: 429021, text: "神农架林区"},
+                    ];
+                    break;
+                }
             }
+            var html = "";
+            for (var i = 0; i < areaData.length; i++) {
+                html += '<option value="' + areaData[i].value + '">' + areaData[i].text + '</option>';
+            }
+            $('#area').append(html);
+            $("#area").val(areaData[0].value);
+        });
 
+        $("#uptownId").on("change", function () {
+            getUptownUnitData();
+            $("#houseId").empty()
         })
-
-
     })
 
-    // function getUptownData(area) {
-    //     $.ajax({
-    //         type: "GET",
-    //         url: "/home/getUptownData.json?area=" + area,
-    //         dataType: "json",
-    //         success: function (data) {
-    //             if (data.length > 0) {
-    //                 $("#uptownId").empty();
-    //                 var html = "";
-    //                 for (var i = 0; i < data.length; i++) {
-    //                     html += '<option value="' + data[i].uptownId + '">' + data[i].uptownName + '</option>';
-    //                 }
-    //                 $('#uptownId').append(html);
-    //                 $("#uptownId").val(data[0].uptownId);
-    //                 var uptownId = $("#uptownId").val();
-    //                 // console.log("uptownId:"+uptownId);
-    //                 if (uptownId == '1238790987234' || uptownId == '100000002') {
-    //                     console.log("单位");
-    //                     $("#yaoqingmaSS")[0].style.display = '';
-    //                     $("#danweiTitle").text("单位");
-    //                     $("#menpaiTitle").text("工号");
-    //                     $("#doorplate").attr("placeholder", "输入工号或身份证号");
-    //
-    //                 } else {
-    //                     console.log("小区");
-    //                     $("#yaoqingmaSS")[0].style.display = 'none';
-    //                     $("#danweiTitle").text("栋/单元");
-    //                     $("#menpaiTitle").text("门牌号码");
-    //                     $("#doorplate").attr("placeholder", "请输入门牌号码: 如 108");
-    //                 }
-    //                 getUptownUnitData();
-    //             }
-    //         }
-    //     });
-    // }
+    function getUptownData(area) {
+        $.ajax({
+            type: "GET",
+            url: "/home/getUptownData.json?area=" + area,
+            dataType: "json",
+            success: function (data) {
+                if (data.length > 0) {
+                    $("#uptownId").empty();
+                    var html = "";
+                    for (var i = 0; i < data.length; i++) {
+                        html += '<option value="' + data[i].uptownId + '">' + data[i].uptownName + '</option>';
+                    }
+                    $('#uptownId').append(html);
+                    $("#uptownId").val(data[0].uptownId);
+                    var uptownId = $("#uptownId").val();
+                    // console.log("uptownId:"+uptownId);
+                    if (uptownId == '1238790987234' || uptownId == '100000002') {
+                        console.log("单位");
+                        $("#yaoqingmaSS")[0].style.display = '';
+                        $("#danweiTitle").text("单位");
+                        $("#menpaiTitle").text("工号");
+                        $("#doorplate").attr("placeholder", "输入工号或身份证号");
+
+                    } else {
+                        console.log("小区");
+                        $("#yaoqingmaSS")[0].style.display = 'none';
+                        $("#danweiTitle").text("栋/单元");
+                        $("#menpaiTitle").text("门牌号码");
+                        $("#doorplate").attr("placeholder", "请输入门牌号码: 如 108");
+                    }
+                    getUptownUnitData();
+                }
+            }
+        });
+    }
 
     function getUptownUnitData() {
         $.ajax({
             type: "GET",
-            url: "/home/getUptownUnitData.json?uptownId=1238790987234",
+            url: "/home/getUptownUnitData.json?uptownId=" + $("#uptownId").val(),
             data: {},
             dataType: "json",
             success: function (data) {
                 if (data.length > 0) {
                     $("#unitId").empty();
-                    $('#unitId').append("<option value='001'>请选择</option>");
-                    $('#unitId').append("<option value='002'>没有归属部门</option>");
+                    $('#unitId').append("<option>请选择</option>");
                     var html = "";
                     for (var i = 0; i < data.length; i++) {
-                        html += '<option value="' + data[i].unitId + '">' + data[i].ridgepole + data[i].unit + '</option>';
+                        var uptownId = $("#uptownId").val();
+                        if (uptownId == '1238790987234' || uptownId == '100000002') {
+                            html += '<option value="' + data[i].unitId + '">' + data[i].ridgepole + data[i].unit + '</option>';
+                        } else {
+                            if (data[i].ridgepole == "") {
+                                html += '<option value="' + data[i].unitId + '">' + data[i].unit + '单元' + '</option>';
+                            } else {
+                                html += '<option value="' + data[i].unitId + '">' + data[i].ridgepole + '栋' + data[i].unit + '单元' + '</option>';
+                            }
+                        }
                     }
                     $('#unitId').append(html);
-                    $("#unitId").val('001');
+                    $("#unitId").val('0');
                 }
             }
         });
     }
 
-    <#if user_id ??>var userId = ${user_id!''}</#if>;
+        <#if user_id ??>var userId = ${user_id!''}</#if>;
 
     function save() {
-        // console.log("userId:" + userId)
-        // var userType = $('input:radio:checked').val();
-        // var city = $("#city").val();
-        // if (!city) {
-        //     $.alert("请选择城市!")
-        //     return false;
-        // }
-        // var area = $("#area").val();
-        // if (!area) {
-        //     $.alert("请选择区/县!")
-        //     return false;
-        // }
-        // var uptownId = $("#uptownId").val();
-        // if (!uptownId) {
-        //     $.alert("请选择小区!")
-        //     return false;
-        // }
+        console.log("userId:" + userId)
+        var userType = $('input:radio:checked').val();
+        var city = $("#city").val();
+        if (!city) {
+            $.alert("请选择城市!")
+            return false;
+        }
+        var area = $("#area").val();
+        if (!area) {
+            $.alert("请选择区/县!")
+            return false;
+        }
+        var uptownId = $("#uptownId").val();
+        if (!uptownId) {
+            $.alert("请选择小区!")
+            return false;
+        }
         if (uptownId == '1238790987234') {
           $.alert("暂停注册!")
           return false;
@@ -562,43 +523,26 @@
                 return false;
             }
         }
-        // if (uptownId == '100000002') {
-        //     var yaoqingma = $("#yaoqingma").val();
-        //     if (yaoqingma != '071797') {
-        //         $.alert("请填写正确的邀请码!")
-        //         return false;
-        //     }
-        // }
-        var linkman = $("#linkman").val();
-        if (!linkman) {
-            $.alert("请填写姓名!")
-            return false;
+        if (uptownId == '100000002') {
+            var yaoqingma = $("#yaoqingma").val();
+            if (yaoqingma != '071797') {
+                $.alert("请填写正确的邀请码!")
+                return false;
+            }
         }
-
         var unitId = $("#unitId").val();
-
+        var doorplate = $("#doorplate").val().trim();
         if (!unitId) {
-            $.alert("请选择部门!")
+            $.alert("栋/单元!")
             return false;
-        }else{
-            if(unitId=='002'){
-                var yaoqingma = $("#yaoqingma").val();
-                if (yaoqingma != '5714') {
-                    $.alert("请填写正确的邀请码!")
-                    return false;
-                }
-            }else{
-                var doorplate = $("#doorplate").val().trim();
-                if (!doorplate) {
-                    $.alert("请填写工号或身份证!")
-                    return false;
-                }
-            }
         }
-
-        // console.log(city)
-        // console.log(area)
-        // console.log(uptownId)
+        if (!doorplate) {
+            $.alert("请选择门牌信息!")
+            return false;
+        }
+        console.log(city)
+        console.log(area)
+        console.log(uptownId)
         console.log(unitId)
         console.log(doorplate)
         $.ajax({
@@ -625,10 +569,10 @@
                             // "userType": $('input:radio:checked').val(),
                             "linkman": $("#linkman").val(),
                             "phone": $("#phone").val(),
-                            "city": null,
-                            "area": null,
+                            "city": city,
+                            "area": area,
                             "unitId": unitId,
-                            "uptownId": null,
+                            "uptownId": uptownId,
                             "doorplate": doorplate,
                         }, success: function (date) {
                             window.location.href = "/user/home.html?userId=" + userId + "&userType=1";
@@ -648,14 +592,14 @@
         //     $("#fromMsg").hide();
         //     return false;
         // }
-        // var linkman = $("#linkman").val();
-        // if (!linkman) {
-        //     $("#tpl_msg_warn_userType").hide();
-        //     $("#tpl_msg_warn_linkman").show();
-        //     $("#tpl_msg_warn_phone").hide();
-        //     $("#fromMsg").hide();
-        //     return false;
-        // }
+        var linkman = $("#linkman").val();
+        if (!linkman) {
+            $("#tpl_msg_warn_userType").hide();
+            $("#tpl_msg_warn_linkman").show();
+            $("#tpl_msg_warn_phone").hide();
+            $("#fromMsg").hide();
+            return false;
+        }
         var phone = $("#phone").val();
         if (!(/^1[3456789]\d{9}$/.test(phone))) {
             $("#tpl_msg_warn_userType").hide();
@@ -667,40 +611,11 @@
         $("#tpl_msg_warn_userType").hide();
         $("#tpl_msg_warn_linkman").hide();
         $("#tpl_msg_warn_phone").hide();
-
-
-        // $("#first").hide();
-        // $("#second").show();
-
+        $("#first").hide();
+        $("#second").show();
         // console.log(userType)
-        // console.log(linkman)
+        console.log(linkman)
         console.log(phone)
-
-
-        $.ajax({
-            url: '/home/bandUser.json',
-            type: "post",
-            data: {
-                "userId": userId,
-                "phone": $("#phone").val(),
-            }, success: function (data) {
-                console.log(data)
-                if (!data.success) {
-                    // $("#first").hide();
-                    // $("#second").show();
-
-                    $.alert("当前手机号码无法绑定,请重新输入正确的手机号码!");
-                    return false;
-
-                }else{
-                    window.location.href = "/user/home.html?userId=" + data.newUserId + "&userType=1";
-                }
-
-            }
-
-        });
-
-
     }
 
     function back() {