yuliang 5 年 前
コミット
80e6684ccb

+ 20 - 20
whepi-ui/templates/home/ribao.js

@@ -286,10 +286,10 @@ function ribao_cell(v) {
   var fatigue = "乏力:" + getFatigue(v.fatigue) + ";";
   var diarrhea = "腹泻:" + getDiarrhea(v.diarrhea) + ";";
   var others = "其他:" + v.others;
-  $('#rb_family').append($('<div class="weui-media-box weui-media-box_text">\n' +
+  $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\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">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -361,22 +361,22 @@ function ribaoCommit() {
   var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
   var others = $("#shuruqita").val()== undefined ? "" : $("#jibenmiaoshu").val();
 
-  // if (userName == undefined || userName == '') {
-  //   alert("请填写姓名");
-  //   return;
-  // }
-  // if (age == undefined || age == '') {
-  //   alert("请填写年龄");
-  //   return;
-  // }
-  // if (grender == 0) {
-  //   alert("请填写性别");
-  //   return;
-  // }
-  // if (temperature <= 0) {
-  //   alert("请填写体温");
-  //   return;
-  // }
+  if (userName == undefined || userName == '') {
+    alert("请填写姓名");
+    return;
+  }
+  if (age == undefined || age == '') {
+    alert("请填写年龄");
+    return;
+  }
+  if (grender == 0) {
+    alert("请填写性别");
+    return;
+  }
+  if (temperature <= 0) {
+    alert("请填写体温");
+    return;
+  }
 
   $.ajax({
     url: '/home/addRibao',
@@ -551,9 +551,9 @@ function helpValue1(v) {
   var fatigue = "乏力:" + getFatigue(v.fatigue) + ";";
   var diarrhea = "腹泻:" + getDiarrhea(v.diarrhea) + ";";
   var others = "其他:" + v.others;
-  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text">\n' +
+  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">'  + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age  + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc">' +familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others  + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' +familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others  + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }

+ 1 - 1
whepi-web/src/main/java/com/bofeng/entity/MsSuspected.java

@@ -125,6 +125,6 @@ public class MsSuspected {
     @TableField(exist = false)
     private Integer singleNum;
 
-    @TableField("single_room")
+    @TableField(exist = false)
     private String singleRoomStr;
 }