style

whepi-ui/templates/home/ribao.js

@@ -912,45 +912,45 @@ function ribao_cell(v) {
   //   familyStatus = getFamilyStatus(v.familyStatus) + "；";
   var medical = "";
   if (v.medical != 0)
-    medical = "新冠肺炎：" + getMedical(v.medical) + "；";
+    medical = "新冠肺炎：" + getMedical(v.medical) + "；<br/>";
   var isContact = "";
   if (v.isContact != 0)
-    isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；";
+    isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；<br/>";
   var isSuspected = "";
   if (v.isSuspected != 0)
-    isSuspected = "近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；";
+    isSuspected = "近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；<br/>";
   var singleRoom = "";
   var uptownId = $("#uptownId").val();
   if (uptownId != xiaoquId && uptownId != ceshixiaoquId) {
 
     if (v.singleRoom != 0)
-      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；<br/>";
 
     if (v.singleRoom == 0 && v.medical != 0)
-      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；<br/>";
   }
-  var temperature = "体温：" + v.temperature + "；";
+  var temperature = "体温：" + v.temperature + "；<br/>";
   var cough = "";
   if (v.cough != 0)
-    cough = "咳嗽现象：" + getCough(v.cough) + "；";
+    cough = "咳嗽现象：" + getCough(v.cough) + "；<br/>";
   var muscle = "";
   if (v.muscle != 0)
-    muscle = "肌肉酸痛：" + getMuscle(v.muscle) + "；";
+    muscle = "肌肉酸痛：" + getMuscle(v.muscle) + "；<br/>";
   var dyspnea = "";
   if (v.dyspnea != 0)
-    dyspnea = "呼吸困难：" + getDyspnea(v.dyspnea) + "；";
+    dyspnea = "呼吸困难：" + getDyspnea(v.dyspnea) + "；<br/>";
   var fatigue = "";
   if (v.fatigue != 0)
-    fatigue = "乏力现象：" + getFatigue(v.fatigue) + "；";
+    fatigue = "乏力现象：" + getFatigue(v.fatigue) + "；<br/>";
   var diarrhea = "";
   if (v.diarrhea != 0)
-    diarrhea = "腹泻现象：" + getDiarrhea(v.diarrhea) + "；";
+    diarrhea = "腹泻现象：" + getDiarrhea(v.diarrhea) + "；<br/>";
   var others = "";
   if (v.others != "")
-    others = "其他描述：" + v.others + "；";
+    others = "其他描述：" + v.others + "；<br/>";
   var scoreRezult = "";
   if (v.scoreRezult != 0)
-    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
+    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；<br/>";
 
   var workLocal = "";
   var todayLocal = "";
@@ -958,24 +958,24 @@ function ribao_cell(v) {
   var tripDet = "";
 
   if (uptownId == xiaoquId || uptownId == ceshixiaoquId) {
-    if (v.workLocal != 0) {
-      if (v.workLocal < 4)
-        workLocal = "工作驻地：" + getLocal(v.workLocal) + "；";
-      else
-        workLocal = "工作驻地：其它地点_" + v.workLocalOther + "；";
-    }
-
-    if (v.todayLocal != 0) {
-      if (v.todayLocal < 4)
-        todayLocal = "今晚住地：" + getLocal(v.todayLocal) + "；";
-      else
-        todayLocal = "今晚住地：其它地点_" + v.todayLocalOther + "；";
-    }
+  //   if (v.workLocal != 0) {
+  //     if (v.workLocal < 4)
+  //       workLocal = "工作驻地：" + getLocal(v.workLocal) + "；";
+  //     else
+  //       workLocal = "工作驻地：其它地点_" + v.workLocalOther + "；";
+  //   }
+  //
+  //   if (v.todayLocal != 0) {
+  //     if (v.todayLocal < 4)
+  //       todayLocal = "今晚住地：" + getLocal(v.todayLocal) + "；";
+  //     else
+  //       todayLocal = "今晚住地：其它地点_" + v.todayLocalOther + "；";
+  //   }
     if (v.isTrip != undefined)
-      isTrip = "是否跨市出行：" + getIsTrip(v.isTrip) + "；"
+      isTrip = "有无离开工作驻地：" + getIsTrip(v.isTrip) + "；<br/>"
 
     if (v.tripDet != undefined)
-      tripDet = "出行详细：" + v.tripDet + "；"
+      tripDet = "出行详细：" + v.tripDet + "；<br/>"
 
   }
 
@@ -994,7 +994,7 @@ function ribao_cell(v) {
       '  <div class="weui-form-preview__bd">\n' +
       '    <div class="weui-form-preview__item">\n' +
       '      <label class="weui-form-preview__label">基本情况</label>\n' +
-      '      <span class="weui-form-preview__value" style="text-align: left;">'+familyStatus + medical + isContact + isSuspected + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet+'</span>\n' +
+      '      <span class="weui-form-preview__value" style="text-align: left;">'+ temperature + familyStatus + medical + singleRoom + cough + muscle + dyspnea + fatigue + diarrhea + others + isContact + isSuspected + scoreRezult + workLocal + todayLocal + isTrip + tripDet+'</span>\n' +
       '    </div>\n' +
       '  </div>\n' +
       '  <div class="weui-form-preview__ft">\n' +
@@ -1067,6 +1067,8 @@ function ribao_add() {
     $("#js_input_user_fuxie").val(getDiarrhea(0));
     $("#js_input_user_fuxie").attr("data-values", 0);
 
+    $("#shuruqita").val('');
+
 
     $("#js_input_sf").val(getIsTrip(0));
     $("#js_input_sf").attr("data-values", 0);
@@ -1280,11 +1282,11 @@ function ribaoCommit() {
   }
   cantijiao = false
   // //判断是否获取到定位
-  if (longitude == '' && latitude =='') {
-    cantijiao = true;
-    $.alert("请检查是否开启手机定位和微信定位");
-    return;
-  }
+  // if (longitude == '' && latitude =='') {
+  //   cantijiao = true;
+  //   $.alert("请检查是否开启手机定位和微信定位");
+  //   return;
+  // }
   // if (autoLocal == '') {
   //   cantijiao = true;
   //   $.alert("请先设置微信获取当前位置");
@@ -1432,6 +1434,18 @@ function ribaoCommit() {
     return;
   }
 
+  if(medical == 1 && medicalState == 0 && cough ==0 && muscle == 0 && dyspnea == 0 && fatigue == 0 && diarrhea == 0 && !others){
+    $("input[id='s18']").prop("checked", "checked");
+    $("input[id='s19']").removeAttr('checked');
+    var ids = ['js_input_user_xinguan_view','js_input_user_kesou_view','js_input_user_jirou_view','js_input_user_huxi_view','js_input_user_fali_view','js_input_user_fuxie_view','shuruqita_view']
+    ids.forEach(iv=>{
+      $('#'+iv).hide()
+    })
+    medical = $("input[name='radio']:checked").val()
+  }
+
+
+
   //如果是凌云
 
   var uptownId = $("#uptownId").val();
@@ -2012,48 +2026,48 @@ function helpValue1(v) {
 
   var medical = "";
   if (v.medical != 0)
-    medical = "新冠肺炎：" + getMedical(v.medical) + "；";
+    medical = "新冠肺炎：" + getMedical(v.medical) + "；<br/>";
 
   var isContact = "";
   if (v.isContact != 0)
-    isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；";
+    isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；<br/>";
 
   var isSuspected = "";
   if (v.isSuspected != 0)
-    isSuspected = "近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；";
+    isSuspected = "近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；<br/>";
   var singleRoom = "";
 
   var uptownId = $("#uptownId").val();
   if (uptownId != xiaoquId && uptownId != ceshixiaoquId) {
 
     if (v.singleRoom != 0)
-      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；<br/>";
 
     if (v.singleRoom == 0 && v.medical != 0)
-      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
+      singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；<br/>";
   }
-  var temperature = "体温：" + v.temperature + "；";
+  var temperature = "体温：" + v.temperature + "；<br/>";
   var cough = "";
   if (v.cough != 0)
-    cough = "咳嗽现象：" + getCough(v.cough) + "；";
+    cough = "咳嗽现象：" + getCough(v.cough) + "；<br/>";
   var muscle = "";
   if (v.muscle != 0)
-    muscle = "肌肉酸痛：" + getMuscle(v.muscle) + "；";
+    muscle = "肌肉酸痛：" + getMuscle(v.muscle) + "；<br/>";
   var dyspnea = "";
   if (v.dyspnea != 0)
-    dyspnea = "呼吸困难：" + getDyspnea(v.dyspnea) + "；";
+    dyspnea = "呼吸困难：" + getDyspnea(v.dyspnea) + "；<br/>";
   var fatigue = "";
   if (v.fatigue != 0)
-    fatigue = "乏力现象：" + getFatigue(v.fatigue) + "；";
+    fatigue = "乏力现象：" + getFatigue(v.fatigue) + "；<br/>";
   var diarrhea = "";
   if (v.diarrhea != 0)
-    diarrhea = "腹泻现象：" + getDiarrhea(v.diarrhea) + "；";
+    diarrhea = "腹泻现象：" + getDiarrhea(v.diarrhea) + "；<br/>";
   var others = "";
   if (v.others != "")
-    others = "其他描述：" + v.others + "；";
+    others = "其他描述：" + v.others + "；<br/>";
   var scoreRezult = "";
   if (v.scoreRezult != 0)
-    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
+    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；<br/>";
 
   var workLocal = "";
   var todayLocal = "";
@@ -2062,30 +2076,30 @@ function helpValue1(v) {
 
   var uptownId = $("#uptownId").val();
   if (uptownId == xiaoquId || uptownId == ceshixiaoquId) {
-    if (v.workLocal != 0) {
-      if (v.workLocal < 4)
-        workLocal = "工作驻地：" + getLocal(v.workLocal) + "；";
-      else
-        workLocal = "工作驻地：其它地点_" + v.workLocalOther + "；";
-    }
-
-    if (v.todayLocal != 0) {
-      if (v.todayLocal < 4)
-        todayLocal = "今晚住地：" + getLocal(v.todayLocal) + "；";
-      else
-        todayLocal = "今晚住地：其它地点_" + v.todayLocalOther + "；";
-    }
+    // if (v.workLocal != 0) {
+    //   if (v.workLocal < 4)
+    //     workLocal = "工作驻地：" + getLocal(v.workLocal) + "；";
+    //   else
+    //     workLocal = "工作驻地：其它地点_" + v.workLocalOther + "；";
+    // }
+    //
+    // if (v.todayLocal != 0) {
+    //   if (v.todayLocal < 4)
+    //     todayLocal = "今晚住地：" + getLocal(v.todayLocal) + "；";
+    //   else
+    //     todayLocal = "今晚住地：其它地点_" + v.todayLocalOther + "；";
+    // }
 
     if (v.isTrip != undefined)
-      isTrip = "是否跨市出行：" + getIsTrip(v.isTrip) + "；"
+      isTrip = "有无离开工作驻地：" + getIsTrip(v.isTrip) + "；<br/>"
 
     if (v.tripDet != undefined)
-      tripDet = "出行详细：" + v.tripDet + "；"
+      tripDet = "出行详细：" + v.tripDet + "；<br/>"
   }
 
   $('#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 style="height: auto">' + familyStatus + medical + isContact + isSuspected + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
+    '                                      <div style="height: auto">' + temperature + familyStatus + medical + singleRoom + cough + muscle + dyspnea + fatigue + diarrhea + others + isContact + isSuspected + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -2511,6 +2525,35 @@ function initRadioEvent() {
       if(state == 1){
         $('#'+v).show('fast')
       }else {
+        //reset
+        $("#switchQuezhen").val(getMedical(0));
+        $("#switchQuezhen").attr("data-values", 0);
+
+        $("#switchDanjiangeli").val(getSingleRoom(0));
+        $("#switchDanjiangeli").attr("data-values", 0);
+
+        $("#js_input_user_tiwen").val(36.5);
+
+        $("#js_input_user_xinguan").val(getXinguan(0));
+        $("#js_input_user_xinguan").attr("data-values", 0);
+
+        $("#js_input_user_kesou").val(getCough(0));
+        $("#js_input_user_kesou").attr("data-values", 0);
+
+        $("#js_input_user_jirou").val(getMuscle(0));
+        $("#js_input_user_jirou").attr("data-values", 0);
+
+        $("#js_input_user_huxi").val(getDyspnea(0));
+        $("#js_input_user_huxi").attr("data-values", 0);
+
+        $("#js_input_user_fali").val(getFatigue(0));
+        $("#js_input_user_fali").attr("data-values", 0);
+
+        $("#js_input_user_fuxie").val(getDiarrhea(0));
+        $("#js_input_user_fuxie").attr("data-values", 0);
+
+        $("#shuruqita").val('');
+
         $('#'+v).hide('fast')
       }