Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -79,14 +79,23 @@
         ribao_cancel();
         getUptownUnitLY();
 
+
         <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_jinrijujian').append(msReport.safetyNum);
         if (msReport.reportStatus == 1) {
+            var date = new Date(1398250549490);
+            var year = date.getFullYear();
+            var month = date.getMonth() + 1;
+            var day = date.getDate();
+            var hour = date.getHours();
+            var minute = date.getMinutes();
+            var second = date.getSeconds();
+            var time = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
             canSahngbao = false;
             document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
             document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
             $('#txt_shangbao').empty();
-            $('#txt_shangbao').append("今日已上报");
+            $('#txt_shangbao').append("今日已上报,上报时间:" + time);
         }
         else {
             canSahngbao = true;
@@ -115,7 +124,6 @@
             });
         });
 
-
         function selectTab() {
             $("#tab1").removeClass('weui-tab__bd-item--active');
             $("#jt1").removeClass('weui-bar__item--on');

whepi-ui/templates/home/ribao.js

@@ -459,16 +459,16 @@ function insertlingyun() {
     $.alert("目的地与今晚住地不一致");
     return;
   }
-  if(cfd == 4 && mdd ==4 ){
-    if(mddq == cfdq){
-        $.alert("出发地与目的地不能一致");
-        return;
+  if (cfd == 4 && mdd == 4) {
+    if (mddq == cfdq) {
+      $.alert("出发地与目的地不能一致");
+      return;
+    }
+  } else if (cfd != 4 || mdd != 4) {
+    if (cfd == mdd) {
+      $.alert("出发地与目的地不能一致");
+      return;
     }
-  }else if(cfd != 4 || mdd !=4){
-      if(cfd == mdd){
-          $.alert("出发地与目的地不能一致");
-          return;
-      }
   }
   var cxfsq = $('#js_input_cxfsq').val();
 
@@ -635,7 +635,7 @@ function ribaoInitialization(reportId) {
     },
     type: 'GET',
     success: function (data) {
-      if (data.data == undefined || data.data=="") {
+      if (data.data == undefined || data.data == "") {
         $('#rb_family').empty();
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
         canSahngbao = false;
@@ -664,7 +664,7 @@ function ribao_refrash() {
     },
     type: 'GET',
     success: function (data) {
-      if (data.data == undefined || data.data=="") {
+      if (data.data == undefined || data.data == "") {
         $('#rb_family').empty();
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
         canSahngbao = false;
@@ -756,8 +756,8 @@ 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;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
-    '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\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 + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</>\n' +
     '                                    </div>\n' +
     '                              '));
@@ -1459,13 +1459,21 @@ function addReport() {
       "userCreate": userId,
     },
     success: function (data) {
-      $.toast(data.msg);
+      $.toast(data.msg)
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var day = date.getDate();
+      var hour = date.getHours();
+      var minute = date.getMinutes();
+      var second = date.getSeconds();
+      var time = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
       if (data.msg == "操作成功") {
         canSahngbao = false;
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
         document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
         $('#txt_shangbao').empty();
-        $('#txt_shangbao').append("今日已上报");
+        $('#txt_shangbao').append("今日已上报,上报时间:" + time);
       }
 
     },
@@ -1486,7 +1494,7 @@ $("#my-input-ribao").calendar({
       },
       type: 'GET',
       success: function (data) {
-        if (data.data == undefined || data.data=="") {
+        if (data.data == undefined || data.data == "") {
           $('#ribao_famliy').empty();
         }
         else {