Bladeren bron

xielianghe

lange 5 jaren geleden
bovenliggende
commit
8878cf10cf
3 gewijzigde bestanden met toevoegingen van 9 en 2 verwijderingen
  1. 6 2
      whepi-ui/templates/home/home.ftl
  2. 2 0
      whepi-ui/templates/home/ribao.ftl
  3. 1 0
      whepi-ui/templates/home/ribao.js

+ 6 - 2
whepi-ui/templates/home/home.ftl

@@ -83,7 +83,7 @@
         <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_jinrijujian').append(msReport.safetyNum);
         if (msReport.reportStatus == 1) {
-            var date = new Date();
+            var date = new Date(msReport.timeUpdate*1);
             var year = date.getFullYear();
             var month = date.getMonth() + 1;
             var day = date.getDate();
@@ -94,8 +94,11 @@
             canSahngbao = false;
             document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
             document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
+            document.getElementById("txt_shangbaotime").style['color'] = "#0bb20c";
             $('#txt_shangbao').empty();
-            $('#txt_shangbao').append("今日已上报" );
+            $('#txt_shangbao').append("今日已上报");
+            $('#txt_shangbaotime').empty();
+            $('#txt_shangbaotime').append("上报时间:" + time);
         }
         else {
             canSahngbao = true;
@@ -103,6 +106,7 @@
             document.getElementById("txt_shangbao").style['color'] = "red";
             $('#txt_shangbao').empty();
             $('#txt_shangbao').append("今日未上报");
+            $('#txt_shangbaotime').empty();
         }
         ribaoInitialization(msReport.reportId);
         $("#my-input-ribao").calendar();

+ 2 - 0
whepi-ui/templates/home/ribao.ftl

@@ -45,6 +45,8 @@
                     <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:x-large" id="txt_shangbaotime">
+                         上报时间
                        </span>
                         <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
                            style=""

+ 1 - 0
whepi-ui/templates/home/ribao.js

@@ -1236,6 +1236,7 @@ function ribaoCommit() {
       document.getElementById("txt_shangbao").style['color'] = "red";
       $('#txt_shangbao').empty();
       $('#txt_shangbao').append("今日未上报");
+      $('#txt_shangbaotime').empty();
     },
   });
 }