凌云日报页面完成wanshan2221

whepi-ui/templates/home/ribao.ftl

@@ -7,11 +7,6 @@
             <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
                 健康日历
             </a>
-            <#if (uptownId??) && (uptownId == 11238790987234)>
-            <a class="weui-navbar__item" target="#rb_nav3" module="ri_bao">
-                更改部门
-            </a>
-            </#if>
         </div>
         <div class="weui-tab__panel">
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
@@ -195,6 +190,81 @@
                         <input id="js_input_score_histroy" type="text" hidden="hidden"/>
                         <input id="js_input_score" type="text" hidden="hidden"/>
                     </div>
+                    <div id="ribao" class="weui-btn-area"><#--style="display: none"-->
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
+                            <div style="height: 5vh; line-height: 5vh; width: 55%;">工作驻地</div>
+                            <input id="js_input_gzzd" class="weui-input" type="text" placeholder="请选择"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput1(this)"/>
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <input id="js_input_qtdd" placeholder="其它地点" disabled="disabled" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="height: 5vh; line-height: 5vh; width: 55%;">今日所在地</div>
+                            <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput2(this)"/>
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <input id="js_input_jrszq" placeholder="其它地点" disabled="disabled" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                        </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="height: 5vh; line-height: 5vh; width: 55%;">是否出行</div>
+                            <input id="js_input_sf" class="weui-input" type="text" placeholder="请选择"
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 145%" onchange="selectinput6(this)"/>
+                        </div>
+                        <br/>
+                    <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
+
+                        <div id="none">
+                            <div class="weui-loadmore weui-loadmore_line" style="width: 100%;height: 1vh;">
+                                <span class="weui-loadmore__tips">出行情况上报</span>
+                            </div>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">出发地</div>
+                                <input id="js_input_cfd" class="weui-input" type="text" placeholder="请选择"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput3(this)"/>
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <input id="js_input_cfdq" placeholder="其它地点" disabled="disabled" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                            </div>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">目的地</div>
+                                <input id="js_input_mdd" class="weui-input" type="text" placeholder="请选择"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput4(this)"/>
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <input id="js_input_mddq" placeholder="其它地点" disabled="disabled" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                            </div>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">出行方式</div>
+                                <input id="js_input_cxfs" class="weui-input" type="text" placeholder="请选择出行方式"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput5(this)"/>
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <input id="js_input_cxfsq" placeholder="车次/航班/车牌" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+
+                            </div>
+                            <div class="weui-cell__ft" style="margin-top: 1vh;">
+                                <button href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
+                                        class="weui-btn weui-btn_mini weui-btn_primary" onclick="insertlingyun()">添加
+                                </button>
+                            </div>
+                            <div class="weui-loadmore tt" style="width: 100%;height: 1vh;margin-top: 1vh;">
+                            </div>
+                            <div>
+                                <table cellspacing="0" cellpadding="0" style="width: 100%">
+                                    <tbody id="tabtr"><#--border="1" cellspacing="0" cellpadding="0"-->
+                                    <tr style="background-color: #f8f8f8;">
+                                    <#-- <td style="text-align: center;">序号</td>
+                                <td style="text-align: center;">出发地</td>
+                                <td style="text-align: center;">目的地</td>
+                                <td style="text-align: center;">出行方式</td>
+                                <td style="text-align: center;">车次/航班/车牌</td>-->
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <table id="tab5" class="new_tab" align="left" cellpadding="0" cellspacing="0"
+                                       style="width: 100%;">
+                                </table>
+                            </div>
+                        </div>
+
+                    </div>
                     <div style="display: flex; justify-content: center;">
                         <div style="width: 70%;color: red; text-align: center;">
                             自愿填写病情描述（温度为必填项），提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议
@@ -226,28 +296,6 @@
                     <br/><br/>
                 </div>
             </div>
-            <div id="rb_nav3" class="weui-tab__bd-item ">
-                <div class="weui-panel weui-panel_access">
-<#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
-                    <div class="weui-panel__hd" style=" font-size: large">${linkman!''}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工号${doorplate!''}</div>
-                    <div class="weui-panel__hd" style=" font-size: large"><span id="unitMsg">${ridgepole!''}${unit!''}</span></div>
-                    <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
-                    <div class="weui-cell weui-cell_select weui-cell_select-after">
-                        <div class="weui-cell__hd">
-                            <label for="" class="weui-label" id="danweiTitle">更换部门</label>
-                        </div>
-                        <div class="weui-cell__bd">
-                            <select class="weui-select" id="newUnitId">
-                                <option>请选择</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="weui-form__opr-area">
-                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeUnitId();">确定</a>
-                    </div>
-                    <br/><br/>
-                </div>
-            </div>
         </div>
     </div>
 </div>

whepi-ui/templates/home/ribao.js

@@ -1,4 +1,128 @@
+
 function ribao_init() {
+    //lingyun
+
+
+
+
+    $('#btnRB').on('click', function () {
+        window.location.href = "/yeweihui/home.html";
+    });
+
+    $("#js_input_gzzd").select({
+        title: "选择工作驻地",
+        items: [
+            {
+                title: "武汉市",
+                value: "1",
+            },
+            {
+                title: "宜昌市",
+                value: "2",
+            },
+            {
+                title: "当阳市",
+                value: "3",
+            },
+            {
+                title: "其它地点",
+                value: "4",
+            }]
+    });
+
+    $("#js_input_jrszd").select({
+        title: "选择今日所在地",
+        items: [
+            {
+                title: "武汉市",
+                value: "1",
+            }, {
+                title: "宜昌市",
+                value: "2",
+            },
+            {
+                title: "当阳市",
+                value: "3",
+            },
+            {
+                title: "其它地点",
+                value: "4",
+            }]
+    });
+
+    $("#js_input_sf").select({
+        title: "",
+        items: [
+            {
+                title: "否",
+                value: "0",
+            },
+            {
+                title: "是",
+                value: "1",
+            }]
+    });
+
+    $("#js_input_cfd").select({
+        title: "选择出发地",
+        items: [
+            {
+                title: "武汉市",
+                value: "1",
+            }, {
+                title: "宜昌市",
+                value: "2",
+            },
+            {
+                title: "当阳市",
+                value: "3",
+            },
+            {
+                title: "其它地点",
+                value: "4",
+            }]
+    });
+
+    $("#js_input_mdd").select({
+        title: "选择目的地",
+        items: [
+            {
+                title: "武汉市",
+                value: "1",
+            }, {
+                title: "宜昌市",
+                value: "2",
+            },
+            {
+                title: "当阳市",
+                value: "3",
+            },
+            {
+                title: "其它地点",
+                value: "4",
+            }]
+    });
+
+    $("#js_input_cxfs").select({
+        title: "选择出行方式",
+        items: [
+            {
+                title: "长途汽车",
+                value: "1",
+            },
+            {
+                title: "火车",
+                value: "2",
+            },
+            {
+                title: "飞机",
+                value: "3",
+            },
+            {
+                title: "自驾",
+                value: "4",
+            }]
+    });
 
     // $("#js_input_user_sex").val(getGreder(2));   //设置初始值
 
@@ -210,6 +334,223 @@ function ribao_init() {
     // var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
     // console.log("grender:" + grender)
 }
+function selectinput1(obj){
+    var grender = $("#js_input_gzzd").attr("data-values") == undefined ? 0 : $("#js_input_gzzd").attr("data-values");
+    if(grender != 4){//js_input_qtdd
+        // $('#js_input_qtdd')[0].disabled == 'disabled'
+        $('#js_input_qtdd').attr("disabled","disabled");
+        $("#js_input_qtdd").val("");
+    }else{
+        $('#js_input_qtdd').removeAttr("disabled")
+    }
+
+}
+function selectinput2(obj){
+    var grender = $("#js_input_jrszd").attr("data-values") == undefined ? 0 : $("#js_input_jrszd").attr("data-values");
+    if(grender != 4){//js_input_qtdd
+        // $('#js_input_qtdd')[0].disabled == 'disabled'   js_input_jrszq
+        $('#js_input_jrszq').attr("disabled","disabled");
+        $("#js_input_jrszq").val("");
+    }else{
+        $('#js_input_jrszq').removeAttr("disabled")
+    }
+
+}
+function selectinput3(obj){
+    var grender = $("#js_input_cfd").attr("data-values") == undefined ? 0 : $("#js_input_cfd").attr("data-values");
+    if(grender != 4 ){
+        $('#js_input_cfdq').attr("disabled","disabled");
+        $("#js_input_cfdq").val("");
+    }else{
+        $('#js_input_cfdq').removeAttr("disabled")
+    }
+
+}
+function selectinput4(obj){
+    var grender = $("#js_input_mdd").attr("data-values") == undefined ? 0 : $("#js_input_mdd").attr("data-values");
+    if(grender != 4){
+        $('#js_input_mddq').attr("disabled","disabled");
+        $("#js_input_mddq").val("");
+    }else{
+        $('#js_input_mddq').removeAttr("disabled")
+    }
+
+}
+function selectinput5(obj){
+    var grender = $("#js_input_cxfs").attr("data-values") == undefined ? 0 : $("#js_input_cxfs").attr("data-values");
+    if(grender == 4){
+        // $('#js_input_cxfsq').attr("disabled","disabled")
+    }else{
+        $('#js_input_cxfsq').removeAttr("disabled")
+    }
+
+}
+var listcx = [];
+function selectinput6(obj){
+    var grender = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+    if(grender == 0){
+        $('#none')[0].style.display = 'none';
+        $("#js_input_cxfs").val("");
+        $("#js_input_cfd").val("");
+        $("#js_input_mdd").val("");
+        $('#js_input_cxfsq').val("");
+        $('#js_input_cfdq').val("");
+        $('#js_input_mddq').val("");
+        listcx.splice(0,listcx.length);
+        $('#tabtr').empty();
+    }else if(grender == 1){
+        $('#none')[0].style.display = '';
+    }
+
+}
+//添加出行详情
+
+
+function insertlingyun(){
+    var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+    if(sf == 0 || sf == 3){
+        $.alert("请选择是否出行");
+        return;
+    }
+    var person=new Object();
+    var cxfs = $("#js_input_cxfs").attr("data-values") == undefined ? 0 : $("#js_input_cxfs").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");
+    if(cxfs != 4 && cxfs !=0){
+        var val = $('#js_input_cxfsq').val();
+        if( val == ""){
+            $.alert("请填写车次/航班/车牌");
+            return;
+        }
+
+        person.tripTypeDesp = $('#js_input_cxfsq').val();
+        if(cxfs == 1){
+            person.tripType = 1;
+            person.tripTypeStr = "长途汽车"
+        }else if(cxfs == 2){
+            person.tripType = 2;
+            person.tripTypeStr = "火车";
+        }else if(cxfs == 3){
+            person.tripType = 3;
+            person.tripTypeStr = "飞机";
+        }
+    }else if(cxfs == 0){
+        $.alert("请选择出行方式");
+        return;
+    }else if(cxfs == 4){
+        var val6 = $('#js_input_cxfsq').val();
+        if( val6 == ""){
+            $.alert("请填写车次/航班/车牌");
+            return;
+        }
+        person.tripTypeStr = "自驾";
+        person.tripType = 4;
+        person.tripTypeDesp =$('#js_input_cxfsq').val();
+    }
+    if(cfd == 4 && cfd !=0){
+        var val2 = $('#js_input_cfdq').val();
+        if(val2 ==""){
+            $.alert("请填写出发地");
+            return;
+        }
+        person.startLocalOther = $('#js_input_cfdq').val();
+        person.startLocalStr = $('#js_input_cfdq').val();
+    }else if(cfd != 4 && cfd !=0){
+        if(cfd ==1){
+            person.startLocal = 1;
+            person.startLocalStr = "武汉市";
+            person.startLocalOther = $('#js_input_cfdq').val() == undefined ? "" : $('#js_input_cfdq').val();
+        }else if(cfd == 2){
+            person.startLocal = 2;
+            person.startLocalStr = "宜昌市";
+            person.startLocalOther = $('#js_input_cfdq').val() == undefined ? "" : $('#js_input_cfdq').val();
+        }else if(cfd == 3){
+            person.startLocal = 3;
+            person.startLocalStr = "当阳市";
+            person.startLocalOther = $('#js_input_cfdq').val() == undefined ? "" : $('#js_input_cfdq').val();
+        }
+
+    }else if(cfd ==0){
+        $.alert("请选择出发地");
+        return;
+    }
+    if(mdd ==4 && mdd!=0){
+        var val3 = $('#js_input_mddq').val();
+        if(val3 == ""){
+            $.alert("请填写目的地");
+            return;
+        }
+        person.endLocalOther = $('#js_input_mddq').val();
+        person.endlocalStr = $('#js_input_mddq').val();
+    }else if(mdd != 4 && mdd !=0){
+        if(mdd ==1){
+            person.endLocal = 1;
+            person.endlocalStr = "武汉市";
+            person.endLocalOther = $('#js_input_mddq').val() == undefined ? "" : $('#js_input_mddq').val();
+        }else if(mdd == 2){
+            person.endLocal = 2;
+            person.endlocalStr = "宜昌市";
+            person.endLocalOther = $('#js_input_mddq').val() == undefined ? "" : $('#js_input_mddq').val();
+        }else if(mdd == 3){
+            person.endLocal = 3;
+            person.endlocalStr = "当阳市";
+            person.endLocalOther = $('#js_input_mddq').val() == undefined ? "" : $('#js_input_mddq').val();
+        }
+    }else if(mdd == 0){
+        $.alert("请选择目的地");
+        return;
+    }
+    listcx.push(person);
+    // $.alert("添加成功");
+    tab()
+
+}
+function tab(){
+    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++) {
+        // alert(xxIds[i].name);
+        html += "<th>" + xxIds[i].name + "</th>";
+    }
+    html +="</tr>"
+    for (var i = 0; i < listcx.length; i++) {//后端传过来的集合遍历
+        if (i % 2 != 0) {
+            html += "<tr style='background-color: #f8f8f8;'>";
+        }
+        else {
+            html += "<tr>";
+        }
+
+        html += "<td style='text-align: center;'>" + (i + 1) + "</td>";
+        // var isValue = false; //记录是否赋值
+        html += "<td style='text-align: center;' >" + listcx[i].startLocalStr + " </td>";
+        html += "<td style='text-align: center;' >" + listcx[i].endlocalStr + " </td>";
+        html += "<td style='text-align: center;' >" + listcx[i].tripTypeStr + " </td>";
+        html += "<td style='text-align: center;' >" + listcx[i].tripTypeDesp + " </td>";
+        html += "<td style='text-align: center;' ><button value=" + i + " style='height:3vh;background-color: red;text-align: center;' class='weui-btn weui-btn_mini weui-btn_primary' onclick='splice(this.value)'>" + "删除" + " </button></td>";
+
+        html += "</tr>";
+        $("#tabtr").html(html);
+    }
+}
+function splice(obj){
+    listcx.splice(obj,1);
+    tab()
+}
 
 //近日报告
 function ribaoInitialization(reportId) {
@@ -298,7 +639,7 @@ function ribao_cell(v) {
         diarrhea = "腹泻现象：" + getDiarrhea(v.diarrhea) + "；";
     var others = "";
     if (v.others != "")
-        others = "其他描述：" + v.others+ "；";
+        others = "其他描述：" + v.others + "；";
     var scoreRezult = "";
     if (v.scoreRezult != 0)
         scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
@@ -312,7 +653,26 @@ function ribao_cell(v) {
 
 function ribao_add() {
     $('#btnAdd').on('click', function () {
+
+        $("#js_input_cxfs").empty();
+        $("#js_input_cfd").empty();
+        $("#js_input_mdd").empty();
+        $('#js_input_cxfsq').val("");
+        $('#js_input_cfdq').val("");
+        $('#js_input_mddq').val("");
+        listcx.splice(0,listcx.length);
+        $('#tabtr').empty();
+        $("#js_input_qtdd").val("");
+        $("#js_input_jrszq").val("");
+        $("#js_input_sf").val("");
         $("#suspectedId").val("");
+        $("#js_input_gzzd").val("");
+        $("#js_input_jrszd").val("");
+        $('#js_input_mddq').attr("disabled","disabled");
+        $('#js_input_jrszq').attr("disabled","disabled");
+        $('#js_input_qtdd').attr("disabled","disabled");
+        $('#js_input_cfdq').attr("disabled","disabled");
+
         if ($('#ribao')[0].style.display == 'none') {
             $('#notOpenRibao').toggle();
             $('#ribao')[0].style.display = '';
@@ -321,38 +681,122 @@ function ribao_add() {
             $('#ribao')[0].style.display = 'none';
         }
 
+        var userId = $("#userId").val();
+        //获取用户家人
+        $.ajax({
+            url: '/home/selectAddSuspected',
+            get: "get",
+            data: {
+                "userCreate": userId
+            },
+            success: function (data) {
+                if (data != null || data!='') {
+                    //存在
+                    var suspected = data;
+                    $("#js_input_user_sex").val(getGreder(suspected.grender));
+                    $("#js_input_user_sex").attr("data-values", suspected.grender);
+                    $("#js_input_user_name").val(suspected.userName);
+                    $("#js_input_user_age").val(suspected.age);
+                    //基本情况
+                    if (suspected.familyStatus != "") {
+                        var familyStatusList = suspected.familyStatus.split(",");
+                        if (familyStatusList[0] == 1)
+                            $("input[name='checkbox1']").prop("checked", "checked");
+                        else
+                            $("input[name='checkbox1']").removeAttr("checked");
+                        if (familyStatusList[1] == 1)
+                            $("input[name='checkbox2']").prop("checked", "checked");
+                        else
+                            $("input[name='checkbox2']").removeAttr("checked");
+                        if (familyStatusList[2] == 1)
+                            $("input[name='checkbox3']").prop("checked", "checked");
+                        else
+                            $("input[name='checkbox3']").removeAttr("checked");
+                        if (familyStatusList[3] == 1)
+                            $("input[name='checkbox4']").prop("checked", "checked");
+                        else
+                            $("input[name='checkbox4']").removeAttr("checked");
+                        if (familyStatusList[4] == 1)
+                            $("input[name='checkbox5']").prop("checked", "checked");
+                        else
+                            $("input[name='checkbox5']").removeAttr("checked");
+                        if (familyStatusList[5] == 1)
+                            $("input[name='checkbox6']").prop("checked", "checked");
+                        else
+                            $("input[name='checkbox6']").removeAttr("checked");
+                        if (familyStatusList[6] == 1)
+                            $("input[name='checkbox7']").prop("checked", "checked");
+                        else
+                            $("input[name='checkbox7']").removeAttr("checked");
+
+                    }
+
+                    $("#switchQuezhen").val(getMedical(suspected.medical));
+                    $("#switchQuezhen").attr("data-values", suspected.medical);
+
+                    $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
+                    $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
+
+                    $("#js_input_user_tiwen").val(suspected.temperature);
+
+                    $("#js_input_user_kesou").val(getCough(suspected.cough));
+                    $("#js_input_user_kesou").attr("data-values", suspected.cough);
 
-        //基本情况
-        $("input[name='checkbox1']").removeAttr("checked");
-        $("input[name='checkbox2']").removeAttr("checked");
-        $("input[name='checkbox3']").removeAttr("checked");
-        $("input[name='checkbox4']").removeAttr("checked");
-        $("input[name='checkbox5']").removeAttr("checked");
-        $("input[name='checkbox6']").removeAttr("checked");
-        $("input[name='checkbox7']").removeAttr("checked");
+                    $("#js_input_user_jirou").val(getMuscle(suspected.muscle));
+                    $("#js_input_user_jirou").attr("data-values", suspected.muscle);
 
-        $("#switchQuezhen").val(getMedical(0));
-        $("#switchQuezhen").attr("data-values", 0);
+                    $("#js_input_user_huxi").val(getDyspnea(suspected.dyspnea));
+                    $("#js_input_user_huxi").attr("data-values", suspected.dyspnea);
 
-        $("#switchDanjiangeli").val(getSingleRoom(0));
-        $("#switchDanjiangeli").attr("data-values", 0);
+                    $("#js_input_user_fali").val(getFatigue(suspected.fatigue));
+                    $("#js_input_user_fali").attr("data-values", suspected.fatigue);
 
-        $("#js_input_user_tiwen").val(0);
+                    $("#js_input_user_fuxie").val(getDiarrhea(suspected.diarrhea));
+                    $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
 
-        $("#js_input_user_kesou").val(getCough(0));
-        $("#js_input_user_kesou").attr("data-values", 0);
+                    $("#shuruqita").val(suspected.others);
+                    $("#js_input_score_rezult").val(getScoreRezult(suspected.scoreRezult, suspected.temperatureScore));
+                    $("#js_input_score_rezult_value").val(suspected.scoreRezult);
+                    $("#js_input_temperature_score").val(suspected.temperatureScore);
+                    $("#js_input_score_histroy").val(suspected.scoreHistroy);
+                    $("#js_input_score").val(suspected.score);
+                }
+                else {
+                    //基本情况
+                    $("input[name='checkbox1']").removeAttr("checked");
+                    $("input[name='checkbox2']").removeAttr("checked");
+                    $("input[name='checkbox3']").removeAttr("checked");
+                    $("input[name='checkbox4']").removeAttr("checked");
+                    $("input[name='checkbox5']").removeAttr("checked");
+                    $("input[name='checkbox6']").removeAttr("checked");
+                    $("input[name='checkbox7']").removeAttr("checked");
+
+                    $("#switchQuezhen").val(getMedical(0));
+                    $("#switchQuezhen").attr("data-values", 0);
+
+                    $("#switchDanjiangeli").val(getSingleRoom(0));
+                    $("#switchDanjiangeli").attr("data-values", 0);
+
+                    $("#js_input_user_tiwen").val(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_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_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_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);
 
-        $("#js_input_user_fuxie").val(getDiarrhea(0));
-        $("#js_input_user_fuxie").attr("data-values", 0);
+                }
+            },
+        });
 
     });
 }
@@ -383,7 +827,7 @@ function ribaoCommit() {
         return;
     }
     //男性不能选择妊娠期
-    if ( $("#js_input_user_sex").attr("data-values")==1 && $("input[name='checkbox7']:checked").val() == "on") {
+    if ($("#js_input_user_sex").attr("data-values") == 1 && $("input[name='checkbox7']:checked").val() == "on") {
         $.alert("男性不能选择妊娠期");
         return;
     }
@@ -506,6 +950,118 @@ function ribaoCommit() {
             document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
         },
     });
+
+
+    //lingyun
+    var gzzd = $("#js_input_gzzd").attr("data-values") == undefined ? 0 : $("#js_input_gzzd").attr("data-values");
+    var qtdd = $("#js_input_qtdd").val();
+    var workLocal="";
+    var workLocalOther = "";
+    if(gzzd == 0){
+        $.alert("请选择工作驻地");
+        return;
+    }else if(gzzd == 4 && qtdd == ""){
+        $.alert("请填写工作驻地");
+        return;
+    }else if(gzzd != 0 && gzzd !=4){
+        if(gzzd ==1){
+            workLocal = 1;
+        }else if(gzzd == 2){
+            workLocal = 2;
+        }else if(gzzd == 3){
+            workLocal = 3;
+        }
+    }else if(gzzd == 4 && qtdd != ""){
+        workLocal = 4;
+        workLocalOther = qtdd;
+    }
+    //var listcx = [];
+    //var person=new Object();
+
+    var jrszd = $("#js_input_jrszd").attr("data-values") == undefined ? 0 : $("#js_input_jrszd").attr("data-values");
+    var jrszq = $("#js_input_jrszq").val();
+    var todyLocal ="";
+    var todyLocalOther = "";
+    if(jrszd == 0){
+        $.alert("请选择今日所在地");
+        return;
+    }else if(jrszd == 4 && jrszq == ""){
+        $.alert("请填写今日所在地");
+        return;
+    }else if(jrszd != 0 && jrszd !=4){
+        if(jrszd ==1){
+            todyLocal = 1;
+        }else if(jrszd == 2){
+            todyLocal = 2;
+        }else if(jrszd == 3){
+            todyLocal = 3;
+        }
+    }else if(jrszd == 4 && jrszq != ""){
+        todyLocal = 4;
+        todyLocalOther = jrszq;
+    }
+    var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+    var isTrip= "";
+    if(sf == 3){
+        $.alert("请选择是否出行");
+        return;
+    }else{
+        isTrip = sf;
+    }
+    console.log(JSON.stringify(listcx))
+
+    $.ajax({
+        url: '/home/addRibaoTrip',
+        type: "post",
+        data: {
+            "suspectedId": suspectedId,
+            "userCreate": userId,
+            "userName": userName,
+            "grender": grender,
+            "age": age,
+            "familyStatus": familyStatus,
+            "statusDesp": statusDesp,
+            "medical": medical,
+            "singleRoom": singleRoom,
+            "temperature": temperature,
+            "cough": cough,
+            "muscle": muscle,
+            "dyspnea": dyspnea,
+            "fatigue": fatigue,
+            "diarrhea": diarrhea,
+            "others": others,
+            "scoreRezult": scoreRezult,
+            "temperatureScore": temperatureScore,
+            "scoreHistroy": scoreHistroy,
+            "score": score,
+            "workLocal": JSON.stringify(workLocal),
+            "workLocalOther": JSON.stringify(workLocalOther),
+            "todyLocal": JSON.stringify(todyLocal),
+            "todyLocalOther": JSON.stringify(todyLocalOther),
+            "isTrip": JSON.stringify(isTrip),
+            "listcx": JSON.stringify(listcx),
+        },
+        success: function (data) {
+            if (data.msgReport == "2") {
+                $.toast("家人姓名不能重复，如果重复，可以带上称呼");
+                return;
+            }
+            if ($('#ribao')[0].style.display == 'none') {
+                $('#notOpenRibao').toggle();
+                $('#ribao')[0].style.display = '';
+            } else {
+                $('#notOpenRibao')[0].style.display = '';
+                $('#ribao')[0].style.display = 'none';
+            }
+            $('#ribao_jinrijujian').empty();
+            $('#ribao_jinrijujian').append(data.safetyNum);
+
+            ribao_refrash();
+
+            clearShow();
+            document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
+        },
+    });
 }
 
 function deleteSuspected(suspectedId) {
@@ -631,7 +1187,8 @@ function addReport() {
         },
         success: function (data) {
             $.toast(data.msg);
-            document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+            if (data.msg == "操作成功")
+                document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
         },
     });
 }
