From dd787b545b28bdb733b4f9049f29c95deba622e6 Mon Sep 17 00:00:00 2001
From: dsh <15569653818@163.com>
Date: Thu, 14 Mar 2024 17:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E7=BD=91=E7=BB=9C=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E3=80=81=E6=B6=89=E5=AF=86=E8=B5=84=E4=BA=A7=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E3=80=81=E6=B6=89=E5=AF=86=E8=B5=84=E4=BA=A7=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E3=80=81=E6=A3=80=E6=9F=A5=E9=80=9A=E7=9F=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E6=A3=80=E6=9F=A5=E6=8A=A5=E5=91=8A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E6=B6=89=E5=AF=86=E4=BA=BA=E5=91=98=E7=A6=BB?=
 =?UTF-8?q?=E8=81=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/zhyw/smjc/CheckManage.jsp            |  92 +++++++++++++-
 web/zhyw/smjc/CheckManageReault.jsp      | 104 ++++++++++++++-
 web/zhyw/smjc/CheckNotifyManage.jsp      | 112 +++++++++++++++--
 web/zhyw/smry/rylz/LeaveManage.jsp       |  84 +++++++++----
 web/zhyw/smsb/sbdj/propertyUseEdit.jsp   |  98 ++++++++++++++-
 web/zhyw/smsb/sbdj/propertyUseManage.jsp | 102 ++++++++++-----
 web/zhyw/smsb/smwl/propertyNetManage.jsp |  92 ++++++++++----
 web/zhyw/smsb/smzd/propertyTmaManage.jsp | 154 ++++++++++++++++++++---
 8 files changed, 726 insertions(+), 112 deletions(-)

diff --git a/web/zhyw/smjc/CheckManage.jsp b/web/zhyw/smjc/CheckManage.jsp
index 8c734e1..a592564 100644
--- a/web/zhyw/smjc/CheckManage.jsp
+++ b/web/zhyw/smjc/CheckManage.jsp
@@ -25,6 +25,94 @@ select
 {
    width:155px;
 }
