diff --git a/.gitignore b/.gitignore index 7a45b09..e28be59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ target /.idea/ -*.iml \ No newline at end of file +*.iml +rebel.xml \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp index ff4f03b..d1efcb7 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp @@ -243,7 +243,6 @@ yAxis: { type: 'value', - max: '1200', axisLine: { show: false, lineStyle: { diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index 35223c2..ea4fe04 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -779,10 +779,16 @@ var setting = { $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新 $('#table2').bootstrapTable('refresh'); - } + }, + onClick:onClick } }; - +//树点击事件 +function onClick(e, treeId, treeNode) { + var zTree = $.fn.zTree.getZTreeObj("ztree"); + //点击后选中 + zTree.checkNode(treeNode,!treeNode.checked, true); +}; //查询树节点 function searchNode() { var zTree = $.fn.zTree.getZTreeObj("ztree");