xielianghe

whepi-ui/templates/home/getLocation.js

@@ -10,7 +10,7 @@
 // ]
 // });
 function getLocation() {
-  return;
+  //return;
   wx.getLocation({
     type: 'wgs84',
     success: function (res) {
@@ -18,13 +18,34 @@ function getLocation() {
 
       var geocoder = new qq.maps.Geocoder({
         complete: function (result) {
-          if ('当阳市' === result.detail.addressComponents.district) {
+          if ('武汉市' === result.detail.addressComponents.city) {
+            autoLocal = '武汉市';
+            //今晚驻地
+            $("#js_input_jrszd").val(getLocal(1));
+            $("#js_input_jrszd").attr("data-values", 1);
+            $("#js_input_jrszq").val("");
+          } else if ('宜昌市' === result.detail.addressComponents.city) {
+            autoLocal = '宜昌市';
+            //今晚驻地
+            $("#js_input_jrszd").val(getLocal(2));
+            $("#js_input_jrszd").attr("data-values", 2);
+            $("#js_input_jrszq").val("");
+          }else if ('当阳市' === result.detail.addressComponents.city) {
             autoLocal = '当阳市';
+            //今晚驻地
+            $("#js_input_jrszd").val(getLocal(3));
+            $("#js_input_jrszd").attr("data-values", 3);
+            $("#js_input_jrszq").val("");
           } else {
             autoLocal = result.detail.addressComponents.city;
+            //今晚驻地
+            $("#js_input_jrszd").val(getLocal(4));
+            $("#js_input_jrszd").attr("data-values", 4);
+            $("#js_input_jrszq").val(result.detail.addressComponents.city);
           }
           autoAddr = result.detail.address;
           // alert(result.detail.address)
+
           console.log(result);
         }
       })

whepi-ui/templates/home/ribao.ftl

@@ -281,7 +281,7 @@
                             </div>
                             <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="请选择"
+                                <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择" disabled="disabled"
                                        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;

whepi-ui/templates/home/ribao.js

@@ -494,16 +494,16 @@ function insertlingyun() {
   var jrszq = $('#js_input_jrszq').val();
   var mddq = $('#js_input_mddq').val();
   var cfdq = $('#js_input_cfdq').val();
-  if (mdd != jrszd) {
-    cantijiao = true;
-    $.alert("目的地与今晚住地不一致");
-    return;
-  }
-  if (jrszq != mddq) {
-    cantijiao = true;
-    $.alert("目的地与今晚住地不一致");
-    return;
-  }
+  // if (mdd != jrszd) {
+  //   cantijiao = true;
+  //   $.alert("目的地与今晚住地不一致");
+  //   return;
+  // }
+  // if (jrszq != mddq) {
+  //   cantijiao = true;
+  //   $.alert("目的地与今晚住地不一致");
+  //   return;
+  // }
   if (cfd == 4 && mdd == 4) {
     if (mddq == cfdq) {
       cantijiao = true;
@@ -1512,7 +1512,7 @@ function updateSuspected(suspectedId) {
         $("#js_input_score_histroy").val(suspected.scoreHistroy);
         $("#js_input_score").val(suspected.score);
 
-        //行程
+        //工作驻地
         $("#js_input_gzzd").val(getLocal(suspected.workLocal));
         $("#js_input_gzzd").attr("data-values", suspected.workLocal);
         if (suspected.workLocal != 4) {
@@ -1522,15 +1522,16 @@ function updateSuspected(suspectedId) {
           $('#js_input_qtdd').removeAttr("disabled")
         }
         $("#js_input_qtdd").val(suspected.workLocalOther);
+        //今晚驻地
         $("#js_input_jrszd").val(getLocal(suspected.todayLocal));
         $("#js_input_jrszd").attr("data-values", suspected.todayLocal);
         if (suspected.todayLocal != 4) {
           $('#js_input_jrszq').attr("disabled", "disabled");
           $("#js_input_jrszq").val("");
-        } else {
-          $('#js_input_jrszq').removeAttr("disabled")
         }
+      d
         $("#js_input_jrszq").val(suspected.todayLocalOther);
+        //是否出行
         $("#js_input_sf").val(getIsTrip(suspected.isTrip));
         $("#js_input_sf").attr("data-values", suspected.isTrip);
         if (suspected.isTrip == 0)
@@ -1939,16 +1940,7 @@ function getDiarrhea(diarrhea) {
 function clearShow() {
   console.log("qingkong")
   $("#suspectedId").val("");
-  $("#js_input_user_sex").val("");
-  $("#js_input_user_sex").attr("data-values", "");
-  $("#js_input_user_name").val("");
-  $("#js_input_user_age").val("");
-  $("#js_input_user_status").val("");
-  $("#js_input_user_status").attr("data-values", "");
-
-  $("#jibenmiaoshu").val("");
 
-  $("#switchQuezhen").val("");
   $("#switchQuezhen").attr("data-values", "");
 
   $("#switchQuezhen_zz").val("");

whepi-web/src/main/java/com/bofeng/service/MsReportService.java

@@ -204,21 +204,21 @@ public class MsReportService {
                     return 2;
 
                 //如果是凌云，判断出行是否填写异常
-                UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
-                if (unit != null) {
-                    if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
-                        //上一天的上报记录.3天内
-                        List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
-                        if (listSuspected1 != null && listSuspected1.size() == 1) {
-                            if (listSuspected1.get(0).getTodayLocal() != null && msSuspected.getTodayLocal() != null && msSuspected.getIsTrip() != null && listSuspected1.get(0).getTodayLocal() != 0 && msSuspected.getTodayLocal() != 0) {
-                                if (listSuspected1.get(0).getTodayLocalOther() != msSuspected.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msSuspected.getTodayLocal() && msSuspected.getIsTrip() == 0) {
-                                    return 4;
-                                }
-                            }
-                        }
-
-                    }
-                }
+                // UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
+                // if (unit != null) {
+                //     if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+                //         //上一天的上报记录.3天内
+                //         List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
+                //         if (listSuspected1 != null && listSuspected1.size() == 1) {
+                //             if (listSuspected1.get(0).getTodayLocal() != null && msSuspected.getTodayLocal() != null && msSuspected.getIsTrip() != null && listSuspected1.get(0).getTodayLocal() != 0 && msSuspected.getTodayLocal() != 0) {
+                //                 if (listSuspected1.get(0).getTodayLocalOther() != msSuspected.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msSuspected.getTodayLocal() && msSuspected.getIsTrip() == 0) {
+                //                     return 4;
+                //                 }
+                //             }
+                //         }
+                //
+                //     }
+                // }
             }
 
         }
@@ -239,14 +239,14 @@ public class MsReportService {
         MsTrip msTrip = msTripMapper.selectById(suspectedId);
         if (msTrip != null) {
             //上一天的上报记录.3天内
-            List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
-            if (listSuspected1 != null && listSuspected1.size() == 1) {
-                if (listSuspected1.get(0).getTodayLocal() != null && msTrip.getTodayLocal() != null && msTrip.getIsTrip() != null && listSuspected1.get(0).getTodayLocal() != 0 && msTrip.getTodayLocal() != 0) {
-                    if (listSuspected1.get(0).getTodayLocalOther() != msTrip.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msTrip.getTodayLocal() && msTrip.getIsTrip() == 0) {
-                        return 4;
-                    }
-                }
-            }
+            // List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
+            // if (listSuspected1 != null && listSuspected1.size() == 1) {
+            //     if (listSuspected1.get(0).getTodayLocal() != null && msTrip.getTodayLocal() != null && msTrip.getIsTrip() != null && listSuspected1.get(0).getTodayLocal() != 0 && msTrip.getTodayLocal() != 0) {
+            //         if (listSuspected1.get(0).getTodayLocalOther() != msTrip.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msTrip.getTodayLocal() && msTrip.getIsTrip() == 0) {
+            //             return 4;
+            //         }
+            //     }
+            // }
             MsReport msReport = msReportMapper.selectById(reportId);
             if (msReport != null) {
                 msReport.setReportStatus(1);

whepi-web/src/main/java/com/bofeng/service/MsTripService.java

@@ -273,7 +273,7 @@ public class MsTripService {
             }
             //更新今日日报,直接上报
             msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
-            //是领域
+            //是ly
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
             if (unit != null) {
                 if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5 || unit.getUptownId() == 100000002L) {