diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index efc7c1b..53b1a45 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -118,7 +118,6 @@ if(deptArr != ''){ deptList = uniq(deptArr); } - console.log("deptList:"+deptList) var depts = ''; if(deptList != ''){ for (var i = 0; i < deptList.length; i++) { @@ -129,7 +128,6 @@ } } } - console.log("存缓存前:"+depts) localStorage.setItem("depts",depts); for (var i = 0; i < list.length; i++) { if (list[0].deptId == list[i].deptId) { @@ -157,9 +155,7 @@ str = ""; /*功能值*/ for (var x = 0; x < list.length; x++) { - //console.log(list[x].methodParent + "=====" + list[j].menuId); if (list[x].method != null && list[x].method != "" && list[x].methodParent == list[j].menuId) { - //console.log(list[x].methodParent+"====="+ list[j].menuId); str += list[x].methodType + ","; } } diff --git a/src/main/webapp/static/js/statistics/recordStatistics.js b/src/main/webapp/static/js/statistics/recordStatistics.js index 20fb5ab..b970ce0 100644 --- a/src/main/webapp/static/js/statistics/recordStatistics.js +++ b/src/main/webapp/static/js/statistics/recordStatistics.js @@ -15,7 +15,7 @@ $(function(){ initTable1(); break; case '3': - initTable2(); + initTable2(getDeptName()); break; } }) @@ -65,7 +65,7 @@ function initTable() { height:550, //是否显示导出按钮 queryParams: function (params) { - return queryParams(params,this); + return queryParams(params,this,''); }, columns: [ { @@ -156,7 +156,7 @@ function initTable1() { showHeader: true,//是否显示列头。 //查询条件 queryParams: function (params) { - return queryParams(params,this); + return queryParams(params,this,''); }, columns: [ { @@ -221,15 +221,12 @@ function initTable1() { ' '; $detail.html(html); var deptName = row.deptName; - //刷新科室选中 - $("#deptName").val(deptName); - $(".selectpicker").selectpicker('refresh'); - initTable2(); + initTable2(deptName); } }); } //第三层,根据科室查询病患详情 -function initTable2() { +function initTable2(deptName) { $("#table2").bootstrapTable({ // 对应table标签的id url: path+"/statistics/getRecordStatisticsByDeptName", // 获取表格数据的url cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true @@ -250,7 +247,7 @@ function initTable2() { showHeader: true,//是否显示列头。 //是否显示导出按钮 queryParams: function (params) { - return queryParams(params,this); + return queryParams(params,this,deptName); }, columns: [ { @@ -327,7 +324,7 @@ function initTable2() { }); } //各表格查询条件 -function queryParams(params,_this){ +function queryParams(params,_this,deptName){ var currPageSize = _this.pageSize; if (currPageSize == 2) { currPageSize = 10; @@ -343,12 +340,15 @@ function queryParams(params,_this){ limit = currPageSize; _this.pageSize = currPageSize; } + if(deptName == ''){ + deptName = getDeptName(); + } var temp = { offset:offset, limit:limit, startDate: $("#startTime1").val(), endDate: $("#endTime1").val(), - deptName:getDeptName(), + deptName:deptName, timeInterval:$("#timeInterval").val(), name:$("#name").val(), inpNo:$("#inpNo").val() @@ -365,9 +365,9 @@ function showDetailMethod(level,deptName){ var timeInterval = $("#timeInterval").val(); var name = $("#name").val(); var inpNo = $("#inpNo").val(); - /*if(deptName == null){ + if(deptName == null){ deptName = getDeptName(); - }*/ + } var urlTemp = url + level + "?deptName="+deptName+"&startDate="+ startDate + "&endDate="+endDate+"&timeInterval="+timeInterval+"&name="+name +"&inpNo="+inpNo;