yuliang 5 tahun lalu
induk
melakukan
98e0c01351
2 mengubah file dengan 25 tambahan dan 12 penghapusan
  1. 4 4
      whepi-ui/templates/home/ribao.ftl
  2. 21 8
      whepi-ui/templates/home/ribao.js

+ 4 - 4
whepi-ui/templates/home/ribao.ftl

@@ -12,7 +12,7 @@
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
                 <div id="notOpenRibao">
                     <div class="weui-cells weui-cells_form">
-                        <div class="weui-cell weui-cell_vcode">
+                        <div class="weui-cell weui-cell_vcode" style="height: 7vh">
                             <div class="weui-cell__hd">
                                 <label class="weui-label">今日居家</label>
                             </div>
@@ -20,8 +20,8 @@
 
                             </div>
                             <div class="weui-cell__ft">
-                                <a id="btnAdd" href="javascript:"
-                                   class="weui-btn weui-btn_mini weui-btn_primary">添加人员</a>
+                                <button id="btnAdd" href="javascript:" style="height:5vh; margin-right: 3vh;"
+                                   class="weui-btn weui-btn_mini weui-btn_primary">添加人员</button>
                             </div>
                         </div>
                     </div>
@@ -50,7 +50,7 @@
                         <input id="js_input_user_status" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 75%;" />
                     </div>
                     <textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
-
+                    <input id="suspectedId" type="text" hidden="hidden" value=""/>
                     <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh; width: 40%;">是否确诊</div>

+ 21 - 8
whepi-ui/templates/home/ribao.js

@@ -179,6 +179,7 @@ function ribao_init() {
         value: "1",
       }]
   });
+
   $("#switchDanjiangeli").select({
     title: "选择是否单间隔离",
     items: [
@@ -286,7 +287,8 @@ function ribao_cell(v) {
   var diarrhea = "腹泻:" + getDiarrhea(v.diarrhea) + ";";
   var others = "其他:" + v.others;
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text">\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: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a></h4>\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' +
     '                                    </div>\n' +
     '                              '));
@@ -294,6 +296,7 @@ function ribao_cell(v) {
 
 function ribao_add() {
   $('#btnAdd').on('click', function () {
+    $("#suspectedId").val("");
     if ($('#ribao')[0].style.display == 'none') {
       $('#notOpenRibao').toggle();
       $('#ribao')[0].style.display = '';
@@ -339,7 +342,7 @@ function ribaoCommit() {
   // return;
 
 
-
+  var suspectedId = $("#suspectedId").val("");
   var userId = $("#userId").val();
   var userName = $("#js_input_user_name").val();
   var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
@@ -354,7 +357,6 @@ function ribaoCommit() {
   var dyspnea = $("#js_input_user_huxi").attr("data-values") == undefined ? 0 : $("#js_input_user_huxi").attr("data-values");
   var fatigue = $("#js_input_user_fali").attr("data-values") == undefined ? 0 : $("#js_input_user_fali").attr("data-values");
   var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
-  var diarrheaNum = 0;
   var others = $("#shuruqita").val()== undefined ? "" : $("#jibenmiaoshu").val();
 
   if (userName == undefined || userName == '') {
@@ -378,6 +380,7 @@ function ribaoCommit() {
     url: '/home/addRibao',
     type: "post",
     data: {
+      "suspectedId": suspectedId,
       "userCreate": userId,
       "userName": userName,
       "grender": grender,
@@ -421,15 +424,25 @@ function deleteSuspected(suspectedId) {
 }
 
 function updateSuspected(suspectedId) {
+  $("#suspectedId").val("");
+  if ($('#ribao')[0].style.display == 'none') {
+    $('#notOpenRibao').toggle();
+    $('#ribao')[0].style.display = '';
+  } else {
+    $('#notOpenRibao')[0].style.display = '';
+    $('#ribao')[0].style.display = 'none';
+  }
   $.ajax({
-    url: '/home/updateSuspected',
-    get: "post",
+    url: '/home/selectSuspected',
+    get: "get",
     data: {
       "suspectedId": suspectedId
     },
     success: function (data) {
-      if (data.data) {
-        var suspected = data.data;
+      // console.log(data);
+      if (data) {
+        var suspected = data;
+        $("#suspectedId").val(suspected.suspectedId);
         $("#js_input_user_sex").val(getGreder(suspected.grender));
         $("#js_input_user_sex").attr("data-values",suspected.grender);
         $("#js_input_user_name").val(suspected.userName);
@@ -535,7 +548,7 @@ function helpValue1(v) {
   var others = "其他:" + v.others;
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text">\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 + diarrheaNum + others  + '</p>\n' +
+    '                                      <p class="weui-media-box__desc">' +familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others  + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }