Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi into test_branch

whepi-ui/templates/home/home.ftl

@@ -39,6 +39,7 @@
 
 <#include "/home/frag.foot.ftl" />
 <script>
+    var xiaoquId = '5'; //1238790987234
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
     (function ($) {
@@ -56,7 +57,7 @@
         });
 
         var uptownId = $("#uptownId").val();
-        if (uptownId == '5'){ //1238790987234
+        if (uptownId == xiaoquId){
             $('#ribao_trip')[0].style.display = '';
             $('#ribao_djgl')[0].style.display = 'none';
             $('#ribao_jbqk')[0].style.display = 'none';

whepi-ui/templates/home/ribao.js

@@ -660,16 +660,21 @@ function ribao_cell(v) {
   var grender = getGreder(v.grender);
   var age = v.age;
   var familyStatus = "";
-  if (v.familyStatus != 0)
-    familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
   var medical = "";
   if (v.medical != 0)
     medical = "新冠肺炎：" + getMedical(v.medical) + "；";
   var singleRoom = "";
-  if (v.singleRoom != 0)
-    singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
-  if (v.singleRoom == 0 && v.medical != 0)
-    singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+  var uptownId = $("#uptownId").val();
+  if (uptownId != xiaoquId) {
+    if (v.familyStatus != 0)
+      familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
+
+    if (v.singleRoom != 0)
+      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+
+    if (v.singleRoom == 0 && v.medical != 0)
+      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+  }
   var temperature = "体温：" + v.temperature + "；";
   var cough = "";
   if (v.cough != 0)
@@ -698,8 +703,8 @@ function ribao_cell(v) {
   var isTrip = "";
   var tripDet = "";
 
-  var uptownId = $("#uptownId").val();
-  if (uptownId == '5') {
+
+  if (uptownId == xiaoquId) {
     if (v.workLocal != 0) {
       if (v.workLocal < 4)
         workLocal = "工作驻地：" + getLocal(v.workLocal) + "；";
@@ -724,7 +729,7 @@ 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' +
-    '                                      <p class="weui-media-box__desc" style="height: auto">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</p>\n' +
+    '                                      <div style="height: auto">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -933,10 +938,6 @@ function ribao_add() {
   });
 }
 
-function tt(){
-    alert($("input[name='radio']:checked").val())
-}
-
 function ribao_cancel() {
   $('#cancel').on('click', function () {
 
@@ -1023,15 +1024,10 @@ function ribaoCommit() {
     familyStatus += ",1";
   else
     familyStatus += ",0";
-
-
-    var medical =$("input[name='radio']:checked").val();
-
-
   //var familyStatus = $("#js_input_user_status").attr("data-values") == undefined ? 0 : $("#js_input_user_status").attr("data-values");
   //var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
   var statusDesp = "";
-  // var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
+  var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
   var medicalzz = $("#switchQuezhen_zz").attr("data-values") == undefined ? 0 : $("#switchQuezhen_zz").attr("data-values");
   var singleRoom = $("#switchDanjiangeli").attr("data-values") == undefined ? 0 : $("#switchDanjiangeli").attr("data-values");
   var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
@@ -1075,7 +1071,7 @@ function ribaoCommit() {
   //如果是凌云
 
   var uptownId = $("#uptownId").val();
-  if (uptownId == '5') {
+  if (uptownId == xiaoquId) {
     //lingyun
     var gzzd = $("#js_input_gzzd").attr("data-values") == undefined ? 0 : $("#js_input_gzzd").attr("data-values");
     var qtdd = $("#js_input_qtdd").val();
@@ -1448,16 +1444,24 @@ function helpValue1(v) {
   var grender = getGreder(v.grender);
   var age = v.age;
   var familyStatus = "";
-  if (v.familyStatus != 0)
-    familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
+
   var medical = "";
   if (v.medical != 0)
     medical = "新冠肺炎：" + getMedical(v.medical) + "；";
   var singleRoom = "";
-  if (v.singleRoom != 0)
-    singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
-  if (v.singleRoom == 0 && v.medical != 0)
-    singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+
+  var uptownId = $("#uptownId").val();
+  if (uptownId != xiaoquId) {
+    if (v.familyStatus != 0)
+      familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
+
+    if (v.singleRoom != 0)
+      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+
+    if (v.singleRoom == 0 && v.medical != 0)
+      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+  }
+
   var temperature = "体温：" + v.temperature + "；";
   var cough = "";
   if (v.cough != 0)
@@ -1486,8 +1490,8 @@ function helpValue1(v) {
   var isTrip = "";
   var tripDet = "";
 
-  var uptownId = $("#uptownId").val();
-  if (uptownId == '5') {
+
+  if (uptownId == xiaoquId) {
     if (v.workLocal != 0) {
       if (v.workLocal < 4)
         workLocal = "工作驻地：" + getLocal(v.workLocal) + "；";
@@ -1509,9 +1513,9 @@ function helpValue1(v) {
       tripDet = "出行详细：" + v.tripDet + "；"
   }
 
-  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 20vh">\n' +
+  $('#ribao_famliy').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 + '</h4>\n' +
-    '                                      <div class="weui-media-box__desc" style="height: auto">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
+    '                                      <div style="height: auto">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
     '                                    </div>\n' +
     '                              '));
 }