display21:27

whepi-ui/templates/home/home.ftl

@@ -58,8 +58,12 @@
         var uptownId = $("#uptownId").val();
         if (uptownId == '5'){ //1238790987234
             $('#ribao_trip')[0].style.display = '';
+            $('#ribao_djgl')[0].style.display = 'none';
+            $('#ribao_jbqk')[0].style.display = 'none';
         }else{
             $('#ribao_trip')[0].style.display = 'none';
+            $('#ribao_djgl')[0].style.display = '';
+            $('#ribao_jbqk')[0].style.display = '';
         }
         ribao_init();
         qiuzhu_init();

whepi-ui/templates/home/ribao.ftl

@@ -59,72 +59,75 @@
                                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 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 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: 1vh;"></textarea>-->
                     <input id="suspectedId" type="text" hidden="hidden" value=""/>
@@ -135,12 +138,15 @@
                                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="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 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="请输入"

whepi-ui/templates/home/ribao.js

@@ -445,8 +445,19 @@ function insertlingyun() {
   }
   var person = new Object();
   var cxfs = $("#js_input_cxfs").attr("data-values") == undefined ? 0 : $("#js_input_cxfs").attr("data-values");
+  var jrszd = $("#js_input_jrszd").attr("data-values") == undefined ? 0 : $("#js_input_jrszd").attr("data-values");
   var cfd = $("#js_input_cfd").attr("data-values") == undefined ? 0 : $("#js_input_cfd").attr("data-values");
   var mdd = $("#js_input_mdd").attr("data-values") == undefined ? 0 : $("#js_input_mdd").attr("data-values");
+    var jrszq = $('#js_input_jrszq').val();
+    var cfdq = $('#js_input_cfdq').val();
+  if(cfd != jrszd){
+      $.alert("出发地与今日所在地不是同一地点");
+      return;
+  }
+  if(jrszq != cfdq){
+      $.alert("出发地与今日所在地不是同一地点");
+      return;
+  }
   if (cxfs != 4 && cxfs != 0) {
     var val = $('#js_input_cxfsq').val();
     if (val == "") {