+#myGrid .gridHead{
+	height: 50px;
+	line-height: 50px;
+	background-color: #cce7f5;
+	color: #000;
+	font-size: 16px;
+	font-weight: bold;
+	box-sizing: border-box;
+}
+#myGrid .gridHead .gridRow{
+	display: flex;
+	justify-content: start;
+}
+#myGrid .gridHead span{
+	text-align: center;
+	display: inline-block;
+	border-right: 1px solid #000000;
+	box-sizing: border-box;
+}
+#myGrid .gridHead span:nth-child(1){
+	width: 120px;
+}
+#myGrid .gridHead span:nth-child(2){
+	width: 120px;
+}
+#myGrid .gridHead span:nth-child(3){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(4){
+	width: 280px;
+}
+#myGrid .gridHead span:nth-child(5){
+	width: 280px;
+}
+#myGrid .gridHead span:nth-child(6){
+	width: 240px;
+}
+#myGrid .gridHead span:nth-child(7){
+	width: 240px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow{
+	height: 30px;
+	/*margin-top: 5px;*/
+	display: flex;
+	justify-content: start;
+	align-items: center;
+	border-bottom: 1px solid #000;
+	color: #000;
+}
+#myGrid .gridBody .gridRow span{
+	width: 148px;
+	display: inline-block;
+	border-right: 1px solid;
+	text-align: center;
+	height: 30px;
+	line-height: 30px;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow span:nth-child(1){
+	width: 120px;
+}
+#myGrid .gridBody .gridRow span:nth-child(2){
+	width: 120px;
+}
+#myGrid .gridBody .gridRow span:nth-child(3){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(4){
+	width: 280px;
+}
+#myGrid .gridBody .gridRow span:nth-child(5){
+	width: 280px;
+}
+#myGrid .gridBody .gridRow span:nth-child(6){
+	width: 240px;
+}
+#myGrid .gridBody .gridRow span:nth-child(7){
+	width: 240px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow span a,img,input {
+	margin-right: 6px;
+	margin-top: 8px;
+}
+form{
+	height: 100%;
+}
 </style>
 <script>
 function textToUpperCase(){
@@ -213,10 +301,10 @@ html { overflow-x:hidden; overflow-y:hidden; }
 	if (buf != null) {
 		int rowcount = buf.getRowCount();
 %>
-<table width="99%"  border="0" align="center" cellpadding="0" cellspacing="1" class="box">
+<table width="99%"  border="0" align="center" style="margin-top: 4px;height: 84%"  cellpadding="0" cellspacing="1" class="box">
  <tr>
   <td>
-	<div style="width:100%; height:385px;overflow: auto;">
+	<div style="width:100%; height:96%;overflow: auto;">
   	  <div id="myGrid" class="2k3Grid" borderWidth="0" contextMenu="mnuGridContextMenu" altRowColor="oldLace">
     	<div class="gridHead">
     	  <!--div align="left"><span width="5%">共检索到<%=rowcount%>条记录</span></div-->
diff --git a/web/zhyw/smjc/CheckManageReault.jsp b/web/zhyw/smjc/CheckManageReault.jsp
index 3930ebe..82440a4 100644
--- a/web/zhyw/smjc/CheckManageReault.jsp
+++ b/web/zhyw/smjc/CheckManageReault.jsp
@@ -26,6 +26,106 @@ select
 {
    width:155px;
 }
+#myGrid .gridHead{
+	height: 50px;
+	line-height: 50px;
+	background-color: #cce7f5;
+	color: #000;
+	font-size: 16px;
+	font-weight: bold;
+	box-sizing: border-box;
+}
+#myGrid .gridHead .gridRow{
+	display: flex;
+	justify-content: start;
+}
+#myGrid .gridHead span{
+	text-align: center;
+	display: inline-block;
+	border-right: 1px solid #000000;
+	box-sizing: border-box;
+}
+#myGrid .gridHead span:nth-child(1){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(2){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(3){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(4){
+	width: 190px;
+}
+#myGrid .gridHead span:nth-child(5){
+	width: 190px;
+}
+#myGrid .gridHead span:nth-child(6){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(7){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(8){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(9){
+	width: 200px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow{
+	height: 30px;
+	/*margin-top: 5px;*/
+	display: flex;
+	justify-content: start;
+	align-items: center;
+	border-bottom: 1px solid #000;
+	color: #000;
+}
+#myGrid .gridBody .gridRow span{
+	width: 148px;
+	display: inline-block;
+	border-right: 1px solid;
+	text-align: center;
+	height: 30px;
+	line-height: 30px;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow span:nth-child(1){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(2){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(3){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(4){
+	width: 190px;
+}
+#myGrid .gridBody .gridRow span:nth-child(5){
+	width: 190px;
+}
+#myGrid .gridBody .gridRow span:nth-child(6){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(7){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(8){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(9){
+	width: 200px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow span a,img,input {
+	margin-right: 6px;
+	margin-top: 8px;
+}
+form{
+	height: 100%;
+}
 html { overflow-x:hidden; overflow-y:hidden; } 
 </style>
 <script>
@@ -235,10 +335,10 @@ function selectChange(i)
 	if (buf != null) {
 		int rowcount = buf.getRowCount();
 %>
-<table width="99%"  border="0" align="center" cellpadding="0" cellspacing="1" class="box">
+<table width="99%"  border="0" align="center" style="margin-top: 4px;height: 84%" cellpadding="0" cellspacing="1" class="box">
  <tr>
   <td>
-	<div style="width:100%; height:385px;overflow: auto;">
+	<div style="width:100%; height:96%;overflow: auto;">
 	  <div id="myGrid" class="2k3Grid" borderWidth="0" contextMenu="mnuGridContextMenu" altRowColor="oldLace">
   		 <div class="gridHead">
   				 <!--div align="left"><span width="5%">共检索到<%=rowcount%>条记录</span></div-->
diff --git a/web/zhyw/smjc/CheckNotifyManage.jsp b/web/zhyw/smjc/CheckNotifyManage.jsp
index ee7bba1..0ea4621 100644
--- a/web/zhyw/smjc/CheckNotifyManage.jsp
+++ b/web/zhyw/smjc/CheckNotifyManage.jsp
@@ -25,6 +25,100 @@ select
 {
    width:155px;
 }
+#myGrid .gridHead{
+	height: 50px;
+	line-height: 50px;
+	background-color: #cce7f5;
+	color: #000;
+	font-size: 16px;
+	font-weight: bold;
+	box-sizing: border-box;
+}
+#myGrid .gridHead .gridRow{
+	display: flex;
+	justify-content: start;
+}
+#myGrid .gridHead span{
+	text-align: center;
+	display: inline-block;
+	border-right: 1px solid #000000;
+	box-sizing: border-box;
+}
+#myGrid .gridHead span:nth-child(1){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(2){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(3){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(4){
+	width: 280px;
+}
+#myGrid .gridHead span:nth-child(5){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(6){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(7){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(8){
+	width: 200px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow{
+	height: 30px;
+	/*margin-top: 5px;*/
+	display: flex;
+	justify-content: start;
+	align-items: center;
+	border-bottom: 1px solid #000;
+	color: #000;
+}
+#myGrid .gridBody .gridRow span{
+	width: 148px;
+	display: inline-block;
+	border-right: 1px solid;
+	text-align: center;
+	height: 30px;
+	line-height: 30px;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow span:nth-child(1){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(2){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(3){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(4){
+	width: 280px;
+}
+#myGrid .gridBody .gridRow span:nth-child(5){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(6){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(7){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(8){
+	width: 200px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow span a,img,input {
+	margin-right: 6px;
+	margin-top: 8px;
+}
+form{
+	height: 100%;
+}
 </style>
 <script>
 function setValue() {
@@ -185,10 +279,10 @@ html { overflow-x:hidden; overflow-y:hidden; }
 		int rowcount = buf.getRowCount();
 %>
 <center>
-<table width="99%"  border="0" cellpadding="0" cellspacing="1" class="box">
+<table width="99%"  border="0" cellpadding="0" cellspacing="1" style="margin-top: 4px;height: 85%" class="box">
     <tr>
       <td>
-			<div style="width:100%; height:385px;overflow: auto;">
+			<div style="width:100%; height:96%;overflow: auto;">
   				<div id="myGrid" class="2k3Grid" borderWidth="0" contextMenu="mnuGridContextMenu" altRowColor="oldLace">
     				<div class="gridHead">
           				<div class="gridRow">
@@ -217,8 +311,8 @@ html { overflow-x:hidden; overflow-y:hidden; }
 		     }
 %>	
 		<div class="gridRow">
-		<span style="text-align: center;width:2px;"><%=i+1%></span>
-		<span style="text-align: center;width:2px;"><input type="checkbox" name="Infos" value="<%=tempCheckid%>"></span>
+		<span><%=i+1%></span>
+		<span><input type="checkbox" name="Infos" value="<%=tempCheckid%>"></span>
 	    <span><%=SM4.SM4Decrypt(Base64.decode(buf.fget("notify_staffed", i))) %></span>
 		<span><%=buf.fget("departname",i) %></span>
 		<span><%=buf.fget("notify_time",i) %></span>
@@ -226,14 +320,14 @@ html { overflow-x:hidden; overflow-y:hidden; }
 		<span width="50px;"><%=buf.fget("notify_content",i) %></span>
 		<span>
 		<%if(login.getSanyuan().equals("0")){ %>
-            <a href="/servlet/CheckManage?operate=queryCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>&nbsp;&nbsp;
-		    <a href="/servlet/CheckManage?operate=updateCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>&nbsp;&nbsp;
+            <a href="/servlet/CheckManage?operate=queryCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>
+		    <a href="/servlet/CheckManage?operate=updateCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>
 		    <a onclick="return confirm('您确定要删除此信息吗？')" href="/servlet/CheckManage?operate=deleteCheckNotifyRow&notifyId=<%=tempCheckid%>"><img src="/images1/delete.gif" border="0" alt="删除"/></a>
 		<%}else if(login.getSanyuan().equals("1")){ %>
-		    <a href="/servlet/CheckManage?operate=queryCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>&nbsp;&nbsp;
+		    <a href="/servlet/CheckManage?operate=queryCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>
 		<%}else { %>
-		    <a href="/servlet/CheckManage?operate=queryCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>&nbsp;&nbsp;
-		    <a href="/servlet/CheckManage?operate=updateCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>&nbsp;&nbsp;
+		    <a href="/servlet/CheckManage?operate=queryCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>
+		    <a href="/servlet/CheckManage?operate=updateCheckNotifyById&notifyId=<%=tempCheckid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>
 		    <a onclick="return confirm('您确定要删除此信息吗？')" href="/servlet/CheckManage?operate=deleteCheckNotifyRow&notifyId=<%=tempCheckid%>"><img src="/images1/delete.gif" border="0" alt="删除"/></a>
 		<%} %>
 		    
diff --git a/web/zhyw/smry/rylz/LeaveManage.jsp b/web/zhyw/smry/rylz/LeaveManage.jsp
index 3a7f41e..190b177 100644
--- a/web/zhyw/smry/rylz/LeaveManage.jsp
+++ b/web/zhyw/smry/rylz/LeaveManage.jsp
@@ -32,6 +32,46 @@ select
 .spanc{
 text-align: center;
 }
+#myGrid .gridHead{
+	height: 50px;
+	line-height: 50px;
+	background-color: #cce7f5;
+	color: #000;
+	font-size: 16px;
+	box-sizing: border-box;
+}
+#myGrid .gridHead .gridRow{
+	display: flex;
+	justify-content: space-between;
+}
+#myGrid .gridHead span{
+	text-align: center;
+	display: inline-block;
+	width: 148px;
+	border-right: 1px solid #000000;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow{
+	height: 30px;
+	/*margin-top: 5px;*/
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: 1px solid #000;
+	color: #000;
+}
+#myGrid .gridBody .gridRow span{
+	width: 148px;
+	display: inline-block;
+	border-right: 1px solid;
+	text-align: center;
+	height: 30px;
+	line-height: 30px;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow span a,img,input {
+	margin-right: 6px;
+}
 </style>
 <script>
 function setValue() {
@@ -90,7 +130,7 @@ function selectChange(i)
 <body onload="setValue();" scroll="no" >
 <input type="hidden" name="operate" value=""/>
 <input type="hidden" name="empId" value="<%=optrid%>"/>
-<form name="form1" method="post" action="/servlet/LeaveManage">
+<form name="form1" method="post" action="/servlet/LeaveManage" style="height: 100%;">
       <table width="99%"  border="0" align="center" cellpadding="0" cellspacing="1" class="box">
            <tr>
               <td valign="top">
@@ -110,13 +150,13 @@ function selectChange(i)
    <table width="99%"  border="0" align="center" cellpadding="2" cellspacing="1"  class="table02">
       	<tr bgcolor="#FFFFFF">
 		<td class="cell1">所属地市</td>
-		<td class="cell2" width="10%">
+		<td class="cell2" width="15%">
 			<select class='aselect' name="sj" setValue="<%=sj%>" onChange="selectChange(1);">
 		   		<%=Para.getSj(getPara)%>            					
 			</select><font color="#ff0000">*</font>
 		</td>		
 		<td class="cell1">所属区县</td>
-		<td class="cell2" width="10%">
+		<td class="cell2" width="15%">
 			<select class='aselect' name="qj" setValue="<%=qj%>"  <%if(sj.equals("0930")){ %> disabled="disabled" <%} %> onChange="selectChange(1);">
 		   		<%=Para.getQj(getPara,sj)%>            					
 			</select><font color="#ff0000">*</font>
@@ -163,15 +203,15 @@ function selectChange(i)
 	if (buf != null) {
 		int rowcount = buf.getRowCount();
 %>
-	<table width="99%"  border="0" align="center" cellpadding="0" cellspacing="1" class="box">
+	<table width="99%"  border="0" align="center" cellpadding="0" style="height: 87%;" cellspacing="1" class="box">
   <tr>
   <td>
-			<div style="width:100%; height:385px;overflow: auto;">
+			<div style="width:100%; height:96%;overflow: auto;">
   				<div id="myGrid" class="2k3Grid" borderWidth="0" contextMenu="mnuGridContextMenu" altRowColor="oldLace">
     				<div class="gridHead">
     				 <!--div align="left"><span width="5%">共检索到<%=rowcount%>条记录</span></div-->
           				<div class="gridRow">
-		<span style="text-align: center;" width="5px"><b>序号</b></span>
+		<span style="width: 100px;"><b>序号</b></span>
 		<span width="15px"><b>所属单位</b></span>
 		<span width="10px"><b>离岗状态</b></span>
 		<span width="10px"><b>审批人</b></span>
@@ -180,7 +220,7 @@ function selectChange(i)
 		<span width="10px"><b>入职日期</b></span>
 		<span width="10px"><b>离岗日期</b></span>
 		<span width="10px"><b>工作交接</b></span>
-		<span width="10px"><b>操作</b></span>
+		<span style="width: 182px;border-right: none;"><b>操作</b></span>
 		</div>
     </div>
 		<div class="gridBody"> 
@@ -223,18 +263,18 @@ function selectChange(i)
 		     }
 %>	
 		<div class="gridRow">
-		<span style="text-align: center;" width="5px"><%=i+1%></span>
+		<span style="text-align: center;width: 100px;"><%=i+1%></span>
 		<span ><%=buf.fget("departname",i)%></span>
 	
            <span >
          	    <%
 	   if(tempState.equals("已离岗")){
 		%>
-		  <img src="../../images1/nopass.png" width="16" height="16" alt="已离岗" style="cursor: pointer;">
+		  <img src="../../images1/nopass.png" width="16" height="16" alt="已离岗" style="cursor: pointer;margin-top: 5%;">
 		<%   
 	   }else{
 	   %>
-		  <img src="../../images1/pass.png" width="16" height="16" alt="未离岗" style="cursor: pointer;">
+		  <img src="../../images1/pass.png" width="16" height="16" alt="未离岗" style="cursor: pointer;margin-top: 5%;">
 	   <%
 	   }
 	     %>
@@ -247,11 +287,11 @@ function selectChange(i)
               <%
 	   if(tempUState.equals("正常")){
 		%>
-		  <img src="../../../images1/ok.png" width="16" height="16" alt="正常" style="cursor: pointer;">
+		  <img src="../../../images1/ok.png" width="16" height="16" alt="正常" style="cursor: pointer;margin-top: 5%;">
 		<%   
 	   }else{
 	   %>
-		  <img src="../../../images1/nook.png" width="16" height="16" alt="注销" style="cursor: pointer;">
+		  <img src="../../../images1/nook.png" width="16" height="16" alt="注销" style="cursor: pointer;margin-top:5%;">
 	   <%
 	   }
 	     %>
@@ -260,15 +300,15 @@ function selectChange(i)
          <span><%=buf.fget("empstatedate",i) %></span>
          <span><%=buf.fget("leave_date",i) %></span>
            <span><%=buf.fget("workreason",i) %></span>
-         <span>
+         <span style="width: 182px;border-right: none;">
          	<%if(login.getSanyuan().equals("0")){ %>
-         	  <a href="/servlet/LeaveManage?operate=queryLeaveById&leaveId=<%=tempLeaveId%>"/><img border="0" src="../../../images1/read_document.png" ALT="查看" style="cursor: pointer;"/></a>&nbsp;&nbsp;
-         <a href="/servlet/LeaveManage?operate=queryLeaveId&leaveId=<%=buf.fget("leave_Id",i)%>" ><img  src="../../../images1/edit.gif" border="0" alt=" 修改"/></a>&nbsp;&nbsp;
-            <input border="0" type="image" src="../../../images1/delete.gif" ALT="删除" style="cursor: pointer;" name="button2"onclick="check('queryLeavedelete','<%=buf.fget("leave_Id",i)%>');"/>&nbsp;&nbsp; 
+         	  <a href="/servlet/LeaveManage?operate=queryLeaveById&leaveId=<%=tempLeaveId%>"/><img border="0" src="../../../images1/read_document.png" ALT="查看" style="cursor: pointer;margin-top: 5%;"/></a>
+         <a href="/servlet/LeaveManage?operate=queryLeaveId&leaveId=<%=buf.fget("leave_Id",i)%>" ><img  src="../../../images1/edit.gif" border="0" alt=" 修改"/></a>
+            <input border="0" type="image" src="../../../images1/delete.gif" ALT="删除" style="cursor: pointer;margin-top: 5%;" name="button2"onclick="check('queryLeavedelete','<%=buf.fget("leave_Id",i)%>');"/>
            <%
 	   if(tempState.equals("已离岗")){
 		%>
-		  <img src="../../../images1/user_go1.png" border="0" alt="已离岗"  style="cursor: pointer;">
+		  <img src="../../../images1/user_go1.png" border="0" alt="已离岗"  style="cursor: pointer;margin-top: 5%;">
 
 		<%   
 	   }else{
@@ -278,11 +318,11 @@ function selectChange(i)
 	   }
 	     %>
 		<%}else if(login.getSanyuan().equals("1")){ %>
-		  <a href="/servlet/LeaveManage?operate=queryLeaveById&leaveId=<%=tempLeaveId%>"/><img border="0" src="../../../images1/read_document.png" ALT="查看" style="cursor: pointer;"/></a>&nbsp;&nbsp;
+		  <a href="/servlet/LeaveManage?operate=queryLeaveById&leaveId=<%=tempLeaveId%>"/><img border="0" src="../../../images1/read_document.png" ALT="查看" style="cursor: pointer;margin-top: 5%;"/></a>
            <%
 	   if(tempState.equals("已离岗")){
 		%>
-		  <img src="../../../images1/user_go1.png" border="0" alt="已离岗"  style="cursor: pointer;">
+		  <img src="../../../images1/user_go1.png" border="0" alt="已离岗"  style="cursor: pointer;margin-top: 5%;">
 
 		<%   
 	   }else{
@@ -292,9 +332,9 @@ function selectChange(i)
 	   }
 	     %>
 		<%}else { %>
-		  <a href="/servlet/LeaveManage?operate=queryLeaveById&leaveId=<%=tempLeaveId%>"/><img border="0" src="../../../images1/read_document.png" ALT="查看" style="cursor: pointer;"/></a>&nbsp;&nbsp;
-         <a href="/servlet/LeaveManage?operate=queryLeaveId&leaveId=<%=buf.fget("leave_Id",i)%>" ><img  src="../../../images1/edit.gif" border="0" alt=" 修改"/></a>&nbsp;&nbsp;
-          <input border="0" type="image" src="../../../images1/delete.gif" ALT="删除" style="cursor: pointer;" name="button2"onclick="check('queryLeavedelete','<%=buf.fget("leave_Id",i)%>');"/>&nbsp;&nbsp; 
+		  <a href="/servlet/LeaveManage?operate=queryLeaveById&leaveId=<%=tempLeaveId%>"/><img border="0" src="../../../images1/read_document.png" ALT="查看" style="cursor: pointer;margin-top: 5%;"/></a>
+         <a href="/servlet/LeaveManage?operate=queryLeaveId&leaveId=<%=buf.fget("leave_Id",i)%>" ><img  src="../../../images1/edit.gif" border="0" alt=" 修改"/></a>
+          <input border="0" type="image" src="../../../images1/delete.gif" ALT="删除" style="cursor: pointer;margin-top: 5%;" name="button2"onclick="check('queryLeavedelete','<%=buf.fget("leave_Id",i)%>');"/>
 		<%} %>
        
 		    </span>
diff --git a/web/zhyw/smsb/sbdj/propertyUseEdit.jsp b/web/zhyw/smsb/sbdj/propertyUseEdit.jsp
index dac4df0..c29a1b2 100644
--- a/web/zhyw/smsb/sbdj/propertyUseEdit.jsp
+++ b/web/zhyw/smsb/sbdj/propertyUseEdit.jsp
@@ -30,6 +30,100 @@ select
 {
    width:155px;
 }
+#myGrid .gridHead{
+	height: 50px;
+	line-height: 50px;
+	background-color: #cce7f5;
+	color: #000;
+	font-size: 16px;
+	font-weight: bold;
+	box-sizing: border-box;
+}
+#myGrid .gridHead .gridRow{
+	display: flex;
+	justify-content: start;
+}
+#myGrid .gridHead span{
+	text-align: center;
+	display: inline-block;
+	border-right: 1px solid #000000;
+	box-sizing: border-box;
+}
+#myGrid .gridHead span:nth-child(1){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(2){
+	width: 240px;
+}
+#myGrid .gridHead span:nth-child(3){
+	width: 190px;
+}
+#myGrid .gridHead span:nth-child(4){
+	width: 190px;
+}
+#myGrid .gridHead span:nth-child(5){
+	width: 190px;
+}
+#myGrid .gridHead span:nth-child(6){
+	width: 190px;
+}
+#myGrid .gridHead span:nth-child(7){
+	width: 190px;
+}
+#myGrid .gridHead span:nth-child(8){
+	width: 190px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow{
+	height: 30px;
+	/*margin-top: 5px;*/
+	display: flex;
+	justify-content: start;
+	align-items: center;
+	border-bottom: 1px solid #000;
+	color: #000;
+}
+#myGrid .gridBody .gridRow span{
+	width: 148px;
+	display: inline-block;
+	border-right: 1px solid;
+	text-align: center;
+	height: 30px;
+	line-height: 30px;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow span:nth-child(1){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(2){
+	width: 240px;
+}
+#myGrid .gridBody .gridRow span:nth-child(3){
+	 width: 190px;
+ }
+#myGrid .gridBody .gridRow span:nth-child(4){
+	width: 190px;
+}
+#myGrid .gridBody .gridRow span:nth-child(5){
+	width: 190px;
+}
+#myGrid .gridBody .gridRow span:nth-child(6){
+	width: 190px;
+}
+#myGrid .gridBody .gridRow span:nth-child(7){
+	width: 190px;
+}
+#myGrid .gridBody .gridRow span:nth-child(8){
+	width: 190px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow span a,img,input {
+	margin-right: 6px;
+	margin-top: 8px;
+}
+form{
+	height: 100%;
+}
 </style>
 <script>
 function setValue() {
@@ -139,10 +233,10 @@ html { overflow-x:hidden; overflow-y:hidden; }
 	if (buf != null) {
 		int rowcount = buf.getRowCount();
 %>
-<table width="99%"  border="0" cellpadding="0" cellspacing="1" class="box" style="margin-top: 4px;">
+<table width="99%"  border="0" cellpadding="0" cellspacing="1" class="box" style="margin-top: 4px;height: 87%">
     <tr>
       <td>
-			<div style="width:100%; height:385px;overflow: auto;">
+			<div style="width:100%; height:96%;overflow: auto;">
   				<div id="myGrid" class="2k3Grid" borderWidth="0" contextMenu="mnuGridContextMenu" altRowColor="oldLace">
     				<div class="gridHead">
     				 <!--div align="left"><span width="5%">共检索到<%=rowcount%>条记录</span></div-->
diff --git a/web/zhyw/smsb/sbdj/propertyUseManage.jsp b/web/zhyw/smsb/sbdj/propertyUseManage.jsp
index a71cb07..8b3aa24 100644
--- a/web/zhyw/smsb/sbdj/propertyUseManage.jsp
+++ b/web/zhyw/smsb/sbdj/propertyUseManage.jsp
@@ -44,6 +44,48 @@
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Grid.css">
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Menu.css">
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Dialog.css">
+<style>
+#myGrid .gridHead{
+	height: 50px;
+	line-height: 50px;
+	background-color: #cce7f5;
+	color: #000;
+	font-size: 16px;
+	box-sizing: border-box;
+}
+#myGrid .gridHead .gridRow{
+	display: flex;
+	justify-content: space-between;
+}
+#myGrid .gridHead span{
+	text-align: center;
+	display: inline-block;
+	width: 148px;
+	border-right: 1px solid #000000;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow{
+	height: 30px;
+	/*margin-top: 5px;*/
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: 1px solid #000;
+	color: #000;
+}
+#myGrid .gridBody .gridRow span{
+	width: 148px;
+	display: inline-block;
+	border-right: 1px solid;
+	text-align: center;
+	height: 30px;
+	line-height: 30px;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow span a,img,input {
+	margin-right: 6px;
+}
+</style>
 <script>
 function setValue() {
 <%if (!Common.isNull(sj)) {
@@ -106,7 +148,7 @@ html { overflow-x:hidden; overflow-y:hidden; }
 </style>
 </head>
 <body onload="setValue();"  scroll="no"> 
-<form name="form1" method="get"  action="/servlet/PropertyUseManage">
+<form name="form1" method="get"  action="/servlet/PropertyUseManage" style="height: 100%;">
 	<table width="99%" border="0" align="center" cellpadding="0" cellspacing="1" class="box">
 		<tr>
 			<td valign="top"><table width="100%" height="23" border="0"
@@ -177,25 +219,25 @@ html { overflow-x:hidden; overflow-y:hidden; }
 		if (buf != null) {
 			int rowcount = buf.getRowCount();
 	%>
-<table width="99%"  border="0" cellpadding="0" cellspacing="1" class="box">
+<table width="99%"  border="0"  style="height: 87%;margin-top: 4px;" cellpadding="0" cellspacing="1" class="box">
     <tr>
       <td>
-		<div style="width: 100%; height: 385px; overflow: auto;">
+		<div style="width: 100%; height: 96%; overflow: auto;">
 			<div id="myGrid" class="2k3Grid" borderWidth="0"
 				contextMenu="mnuGridContextMenu" altRowColor="oldLace">
 				<div class="gridHead">
 					<!--div align="left"><span width="5%">共检索到<%=rowcount%>条记录</span></div-->
 					<div class="gridRow">
-						<span width="5px" style="text-align: center;">序号</span>
-						<span width="5px" style="text-align: center;">选择项</span>
-						 <span>所属市州</span> 
-					     <span>所属区县</span> 
-						 <span>登记人员</span> 
-						 <span>使用单位</span>
-						 <span>归属部门</span>  
-						 <span>使用人员</span> 
-						 <span>登记日期</span>
-						 <span width="20px">管理</span> 
+						<span style="width: 80px;">序号</span>
+						<span style="width: 80px;padding-right: 20px;">选择项</span>
+						 <span style="width: 100px;padding-right: 20px;">所属市州</span>
+					     <span style="width: 100px;padding-right: 20px;">所属区县</span>
+						 <span style="padding-right: 20px;">登记人员</span>
+						 <span style="width: 220px;padding-right: 20px;">使用单位</span>
+						 <span style="padding-right: 20px;">归属部门</span>
+						 <span style="padding-right: 20px;">使用人员</span>
+						 <span style="padding-right: 20px;">登记日期</span>
+						 <span style="width:162px;padding-right: 20px;border-right: none">管理</span>
 					</div>
 				</div>
 				<div class="gridBody">
@@ -204,34 +246,34 @@ html { overflow-x:hidden; overflow-y:hidden; }
 								String tempDeptid = buf.fget("use_id", i);
 					%>
 					<div class="gridRow">
-						<span width="5px" style="text-align: center;"><%=i + 1%></span>
-						<span><input type="checkbox" name="Infos" value="<%=tempDeptid%>"></span>
-						<span><%=buf.fget("FRAMEWORKNAME", i)%></span> 
-						<span><%=buf.fget("AREADEF", i)%></span> 
-						<span><%=buf.fget("use_staffid", i)%></span> 
-						<span ><%=buf.fget("departname", i)%></span> 
-						<span ><%=buf.fget("part", i)%></span> 
-						<span><%=SM4.SM4Decrypt(Base64.decode(buf.fget("recover_staffid", i)))%></span>
-						<span><%=buf.fget("use_date", i)%></span>
-						 <span  width="20px"  style="margin: center;">&nbsp;
-                           <a href="/servlet/PropertyUseManage?operate=showProperty&useId=<%=tempDeptid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>&nbsp;&nbsp; 
+						<span style="width: 80px;"><%=i + 1%></span>
+						<span style="width: 80px;padding-right: 20px;"><input type="checkbox" name="Infos" value="<%=tempDeptid%>"></span>
+						<span style="width: 100px;padding-right: 20px;"><%=buf.fget("FRAMEWORKNAME", i)%></span>
+						<span style="width: 100px;padding-right: 20px;"><%=buf.fget("AREADEF", i)%></span>
+						<span style="padding-right: 20px;"><%=buf.fget("use_staffid", i)%></span>
+						<span style="width: 220px;padding-right: 20px;"><%=buf.fget("departname", i)%></span>
+						<span style="padding-right: 20px;" ><%=buf.fget("part", i)%></span>
+						<span style="padding-right: 20px;"><%=SM4.SM4Decrypt(Base64.decode(buf.fget("recover_staffid", i)))%></span>
+						<span style="padding-right: 20px;"><%=buf.fget("use_date", i)%></span>
+						 <span style="width:162px;border-right: none">
+                           <a href="/servlet/PropertyUseManage?operate=showProperty&useId=<%=tempDeptid%>"><img src="/images1/read_document.png" style="margin-top: 5px" border="0" alt="预览"/></a>
                            	<%if(login.getSanyuan().equals("0")){ %>
-			                <a href="/servlet/PropertyUseManage?operate=queryPropertyUseId&useId=<%=tempDeptid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>&nbsp;&nbsp; 
+			                <a href="/servlet/PropertyUseManage?operate=queryPropertyUseId&useId=<%=tempDeptid%>"><img src="/images1/edit.gif" style="margin-top: 5px" border="0" alt="修改"/></a>
 	                        <%}else if(login.getSanyuan().equals("1")){ %>
 	                        <%}else { %>
-	                        <a href="/servlet/PropertyUseManage?operate=queryPropertyUseId&useId=<%=tempDeptid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>&nbsp;&nbsp; 
+	                        <a href="/servlet/PropertyUseManage?operate=queryPropertyUseId&useId=<%=tempDeptid%>"><img src="/images1/edit.gif" style="margin-top: 5px" border="0" alt="修改"/></a>
 	                        <%} %>
                          	 <%if(login.getSanyuan().equals("0")){ %>
-			                 <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyUseManage?operate=deleteUseManageRow&useId=<%=tempDeptid%>"><img src="/images1/delete.gif" border="0" alt="删除"/></a>&nbsp;&nbsp; 
+			                 <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyUseManage?operate=deleteUseManageRow&useId=<%=tempDeptid%>"><img src="/images1/delete.gif" style="margin-top: 5px" border="0" alt="删除"/></a>
                          	 <%}else if(login.getSanyuan().equals("1")){ %>
 	                         <%}else { %>
-	                         <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyUseManage?operate=deleteUseManageRow&useId=<%=tempDeptid%>"><img src="/images1/delete.gif" border="0" alt="删除"/></a>&nbsp;&nbsp; 
+	                         <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyUseManage?operate=deleteUseManageRow&useId=<%=tempDeptid%>"><img src="/images1/delete.gif" style="margin-top: 5px" border="0" alt="删除"/></a>
 	                         <%} %>
 	                         <%if(login.getSanyuan().equals("0")){ %>
-			                 <a href="/servlet/PropertyUseManage?operate=queryPropertyInfo&operateuseId=<%=tempDeptid%>&reStaff=<%=buf.fget("recover_staffid", i)%>" ><img src="/images1/add.gif" border="0" alt="给使用人添加资产"/></a>
+			                 <a href="/servlet/PropertyUseManage?operate=queryPropertyInfo&operateuseId=<%=tempDeptid%>&reStaff=<%=buf.fget("recover_staffid", i)%>" ><img src="/images1/add.gif" style="margin-top: 5px" border="0" alt="给使用人添加资产"/></a>
 	                         <%}else if(login.getSanyuan().equals("1")){ %>
 	                         <%}else { %>
-	                         <a href="/servlet/PropertyUseManage?operate=queryPropertyInfo&operateuseId=<%=tempDeptid%>&reStaff=<%=buf.fget("recover_staffid", i)%>" ><img src="/images1/add.gif" border="0" alt="给使用人添加资产"/></a>
+	                         <a href="/servlet/PropertyUseManage?operate=queryPropertyInfo&operateuseId=<%=tempDeptid%>&reStaff=<%=buf.fget("recover_staffid", i)%>" ><img src="/images1/add.gif" style="margin-top: 5px" border="0" alt="给使用人添加资产"/></a>
 	                         <%} %>
 					     </span>
 					</div>
diff --git a/web/zhyw/smsb/smwl/propertyNetManage.jsp b/web/zhyw/smsb/smwl/propertyNetManage.jsp
index 797d6a0..db558ad 100644
--- a/web/zhyw/smsb/smwl/propertyNetManage.jsp
+++ b/web/zhyw/smsb/smwl/propertyNetManage.jsp
@@ -42,6 +42,48 @@
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Grid.css">
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Menu.css">
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Dialog.css">
+<style>
+#myGrid .gridHead{
+	height: 50px;
+	line-height: 50px;
+	background-color: #cce7f5;
+	color: #000;
+	font-size: 16px;
+	box-sizing: border-box;
+}
+#myGrid .gridHead .gridRow{
+	display: flex;
+	justify-content: space-between;
+}
+#myGrid .gridHead span{
+	text-align: center;
+	display: inline-block;
+	width: 148px;
+	border-right: 1px solid #000000;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow{
+	height: 30px;
+	/*margin-top: 5px;*/
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: 1px solid #000;
+	color: #000;
+}
+#myGrid .gridBody .gridRow span{
+	width: 148px;
+	display: inline-block;
+	border-right: 1px solid;
+	text-align: center;
+	height: 30px;
+	line-height: 30px;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow span a,img,input {
+	margin-right: 6px;
+}
+</style>
 <script>
 function setValue() {
 <%if (!Common.isNull(sj)) {
@@ -106,7 +148,7 @@ html { overflow-x:hidden; overflow-y:hidden; }
 </style>
 </head>
 <body onload="setValue();"  scroll="no"> 
-<form name="form1" method="post"  action="/servlet/PropertyNetManageServlet">
+<form name="form1" method="post"  action="/servlet/PropertyNetManageServlet" style="height: 100%;">
 	<table width="99%" border="0" align="center" cellpadding="0" cellspacing="1" class="box">
 		<tr>
 			<td valign="top"><table width="100%" height="23" border="0"
@@ -177,26 +219,26 @@ html { overflow-x:hidden; overflow-y:hidden; }
 		if (buf != null) {
 			int rowcount = buf.getRowCount();
 	%>
-<table width="99%"  border="0" cellpadding="0" cellspacing="1" class="box">
+<table width="99%"  border="0" cellpadding="0" style="height: 87%;margin-top: 4px;" cellspacing="1" class="box">
     <tr>
       <td>
-		<div style="width: 100%; height: 385px; overflow: auto;">
+		<div style="width: 100%; height: 96%; overflow: auto;">
 			<div id="myGrid" class="2k3Grid" borderWidth="0"
 				contextMenu="mnuGridContextMenu" altRowColor="oldLace">
 				<div class="gridHead">
 					<!--div align="left"><span width="5%">共检索到<%=rowcount%>条记录</span></div-->
 					<div class="gridRow">
-						<span width="5px" style="text-align: center;">序号</span>
-						<span width="5px" style="text-align: center;">选择项</span>
+						<span style="width: 80px;">序号</span>
+						<span style="width: 80px;">选择项</span>
 						<span>所属市州</span> 
-						<span>所属区县</span> 
-						<span>单位名称</span> 
-					    <span>部门名称</span> 
-						<span>登记人</span> 
+						<span style="width: 100px;">所属区县</span>
+						<span style="width: 200px;">单位名称</span>
+					    <span style="width: 200px;">部门名称</span>
+						<span>登记人</span>
 						<span>登记日期</span>
-						<span>密级</span>
-						<span>终端数量</span>
-						<span width="20px">管理</span> 
+						<span style="width: 100px;">密级</span>
+						<span style="width: 100px;">终端数量</span>
+						<span style="width: 132px;border-right: none;">管理</span>
 					</div>
 				</div>
 				<div class="gridBody">
@@ -205,18 +247,18 @@ html { overflow-x:hidden; overflow-y:hidden; }
 								String tempDeptid = buf.fget("NET_ID", i);
 					%>
 					<div class="gridRow">
-						<span width="5px" style="text-align: center;"><%=i + 1%></span>
-						<span><input type="checkbox" name="Infos" value="<%=tempDeptid%>"></span>
+						<span style="width: 80px;"><%=i + 1%></span>
+						<span style="width: 80px;"><input type="checkbox" name="Infos" value="<%=tempDeptid%>"></span>
 						<span ><%=buf.fget("FRAMEWORKNAME", i)%></span> 
-						<span ><%=buf.fget("AREADEF", i)%></span> 
-						<span  width="15px;"><%=buf.fget("DEPARTNAME", i)%></span> 
-						<span ><%=buf.fget("departname", i)%></span> 
+						<span style="width: 100px;" ><%=buf.fget("AREADEF", i)%></span>
+						<span  style="width: 200px;"><%=buf.fget("DEPARTNAME", i)%></span>
+						<span  style="width: 200px;"><%=buf.fget("departname", i)%></span>
 						<span ><%=buf.fget("NET_STAFFID", i)%></span>
 						<span><%=buf.fget("NET_DATE", i)%></span>
-						<span><%=buf.fget("NET_SECURITY", i)%></span>
-						<span><%=buf.fget("TERMINAL",i) %></span>
-						 <span  width="20px"  style="margin: center;">&nbsp;
-						 <input name="button2"  style="cursor: pointer;" onclick=" check('showProperty','<%=tempDeptid%>');" type="image"  src="/images1/read_document.png" border="0" alt="预览"/>&nbsp;&nbsp; 
+						<span style="width: 100px;"><%=buf.fget("NET_SECURITY", i)%></span>
+						<span style="width: 100px;"><%=buf.fget("TERMINAL",i) %></span>
+						 <span style="width: 132px;">
+						 <input name="button2"  style="cursor: pointer;margin-top: 5px;" onclick=" check('showProperty','<%=tempDeptid%>');" type="image"  src="/images1/read_document.png" border="0" alt="预览"/>
                           <!-- 
                           	<%if(login.getSanyuan().equals("0")){ %>
 			                <a href="/servlet/PropertyNetManageServlet?operate=queryPropertyNetId&useId=<%=tempDeptid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>&nbsp;&nbsp; 
@@ -226,16 +268,16 @@ html { overflow-x:hidden; overflow-y:hidden; }
 	                         <%} %>
 	                          -->
                           	<%if(login.getSanyuan().equals("0")){ %>
-			                <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyNetManageServlet?operate=deleteNetManageRow&InfoId=<%=tempDeptid%>"><img src="/images1/delete.gif" border="0" alt="删除"/></a>&nbsp;&nbsp; 
+			                <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyNetManageServlet?operate=deleteNetManageRow&InfoId=<%=tempDeptid%>"><img src="/images1/delete.gif" style="margin-top: 5px;" border="0" alt="删除"/></a>
 	                        <%}else if(login.getSanyuan().equals("1")){ %>
 	                        <%}else { %>
-	                        <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyNetManageServlet?operate=deleteNetManageRow&InfoId=<%=tempDeptid%>"><img src="/images1/delete.gif" border="0" alt="删除"/></a>&nbsp;&nbsp; 
+	                        <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyNetManageServlet?operate=deleteNetManageRow&InfoId=<%=tempDeptid%>"><img src="/images1/delete.gif" style="margin-top: 5px;" border="0" alt="删除"/></a>
 	                         <%} %>
                          	<%if(login.getSanyuan().equals("0")){ %>
-			                <a href="/servlet/PropertyNetManageServlet?operate=queryPropertynetInfo&operateuseId=<%=tempDeptid%>&dwNames=<%=buf.fget("NET_DEPARTID", i)%>" ><img src="/images1/add.gif" border="0" alt="给单位添加网络终端"/></a>
+			                <a href="/servlet/PropertyNetManageServlet?operate=queryPropertynetInfo&operateuseId=<%=tempDeptid%>&dwNames=<%=buf.fget("NET_DEPARTID", i)%>" ><img src="/images1/add.gif" style="margin-top: 5px;"border="0" alt="给单位添加网络终端"/></a>
 	                        <%}else if(login.getSanyuan().equals("1")){ %>
 	                        <%}else { %>
-	                        <a href="/servlet/PropertyNetManageServlet?operate=queryPropertynetInfo&operateuseId=<%=tempDeptid%>&dwNames=<%=buf.fget("NET_DEPARTID", i)%>" ><img src="/images1/add.gif" border="0" alt="给单位添加网络终端"/></a>
+	                        <a href="/servlet/PropertyNetManageServlet?operate=queryPropertynetInfo&operateuseId=<%=tempDeptid%>&dwNames=<%=buf.fget("NET_DEPARTID", i)%>" ><img src="/images1/add.gif" style="margin-top: 5px;"border="0" alt="给单位添加网络终端"/></a>
 	                        <%} %>
 					     </span>
 					</div>
diff --git a/web/zhyw/smsb/smzd/propertyTmaManage.jsp b/web/zhyw/smsb/smzd/propertyTmaManage.jsp
index 80ab321..c48a097 100644
--- a/web/zhyw/smsb/smzd/propertyTmaManage.jsp
+++ b/web/zhyw/smsb/smzd/propertyTmaManage.jsp
@@ -42,6 +42,120 @@
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Grid.css">
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Menu.css">
 <link rel="stylesheet" type="text/css" href="../../../js/2k3Dialog.css">
+<style>
+#myGrid .gridHead{
+	height: 50px;
+	line-height: 50px;
+	background-color: #cce7f5;
+	color: #000;
+	font-size: 16px;
+	font-weight: bold;
+	box-sizing: border-box;
+}
+#myGrid .gridHead .gridRow{
+	display: flex;
+	justify-content: start;
+}
+#myGrid .gridHead span{
+	text-align: center;
+	display: inline-block;
+	border-right: 1px solid #000000;
+	box-sizing: border-box;
+}
+#myGrid .gridHead span:nth-child(1){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(2){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(3){
+	width: 120px;
+}
+#myGrid .gridHead span:nth-child(4){
+	width: 200px;
+}
+#myGrid .gridHead span:nth-child(5){
+	width: 150px;
+}
+#myGrid .gridHead span:nth-child(6){
+	width: 150px;
+}
+#myGrid .gridHead span:nth-child(7){
+	width: 150px;
+}
+#myGrid .gridHead span:nth-child(8){
+	width: 150px;
+}
+#myGrid .gridHead span:nth-child(9){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(10){
+	width: 100px;
+}
+#myGrid .gridHead span:nth-child(11){
+	width: 150px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow{
+	height: 30px;
+	/*margin-top: 5px;*/
+	display: flex;
+	justify-content: start;
+	align-items: center;
+	border-bottom: 1px solid #000;
+	color: #000;
+}
+#myGrid .gridBody .gridRow span{
+	width: 148px;
+	display: inline-block;
+	border-right: 1px solid;
+	text-align: center;
+	height: 30px;
+	line-height: 30px;
+	box-sizing: border-box;
+}
+#myGrid .gridBody .gridRow span:nth-child(1){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(2){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(3){
+	width: 120px;
+}
+#myGrid .gridBody .gridRow span:nth-child(4){
+	width: 200px;
+}
+#myGrid .gridBody .gridRow span:nth-child(5){
+	width: 150px;
+}
+#myGrid .gridBody .gridRow span:nth-child(6){
+	width: 150px;
+}
+#myGrid .gridBody .gridRow span:nth-child(7){
+	width: 150px;
+}
+#myGrid .gridBody .gridRow span:nth-child(8){
+	width: 150px;
+}
+#myGrid .gridBody .gridRow span:nth-child(9){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(10){
+	width: 100px;
+}
+#myGrid .gridBody .gridRow span:nth-child(11){
+	width: 150px;
+	border-right: none;
+}
+#myGrid .gridBody .gridRow span a,img,input {
+	margin-right: 6px;
+	margin-top: 8px;
+}
+form{
+	height: 100%;
+}
+</style>
 <script>
 function setValue() {
 <%if (!Common.isNull(sj)) {
@@ -176,26 +290,26 @@ html { overflow-x:hidden; overflow-y:hidden; }
 		if (buf != null) {
 			int rowcount = buf.getRowCount();
 	%>
-<table width="99%"  border="0" cellpadding="0" cellspacing="1" class="box">
+<table width="99%"  border="0" style="height: 87%;margin-top: 4px;" cellpadding="0" cellspacing="1" class="box">
     <tr>
       <td>
-		<div style="width: 100%; height: 385px; overflow: auto;">
+		<div style="width: 100%; height:96%; overflow: auto;">
 			<div id="myGrid" class="2k3Grid" borderWidth="0"
 				contextMenu="mnuGridContextMenu" altRowColor="oldLace">
 				<div class="gridHead">
 					<!--div align="left"><span width="5%">共检索到<%=rowcount%>条记录</span></div-->
 					<div class="gridRow">
-						<span width="5px" style="text-align: center;">序号</span>
-						<span width="6px" style="text-align: center;">选择项</span>
-						<span width="12px">登记编号</span> 
-						<span width="13px">使用单位</span> 
-						<span width="10px">登记人员</span> 
-						<span width="10px">部门名称</span> 
-						<span width="10px">责任人</span> 
-						<span width="10px">登记日期</span>
-						<span width="7px">密级</span>
-						<span width="7px">终端数量</span>
-						<span width="10px">管理</span> 
+						<span>序号</span>
+						<span>选择项</span>
+						<span>登记编号</span>
+						<span>使用单位</span>
+						<span>登记人员</span>
+						<span>部门名称</span>
+						<span>责任人</span>
+						<span>登记日期</span>
+						<span>密级</span>
+						<span>终端数量</span>
+						<span>管理</span>
 					</div>
 				</div>
 				<div class="gridBody">
@@ -204,23 +318,23 @@ html { overflow-x:hidden; overflow-y:hidden; }
 								String tempDeptid = buf.fget("TMA_ID", i);
 					%>
 					<div class="gridRow">
-						<span width="5px" style="text-align: center;"><%=i + 1%></span>
+						<span><%=i + 1%></span>
 						<span><input type="checkbox" name="Infos" value="<%=tempDeptid%>"></span>
-                        <span width="15px"><a target="_blank" title="预览"><%=buf.fget("TMA_ID", i)%></a></span>
+                        <span><a target="_blank" title="预览"><%=buf.fget("TMA_ID", i)%></a></span>
 						<span><%=buf.fget("DEPARTNAME", i)%></span> 
 						<span><%=buf.fget("TMA_STAFFID", i)%></span> 
-						<span ><%=buf.fget("PART", i)%></span> 
+						<span><%=buf.fget("PART", i)%></span>
 						<span><%=buf.fget("TMA_MANAGER", i)%></span>
 						<span><%=buf.fget("TMA_DATE", i)%></span>
 						<span><%=buf.fget("TMA_SECURITY", i)%></span>
 						<span><%=buf.fget("TERMINAL",i) %></span>
-						<span  width="20px"  style="margin: center;">&nbsp;
-						<a href="/servlet/PropertyTmaManageServlet?operate=showPropertyTmaId&InfoId=<%=tempDeptid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>&nbsp;&nbsp; 
+						<span>
+						<a href="/servlet/PropertyTmaManageServlet?operate=showPropertyTmaId&InfoId=<%=tempDeptid%>"><img src="/images1/read_document.png" border="0" alt="预览"/></a>
                        	<%if(login.getSanyuan().equals("0")){ %>
-			            <a href="/servlet/PropertyTmaManageServlet?operate=updateTmaNanager&InfoId=<%=tempDeptid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>&nbsp;&nbsp; 
+			            <a href="/servlet/PropertyTmaManageServlet?operate=updateTmaNanager&InfoId=<%=tempDeptid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>
 	                    <%}else if(login.getSanyuan().equals("1")){ %>
 	                    <%}else { %>
-	                    <a href="/servlet/PropertyTmaManageServlet?operate=updateTmaNanager&InfoId=<%=tempDeptid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>&nbsp;&nbsp; 
+	                    <a href="/servlet/PropertyTmaManageServlet?operate=updateTmaNanager&InfoId=<%=tempDeptid%>"><img src="/images1/edit.gif" border="0" alt="修改"/></a>
 	                    <%} %>
                         <%if(login.getSanyuan().equals("0")){ %>
 			            <a onclick="return confirm('您确定要删除此信息吗？');" href="/servlet/PropertyTmaManageServlet?operate=deleteTmaManageRow&InfoId=<%=tempDeptid%>"><img src="../../images1/delete.gif" border="0" alt="删除"/></a>