Commit bfc8d89d authored by wuzhilong's avatar wuzhilong

修改页面排版

parent a13b24bd
...@@ -52,45 +52,44 @@ ...@@ -52,45 +52,44 @@
</td> </td>
</tr> </tr>
</table> </table>
<div class="box-info"style="margin:7px;margin-top:0px;"> </div>
<table class="table table-bordered table-hover postTable" ng-if="analyseLog.length>0"> <div class="box-info"style="margin:7px;margin-top:0px;">
<thead> <table class="table table-bordered table-hover postTable" ng-if="analyseLog.length>0">
<tr> <thead>
<th>NO.</th> <tr>
<th>原包名</th> <th>NO.</th>
<th>订单起始日期</th> <th>原包名</th>
<th>订单截止日期</th> <th>订单起始日期</th>
<th>格口文件名</th> <th>订单截止日期</th>
<th>解析时间</th> <th>格口文件名</th>
<th>记录数</th> <th>解析时间</th>
<th>普通证</th> <th>记录数</th>
<th>个人邮寄证</th> <th>普通证</th>
</tr> <th>个人邮寄证</th>
</thead> </tr>
<tbody> </thead>
<tr ng-repeat="item in analyseLog"> <tbody>
<td>{{$index+1}}</td> <tr ng-repeat="item in analyseLog">
<td>{{item.SOURCE_FILE_NAME}}</td> <td>{{$index+1}}</td>
<td>{{item.FORM_START_TIME | myDateFilter}}</td> <td>{{item.SOURCE_FILE_NAME}}</td>
<td>{{item.FORM_DEADLINE | myDateFilter}}</td> <td>{{item.FORM_START_TIME | myDateFilter}}</td>
<td>{{item.FILE_NAME}}</td> <td>{{item.FORM_DEADLINE | myDateFilter}}</td>
<td>{{item.ANALYSIS_DATE | myDateFilter}}</td> <td>{{item.FILE_NAME}}</td>
<td>{{item.RECORD_NUMBER}}</td> <td>{{item.ANALYSIS_DATE | myDateFilter}}</td>
<td>{{item.COMMON_CARD_COUNT}}</td> <td>{{item.RECORD_NUMBER}}</td>
<td>{{item.POST_CARD_COUNT}}</td> <td>{{item.COMMON_CARD_COUNT}}</td>
</tr> <td>{{item.POST_CARD_COUNT}}</td>
</tr>
</tbody> </tbody>
</table> </table>
<div ng-if="analyseLog.length==0" class="box-body"> <div ng-if="analyseLog.length==0" class="box-body">
<h4>暂无数据</h4> <h4>暂无数据</h4>
</div> </div>
<div style="padding-left: 27%;" ng-if="analyseLog.length>0"> <div style="padding-left: 27%;" ng-if="analyseLog.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
</style> </style>
<div class="content row"> <div class="content row">
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary"> <div class="box">
<strong class="box-header">格口文件上传</strong> <strong class="box-header">格口文件上传</strong>
<div class="box-primary"> <div class="box-primary">
<table class="table table-bordered" style="margin-bottom: 0; width: 80%"> <table class="table table-bordered">
<tr> <tr>
<td>订单起始日期:</td> <td>订单起始日期:</td>
<td> <td>
...@@ -77,9 +77,9 @@ ...@@ -77,9 +77,9 @@
</table> </table>
</div> </div>
</div> </div>
<div class="box box-primary"> <div class="box ">
<strong class="box-header with-border">格口文件管理</strong> <strong class="box-header with-border">格口文件管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;"> <div class="box box-primary" >
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>上传时间:</td> <td>上传时间:</td>
...@@ -113,33 +113,35 @@ ...@@ -113,33 +113,35 @@
</td> </td>
</tr> </tr>
</table> </table>
</div>
<div class="box-info" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered table-hover postTable" ng-if="postPackageData.length>0"> <table class="table table-bordered table-hover postTable" ng-if="postPackageData.length>0">
<thead> <thead>
<tr> <tr>
<th>NO.</th> <th>NO.</th>
<th>订单起始日期</th> <th>订单起始日期</th>
<th>订单截至日期</th> <th>订单截至日期</th>
<th>文件名</th> <th>文件名</th>
<th>上传时间</th> <th>上传时间</th>
<th>解析状态</th> <th>解析状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in postPackageData"> <tr ng-repeat="item in postPackageData">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{item.formStartTime | myDateFilter}}</td> <td>{{item.formStartTime | myDateFilter}}</td>
<td>{{item.formDeadline| myDateFilter}}</td> <td>{{item.formDeadline| myDateFilter}}</td>
<td>{{item.fileName}}</td> <td>{{item.fileName}}</td>
<td>{{item.uploadDate | myDateFilter}}</td> <td>{{item.uploadDate | myDateFilter}}</td>
<td ng-if="item.state==0">未解析</td> <td ng-if="item.state==0">未解析</td>
<td ng-if="item.state==1">已解析</td> <td ng-if="item.state==1">已解析</td>
<td> <td>
<button class="btn btn-danger" ng-click="deletePostData(item.fileId,item.uploadDate)">删除</button> <button class="btn btn-danger" ng-click="deletePostData(item.fileId,item.uploadDate)">删除</button>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div style="padding-left: 27%;" ng-if="postPackageData.length>0"> <div style="padding-left: 27%;" ng-if="postPackageData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div> </div>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:20px;">
<div class="box"> <div class="box">
<strong class="box-header with-border">打包日志</strong> <strong class="box-header with-border">打包日志</strong>
<div class="box box-primary" style="padding: 7px;padding-top: 0;"> <div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>新包名:</td> <td>新包名:</td>
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
</style> </style>
<div class="content row"> <div class="content row">
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary"> <div class="box">
<strong class="box-header with-border" style="padding-bottom:0px">居民身份证阅读信息</strong> <strong class="box-header with-border" style="padding-bottom:0px">居民身份证阅读信息</strong>
<div class="box-info"> <div class="box box-primary">
<div class="row" style="padding: 15px;"> <div class="row" style="padding: 15px;">
<div class="col-lg-3" style="text-align: center;padding-top: 20px;"><img style="height:148px;width:115px;" id="imgDetail" class="img-thumbnail" /></div> <div class="col-lg-3" style="text-align: center;padding-top: 20px;"><img style="height:148px;width:115px;" id="imgDetail" class="img-thumbnail" /></div>
<div class="col-lg-9"> <div class="col-lg-9">
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
<button class="btn btn-info" ng-click="endReading()">停止读卡</button> <button class="btn btn-info" ng-click="endReading()">停止读卡</button>
</div> </div>
</div> </div>
<div class="box box-primary box-default"> <div class="box box-default">
<strong class="box-header with-border">个人邮寄信息详情</strong> <strong class="box-header with-border">个人邮寄信息详情</strong>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding: 7px;">
<table class="table table-bordered table-striped postTable" ng-if="postMsgDetail.length>0"> <table class="table table-bordered table-striped postTable" ng-if="postMsgDetail.length>0">
<thead> <thead>
<tr> <tr>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--EMS热敏纸模板-->
<div style="display: none;" > <div style="display: none;" >
<div id="div1"> <div id="div1">
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm;font-family:'黑体';"> <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm;font-family:'黑体';">
......
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
} }
</style> </style>
<div class="content row"> <div class="content row">
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:17px;">
<div class="box box-primary" > <div class="box " >
<strong class="box-header">快递单信息管理</strong> <strong class="box-header">快递单信息管理</strong>
<div class="box-info"> <div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>申请人姓名:</td> <td>申请人姓名:</td>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<div class="box-header with-border"><strong>邮寄单详情</strong> <div class="box-header with-border"><strong>邮寄单详情</strong>
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共 (<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)</div> {{paginationConf.totalItems}}条</span>)</div>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding: 7px;">
<table class="table table-bordered table-hover" ng-if="postData.length>0"> <table class="table table-bordered table-hover" ng-if="postData.length>0">
<thead> <thead>
<tr> <tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment