tijiao

whepi-ui/templates/home/ribao.ftl

@@ -225,9 +225,14 @@
                         <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;">
+                            自愿填写病情描述（温度为必填项），提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议
+                        </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: 60%;">工作驻地</div>
+                            <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)"/>
@@ -236,7 +241,7 @@
                                    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: 1vh;">
-                            <div style="height: 5vh; line-height: 5vh; width: 60%;">今日所在地</div>
+                            <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)"/>
@@ -245,7 +250,7 @@
                                    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: 1vh;">
-                            <div style="height: 5vh; line-height: 5vh; width: 60%;">是否出行</div>
+                            <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: 145%"
                                    onchange="selectinput6(this)"/>
@@ -258,7 +263,7 @@
                                 <span class="weui-loadmore__tips">出行情况上报</span>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 60%;">出发地</div>
+                                <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)"/>
@@ -267,7 +272,7 @@
                                        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: 1vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 60%;">目的地</div>
+                                <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)"/>
@@ -276,7 +281,7 @@
                                        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: 1vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 60%;">出行方式</div>
+                                <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)"/>
@@ -311,11 +316,6 @@
                         </div>
 
                     </div>
-                    <div style="display: flex; justify-content: center;">
-                        <div style="width: 70%;color: red; text-align: center;">
-                            自愿填写病情描述（温度为必填项），提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议
-                        </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"

whepi-ui/templates/home/ribao.js

@@ -28,7 +28,7 @@ function ribao_init() {
   });
 
   $("#js_input_jrszd").select({
-    title: "选择今日所在地",
+    title: "选择今晚住地",
     items: [
       {
         title: "武汉市",
@@ -451,11 +451,11 @@ function insertlingyun() {
   // var jrszq = $('#js_input_jrszq').val();
   // var cfdq = $('#js_input_cfdq').val();
   // if (cfd != jrszd) {
-  //   $.alert("出发地与今日所在地不是同一地点");
+  //   $.alert("出发地与今晚住地不是同一地点");
   //   return;
   // }
   // if (jrszq != cfdq) {
-  //   $.alert("出发地与今日所在地不是同一地点");
+  //   $.alert("出发地与今晚住地不是同一地点");
   //   return;
   // }
     var cxfsq = $('#js_input_cxfsq').val();
@@ -725,9 +725,9 @@ function ribao_cell(v) {
 
     if (v.todayLocal != 0) {
       if (v.todayLocal < 4)
-        todayLocal = "今日所在地：" + getLocal(v.todayLocal) + "；";
+        todayLocal = "今晚住地：" + getLocal(v.todayLocal) + "；";
       else
-        todayLocal = "今日所在地：" + v.todayLocalOther + "；";
+        todayLocal = "今晚住地：" + v.todayLocalOther + "；";
     }
     if (v.isTrip != undefined)
       isTrip = "是否出行：" + getIsTrip(v.isTrip) + "；"
@@ -1127,10 +1127,10 @@ function ribaoCommit() {
     var todyLocal = "";
     var todyLocalOther = "";
     if (jrszd == 0) {
-      $.alert("请选择今日所在地");
+      $.alert("请选择今晚住地");
       return;
     } else if (jrszd == 4 && jrszq == "") {
-      $.alert("请填写今日所在地");
+      $.alert("请填写今晚住地");
       return;
     } else if (jrszd != 0 && jrszd != 4) {
       if (jrszd == 1) {
@@ -1536,9 +1536,9 @@ function helpValue1(v) {
 
     if (v.todayLocal != 0) {
       if (v.todayLocal < 4)
-        todayLocal = "今日所在地：" + getLocal(v.todayLocal) + "；";
+        todayLocal = "今晚住地：" + getLocal(v.todayLocal) + "；";
       else
-        todayLocal = "今日所在地：" + v.todayLocalOther + "；";
+        todayLocal = "今晚住地：" + v.todayLocalOther + "；";
     }
 
     if (v.isTrip != undefined)

whepi-ui/templates/lingyun/ribao.ftl

@@ -191,6 +191,11 @@
                         <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;">
+                            自愿填写病情描述（温度为必填项），提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议
+                        </div>
+                    </div>
                     <div id="ribao" 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>
@@ -200,14 +205,14 @@
                             <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: 1vh;">
-                            <div style="height: 5vh; line-height: 5vh; width: 60%;">今日所在地</div>
+                            <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: 1vh;">
-                            <div style="height: 5vh; line-height: 5vh; width: 60%;">是否出行</div>
+                            <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: 145%" onchange="selectinput6(this)"/>
                         </div>
@@ -219,21 +224,21 @@
                                 <span class="weui-loadmore__tips">出行情况上报</span>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 60%;">出发地</div>
+                                <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_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: 1vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 60%;">目的地</div>
+                                <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_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: 1vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 60%;">出行方式</div>
+                                <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;
@@ -266,11 +271,7 @@
                         </div>
 
                     </div>
-                    <div style="display: flex; justify-content: center;">
-                        <div style="width: 70%;color: red; text-align: center;">
-                            自愿填写病情描述（温度为必填项），提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议
-                        </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"

whepi-ui/templates/lingyun/ribao.js

@@ -31,7 +31,7 @@ function ribao_init() {
     });
 
     $("#js_input_jrszd").select({
-        title: "选择今日所在地",
+        title: "选择今晚住地",
         items: [
             {
                 title: "武汉市",
@@ -940,10 +940,10 @@ function ribaoCommit() {
     var todyLocal ="";
     var todyLocalOther = "";
     if(jrszd == 0){
-        $.alert("请选择今日所在地");
+        $.alert("请选择今晚住地");
         return;
     }else if(jrszd == 4 && jrszq == ""){
-        $.alert("请填写今日所在地");
+        $.alert("请填写今晚住地");
         return;
     }else if(jrszd != 0 && jrszd !=4){
         if(jrszd ==1){