xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -145,19 +145,19 @@
                             </label>
                             <label class="weui-cell weui-cell_active weui-check__label" for="s19">
                                 <input type="radio" name="radio" value="1" class="weui-check" id="s19">
-                                <i class="weui-icon-checked"></i>新冠确诊
+                                <i class="weui-icon-checked"></i>确诊
                             </label>
                             <label class="weui-cell weui-cell_active weui-check__label" for="s20">
                                 <input type="radio" name="radio" value="2" class="weui-check" id="s20">
-                                <i class="weui-icon-checked"></i>新冠疑似
+                                <i class="weui-icon-checked"></i>疑似
                             </label>
                             <label class="weui-cell weui-cell_active weui-check__label" for="s21">
                                 <input type="radio" name="radio" value="3" class="weui-check" id="s21">
-                                <i class="weui-icon-checked"></i>密切接触者
+                                <i class="weui-icon-checked"></i>有接触史
                             </label>
                             <label class="weui-cell weui-cell_active weui-check__label" for="s22">
                                 <input type="radio" name="radio" value="4" class="weui-check" id="s22">
-                                <i class="weui-icon-checked"></i>接触观察
+                                <i class="weui-icon-checked"></i>解除隔离
                             </label>
                         </div>
                     </div>

whepi-ui/templates/home/ribao.js

@@ -448,16 +448,16 @@ function insertlingyun() {
   var jrszd = $("#js_input_jrszd").attr("data-values") == undefined ? 0 : $("#js_input_jrszd").attr("data-values");
   var cfd = $("#js_input_cfd").attr("data-values") == undefined ? 0 : $("#js_input_cfd").attr("data-values");
   var mdd = $("#js_input_mdd").attr("data-values") == undefined ? 0 : $("#js_input_mdd").attr("data-values");
-    var jrszq = $('#js_input_jrszq').val();
-    var cfdq = $('#js_input_cfdq').val();
-  if(cfd != jrszd){
-      $.alert("出发地与今日所在地不是同一地点");
-      return;
-  }
-  if(jrszq != cfdq){
-      $.alert("出发地与今日所在地不是同一地点");
-      return;
-  }
+  // var jrszq = $('#js_input_jrszq').val();
+  // var cfdq = $('#js_input_cfdq').val();
+  // if (cfd != jrszd) {
+  //   $.alert("出发地与今日所在地不是同一地点");
+  //   return;
+  // }
+  // if (jrszq != cfdq) {
+  //   $.alert("出发地与今日所在地不是同一地点");
+  //   return;
+  // }
   if (cxfs != 4 && cxfs != 0) {
     var val = $('#js_input_cxfsq').val();
     if (val == "") {
@@ -703,7 +703,6 @@ function ribao_cell(v) {
   var isTrip = "";
   var tripDet = "";
 
-
   if (uptownId == xiaoquId) {
     if (v.workLocal != 0) {
       if (v.workLocal < 4)
@@ -718,7 +717,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)
@@ -938,6 +937,10 @@ function ribao_add() {
   });
 }
 
+function tt() {
+  alert($("input[name='radio']:checked").val())
+}
+
 function ribao_cancel() {
   $('#cancel').on('click', function () {
 
@@ -1024,10 +1027,15 @@ 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();
@@ -1334,51 +1342,56 @@ function updateSuspected(suspectedId) {
             "suspectedId": suspectedId
           },
           success: function (data) {
-            if(data.data.length != 0){
+            if (data.data.length != 0) {
 
             }
-              listcx.splice(0, listcx.length);
-              $('#tabtr').empty();
-              var person = new Object();
-            var xxIds = [];
-            var xxName = [
-              "序号",
-              "出发地",
-              "目的地",
-              "出行方式",
-              "车次/航班/车牌",
-              "操作"
-            ];
-            for (var i = 0; i < xxName.length; i++) {
-              xxIds.push({
-                name: xxName[i]
-              });
-            }
+            listcx.splice(0, listcx.length);
             $('#tabtr').empty();
-            var html = "<tr style='background-color: #f8f8f8;'>";
-            for (var i = 0; i < xxIds.length; i++) {
-              html += "<th>" + xxIds[i].name + "</th>";
-            }
-            html += "</tr>"
+            var person = new Object();
+            // var xxIds = [];
+            // var xxName = [
+            //   "序号",
+            //   "出发地",
+            //   "目的地",
+            //   "出行方式",
+            //   "车次/航班/车牌",
+            //   "操作"
+            // ];
+            // for (var i = 0; i < xxName.length; i++) {
+            //   xxIds.push({
+            //     name: xxName[i]
+            //   });
+            // }
+            // $('#tabtr').empty();
+            // var html = "<tr style='background-color: #f8f8f8;'>";
+            // for (var i = 0; i < xxIds.length; i++) {
+            //   html += "<th>" + xxIds[i].name + "</th>";
+            // }
+            // html += "</tr>"
             data.data.forEach(function (v) {
               {
-                  person.startLocalStr = getLocalOther(v.startLocal, v.startLocalOther);
-                  person.endlocalStr = getLocalOther(v.endLocal, v.endLocalOther);
-                  person.tripTypeStr = getTripType(v.tripType);
-                  person.tripTypeDesp = v.tripTypeDesp;
-                  listcx.push(person);
-                html += "<tr>";
-                html += "<td style='text-align: center;'>" + v.sort + "</td>";
-                html += "<td style='text-align: center;' >" + getLocalOther(v.startLocal, v.startLocalOther) + " </td>";
-                html += "<td style='text-align: center;' >" + getLocalOther(v.endLocal, v.endLocalOther) + " </td>";
-                html += "<td style='text-align: center;' >" + getTripType(v.tripType) + " </td>";
-                html += "<td style='text-align: center;' >" + v.tripTypeDesp + " </td>";
-                html += "<td style='text-align: center;' ><button value=" + i + " style='height:5vh;background-color: red;text-align: center; with:60%' class='weui-btn weui-btn_mini weui-btn_primary' onclick='splice(this.value)'>" + "删除" + " </button></td>";
-                html += "</tr>";
-                $("#tabtr").html(html);
+                person.startLocal = v.startLocal;
+                person.startLocalOther = v.startLocalOther;
+                person.endlocal = v.endLocal;
+                person.endLocalOther = v.endLocalOther;
+                person.tripType = v.tripType;
+                person.startLocalStr = getLocalOther(v.startLocal, v.startLocalOther);
+                person.endlocalStr = getLocalOther(v.endLocal, v.endLocalOther);
+                person.tripTypeStr = getTripType(v.tripType);
+                person.tripTypeDesp = v.tripTypeDesp;
+                listcx.push(person);
+                // html += "<tr>";
+                // html += "<td style='text-align: center;'>" + v.sort + "</td>";
+                // html += "<td style='text-align: center;' >" + getLocalOther(v.startLocal, v.startLocalOther) + " </td>";
+                // html += "<td style='text-align: center;' >" + getLocalOther(v.endLocal, v.endLocalOther) + " </td>";
+                // html += "<td style='text-align: center;' >" + getTripType(v.tripType) + " </td>";
+                // html += "<td style='text-align: center;' >" + v.tripTypeDesp + " </td>";
+                // html += "<td style='text-align: center;' ><button value=" + i + " style='height:5vh;background-color: red;text-align: center; with:60%' class='weui-btn weui-btn_mini weui-btn_primary' onclick='splice(this.value)'>" + "删除" + " </button></td>";
+                // html += "</tr>";
+                // $("#tabtr").html(html);
               }
             });
-
+            tab();
           },
         });
       }
@@ -1461,7 +1474,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)
@@ -1490,7 +1502,7 @@ function helpValue1(v) {
   var isTrip = "";
   var tripDet = "";
 
-
+  var uptownId = $("#uptownId").val();
   if (uptownId == xiaoquId) {
     if (v.workLocal != 0) {
       if (v.workLocal < 4)
@@ -1607,13 +1619,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 "";
 }
 
@@ -1751,7 +1763,7 @@ $('#ribao_score').on('click', function () {
   var suspectedId = $("#suspectedId").val();
   var userId = $("#userId").val();
   var userName = $("#js_input_user_name").val();
-  var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
+  var medical = $("input[name='radio']:checked").val() == undefined ? 0 : $("input[name='radio']:checked").val();
   var medicalzz = $("#switchQuezhen_zz").attr("data-values") == undefined ? 0 : $("#switchQuezhen_zz").attr("data-values");
   var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
   var cough = $("#js_input_user_kesou").attr("data-values") == undefined ? 0 : $("#js_input_user_kesou").attr("data-values");