@@ -726,21 +1283,25 @@ function getGreder(greder) {
 
 function getFamilyStatus(familyStatus) {
     var familyStatusList = familyStatus.split(",");
-    var familyStatusString = "无病史，";
-    if (familyStatusList[0] == 1)
-        familyStatusString += "心脑血管疾病(服用ARB),";
-    if (familyStatusList[1] == 1)
-        familyStatusString += "心脑血管疾病(未服ARB),";
-    if (familyStatusList[2] == 1)
-        familyStatusString += "呼吸系统病史,";
-    if (familyStatusList[3] == 1)
-        familyStatusString += "肿瘤病史,";
-    if (familyStatusList[4] == 1)
-        familyStatusString += "糖尿病史,";
-    if (familyStatusList[5] == 1)
-        familyStatusString += "服用过激素药物,";
-    if (familyStatusList[6] == 1)
-        familyStatusString += "妊娠期,";
+    var familyStatusString = "";
+    if (familyStatus == '0,0,0,0,0,0,0')
+        familyStatusString += "无病史，";
+    else {
+        if (familyStatusList[0] == 1)
+            familyStatusString += "心脑血管疾病(服用ARB),";
+        if (familyStatusList[1] == 1)
+            familyStatusString += "心脑血管疾病(未服ARB),";
+        if (familyStatusList[2] == 1)
+            familyStatusString += "呼吸系统病史,";
+        if (familyStatusList[3] == 1)
+            familyStatusString += "肿瘤病史,";
+        if (familyStatusList[4] == 1)
+            familyStatusString += "糖尿病史,";
+        if (familyStatusList[5] == 1)
+            familyStatusString += "服用过激素药物,";
+        if (familyStatusList[6] == 1)
+            familyStatusString += "妊娠期,";
+    }
     return familyStatusString.substring(0, familyStatusString.length - 1);
 }
 

whepi-ui/templates/lingyun/ribao.ftl

@@ -240,7 +240,7 @@
 
                             </div>
                             <div class="weui-cell__ft" style="margin-top: 1vh;">
-                                <button id="btnAdd" href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
+                                <button href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
                                         class="weui-btn weui-btn_mini weui-btn_primary" onclick="insertlingyun()">添加
                                 </button>
                             </div>

whepi-ui/templates/lingyun/ribao.js

@@ -4,6 +4,7 @@ function ribao_init() {
 
 
 
+
     $('#btnRB').on('click', function () {
         window.location.href = "/yeweihui/home.html";
     });
@@ -337,7 +338,8 @@ function selectinput1(obj){
     var grender = $("#js_input_gzzd").attr("data-values") == undefined ? 0 : $("#js_input_gzzd").attr("data-values");
     if(grender != 4){//js_input_qtdd
         // $('#js_input_qtdd')[0].disabled == 'disabled'
-        $('#js_input_qtdd').attr("disabled","disabled")
+        $('#js_input_qtdd').attr("disabled","disabled");
+        $("#js_input_qtdd").val("");
     }else{
         $('#js_input_qtdd').removeAttr("disabled")
     }
@@ -346,8 +348,9 @@ function selectinput1(obj){
 function selectinput2(obj){
     var grender = $("#js_input_jrszd").attr("data-values") == undefined ? 0 : $("#js_input_jrszd").attr("data-values");
     if(grender != 4){//js_input_qtdd
-        // $('#js_input_qtdd')[0].disabled == 'disabled'
-        $('#js_input_jrszq').attr("disabled","disabled")
+        // $('#js_input_qtdd')[0].disabled == 'disabled'   js_input_jrszq
+        $('#js_input_jrszq').attr("disabled","disabled");
+        $("#js_input_jrszq").val("");
     }else{
         $('#js_input_jrszq').removeAttr("disabled")
     }
@@ -356,7 +359,8 @@ function selectinput2(obj){
 function selectinput3(obj){
     var grender = $("#js_input_cfd").attr("data-values") == undefined ? 0 : $("#js_input_cfd").attr("data-values");
     if(grender != 4 ){
-        $('#js_input_cfdq').attr("disabled","disabled")
+        $('#js_input_cfdq').attr("disabled","disabled");
+        $("#js_input_cfdq").val("");
     }else{
         $('#js_input_cfdq').removeAttr("disabled")
     }
@@ -365,7 +369,8 @@ function selectinput3(obj){
 function selectinput4(obj){
     var grender = $("#js_input_mdd").attr("data-values") == undefined ? 0 : $("#js_input_mdd").attr("data-values");
     if(grender != 4){
-        $('#js_input_mddq').attr("disabled","disabled")
+        $('#js_input_mddq').attr("disabled","disabled");
+        $("#js_input_mddq").val("");
     }else{
         $('#js_input_mddq').removeAttr("disabled")
     }
@@ -454,12 +459,15 @@ function insertlingyun(){
         if(cfd ==1){
             person.startLocal = 1;
             person.startLocalStr = "武汉市";
+            person.startLocalOther = $('#js_input_cfdq').val() == undefined ? "" : $('#js_input_cfdq').val();
         }else if(cfd == 2){
             person.startLocal = 2;
             person.startLocalStr = "宜昌市";
+            person.startLocalOther = $('#js_input_cfdq').val() == undefined ? "" : $('#js_input_cfdq').val();
         }else if(cfd == 3){
             person.startLocal = 3;
             person.startLocalStr = "当阳市";
+            person.startLocalOther = $('#js_input_cfdq').val() == undefined ? "" : $('#js_input_cfdq').val();
         }
 
     }else if(cfd ==0){
@@ -478,19 +486,22 @@ function insertlingyun(){
         if(mdd ==1){
             person.endLocal = 1;
             person.endlocalStr = "武汉市";
+            person.endLocalOther = $('#js_input_mddq').val() == undefined ? "" : $('#js_input_mddq').val();
         }else if(mdd == 2){
             person.endLocal = 2;
             person.endlocalStr = "宜昌市";
+            person.endLocalOther = $('#js_input_mddq').val() == undefined ? "" : $('#js_input_mddq').val();
         }else if(mdd == 3){
             person.endLocal = 3;
             person.endlocalStr = "当阳市";
+            person.endLocalOther = $('#js_input_mddq').val() == undefined ? "" : $('#js_input_mddq').val();
         }
     }else if(mdd == 0){
         $.alert("请选择目的地");
         return;
     }
     listcx.push(person);
-    $.alert("添加成功");
+    // $.alert("添加成功");
     tab()
 
 }
@@ -642,7 +653,29 @@ function ribao_cell(v) {
 
 function ribao_add() {
     $('#btnAdd').on('click', function () {
+
+        $("#js_input_cxfs").val(getMedical(0));
+        // $("#js_input_cxfs").attr("data-values", 0);
+        $("#js_input_cfd").val(getMedical(0));
+        // $("#js_input_cfd").attr("data-values", 0);
+        $("#js_input_mdd").val(getMedical(0));
+        // $("#js_input_mdd").attr("data-values", 0);
+        $('#js_input_cxfsq').val("");
+        $('#js_input_cfdq').val("");
+        $('#js_input_mddq').val("");
+        listcx.splice(0,listcx.length);
+        $('#tabtr').empty();
+        $("#js_input_qtdd").val("");
+        $("#js_input_jrszq").val("");
+        $("#js_input_sf").val("");
         $("#suspectedId").val("");
+        $("#js_input_gzzd").val("");
+        $("#js_input_jrszd").val("");
+        $('#js_input_mddq').attr("disabled","disabled");
+        $('#js_input_jrszq').attr("disabled","disabled");
+        $('#js_input_qtdd').attr("disabled","disabled");
+        $('#js_input_cfdq').attr("disabled","disabled");
+
         if ($('#ribao')[0].style.display == 'none') {
             $('#notOpenRibao').toggle();
             $('#ribao')[0].style.display = '';

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: peig
+  profiles.active: maoyunfeng
 
   application:
     name: bofeng-web