Merge remote-tracking branch 'origin/master'

# Conflicts:
#	whepi-ui/templates/home/ribao.js

whepi-ui/templates/home/home.ftl

@@ -40,6 +40,7 @@
 <#include "/home/frag.foot.ftl" />
 <script>
     var xiaoquId = '5'; //1238790987234
+    var canSahngbao = true;
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
     (function ($) {
@@ -76,6 +77,7 @@
         <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_jinrijujian').append(msReport.safetyNum);
         if (msReport.reportStatus == 1) {
+            canSahngbao = false;
             document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
         }
         ribaoInitialization(msReport.reportId);

whepi-ui/templates/home/ribao.js

@@ -715,7 +715,6 @@ function ribao_cell(v) {
   var isTrip = "";
   var tripDet = "";
 
-
   if (uptownId == xiaoquId) {
     if (v.workLocal != 0) {
       if (v.workLocal < 4)
@@ -730,7 +729,7 @@ function ribao_cell(v) {
       else
         todayLocal = "今日所在地：" + v.todayLocalOther + "；";
     }
-    if (v.isTrip != undefined )
+    if (v.isTrip != undefined)
       isTrip = "是否出行：" + getIsTrip(v.isTrip) + "；"
 
     if (v.tripDet != undefined)
@@ -1415,6 +1414,9 @@ function updateSuspected(suspectedId) {
 
 
 function addReport() {
+  if (!canSahngbao) {
+    return;
+  }
   var userId = $("#userId").val();
   $.ajax({
     url: '/home/addReport',
@@ -1487,7 +1489,6 @@ function helpValue1(v) {
     if (v.singleRoom == 0 && v.medical != 0)
       singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
   }
-
   var temperature = "体温：" + v.temperature + "；";
   var cough = "";
   if (v.cough != 0)
@@ -1633,13 +1634,13 @@ function getMedical(medical) {
   if (medical == 0)
     return "无";
   else if (medical == 1)
-    return "新冠确诊";
+    return "确诊";
   else if (medical == 2)
-    return "新冠疑似";
+    return "疑似";
   else if (medical == 3)
-    return "密切接触者";
+    return "有接触史";
   else if (medical == 4)
-    return "解除观察";
+    return "解除隔离";
   return "";
 }
 

whepi-ui/templates/lingyun/home.ftl

@@ -64,6 +64,7 @@
         <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_jinrijujian').append(msReport.safetyNum);
         if (msReport.reportStatus == 1) {
+          canSahngbao = false;
             document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
         }
         ribaoInitialization(msReport.reportId);

whepi-ui/templates/lingyun/ribao.js

@@ -1018,6 +1018,7 @@ function ribaoCommit() {
             ribao_refrash();
 
             clearShow();
+          canSahngbao = true;
             document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
         },
     });
@@ -1137,7 +1138,7 @@ function updateSuspected(suspectedId) {
 
 
 function addReport() {
-    if (document.getElementById("btn_shangbao").style['background-color'] == "#D9D9D9") {
+    if (!canSahngbao) {
         return;
     }
     var userId = $("#userId").val();