Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit d210483d authored by wuzhilong's avatar wuzhilong
Browse files
Options

修改页面排版

parent 792d505b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 161 deletions
src/main/resources/static/css/app.css
View file @ d210483d
......@@ -299,4 +299,6 @@ p {
font-family: 'Arial Black';
color:#000;
}
.padding10{
padding: 10px;
}
src/main/resources/static/dialogs/analysisDialog.html 0 → 100644
View file @ d210483d
<div class="ui-dialog-title" >
请选择格口文件，解析 {{upDate}} 上传的 {{upCount}} 制证包
</div>
<div class="ui-dialog-content">
<table class="table table-hover" >
<thead>
<tr>
<th>NO.</th>
<th>上传时间</th>
<th>格口文件名</th>
<th>数量</th>
<th>订单起始日期</th>
<th>订单截至日期</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr >
<td>1</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>2</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>3</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>4</td>
<td>
2019-03-04 15:08
</td>
<td>
格口文件.xls
</td>
<td>
400
</td>
<td>
2019-03-01
</td>
<td>
2019-03-03
</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-confirm">
<div class="progress">
<div class="progress-bar progress-bar-success progress-bar-striped"
role="progressbar"
aria-valuemin="0"
aria-valuemax="100"
style="width: 90%"> 90% Complete (success)
</div>
</div>
</div>
<div style="text-align: center;">
<button class="btn btn-success" style="width: 70%" ng-click="closeThisDialog()">关闭</button>
</div>
\ No newline at end of file
src/main/resources/static/index.html
View file @ d210483d
This diff is collapsed.
src/main/resources/static/views/addFailed/addFailed.html
View file @ d210483d
......@@ -4,12 +4,7 @@
vertical-align: middle!important;
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
添加废证
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
......
src/main/resources/static/views/addRest/addRest.html
View file @ d210483d
......@@ -7,12 +7,7 @@
.cl:after{display:block;clear:both;content:"";visibility:hidden;height:0}
.cl{zoom:1}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
添加余证
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ d210483d
......@@ -24,14 +24,9 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
原始包解析日志
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header"></strong>
<strong class="box-header with-border">解析日志</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ d210483d
......@@ -27,12 +27,7 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
制证信息打包
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">制证信息打包</strong>
<div class="box-info">
......@@ -89,7 +84,7 @@
</div>
<div class="box box-default">
<strong class="box-header">制证信息详情</strong>
<strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="packageData">
<thead>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ d210483d
......@@ -27,12 +27,7 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
制证包删除
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">制证信息打包</strong>
<div class="box-info">
......@@ -83,7 +78,7 @@
</div>
<div class="box box-default">
<strong class="box-header">查询结果</strong>
<strong class="box-header with-border">查询结果</strong>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="xmlDatas">
<thead>
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ d210483d
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单创建
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
......@@ -75,4 +70,4 @@
<!-- /.col -->
</div>
<!-- /.row -->
</section>
\ No newline at end of file
</div>
\ No newline at end of file
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ d210483d
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单下发
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
......@@ -76,4 +71,4 @@
<!-- /.col -->
</div>
<!-- /.row -->
</section>
\ No newline at end of file
</div>
\ No newline at end of file
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ d210483d
......@@ -27,12 +27,7 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
邮寄信息导入
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">格口文件上传</strong>
<div class="box-primary">
......@@ -82,7 +77,7 @@
</div>
</div>
<div class="box box-primary">
<strong class="box-header">格口文件管理</strong>
<strong class="box-header with-border">格口文件管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
......
src/main/resources/static/views/historyCards/historyBack.html
View file @ d210483d
......@@ -4,14 +4,8 @@
vertical-align: middle!important;
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
历史回迁证
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary">
<div class="box-primary">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<form style="padding-left: 15px;">
<span style="font-size:20px;">回迁证数量:</span>
<input style="margin-top:20px;height: 30px;" type="text" ng-model="historyCount">
......@@ -55,6 +49,4 @@
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/packageLog/packageLog.html
View file @ d210483d
......@@ -24,14 +24,9 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
数据打包日志
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header"></strong>
<strong class="box-header with-border">打包日志</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
......
src/main/resources/static/views/receitp/receitp.html
View file @ d210483d
<section class="content-header" style="padding-top: 1px;">
<h4>
交接单
</h4>
</section>
\ No newline at end of file
<div class="col-md-12" style="margin-top:20px;">
交接单
</div>
src/main/resources/static/views/searchCard/searchCard.html
View file @ d210483d
<section class="content-header" style="padding-top: 1px;">
<h4>
<div style="text-align: left;cursor:pointer;"><a ng-click="goBack()"><i class="fa fa-backward"></i> 返回</a></div>
</h4>
</section>
<div style="padding: 15px;">
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">
查询结果
</strong>
<div class="box-info" style="padding: 10px;">
<div class="box-info" style="padding:0px 10px 7px 10px;">
<div class="panel panel-info">
<div class="panel-heading">
......@@ -95,14 +91,13 @@
<button class="btn btn-danger">退证</button>
</div>
</div>
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">
制证库
</h3>
</div>
<div class="panel-body">
<div class="panel-body" style="padding-bottom: 0;">
<table class="table table-hover table-bordered">
<thead>
<tr>
......@@ -148,4 +143,4 @@
</div>
</div>
\ No newline at end of file
</div></div>
\ No newline at end of file
src/main/resources/static/views/searchCardMsg/searchCardMsg.html
View file @ d210483d
......@@ -12,13 +12,9 @@
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
邮政快递单打印
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header with-border" style="padding-bottom:0px">居民身份证阅读信息</strong>
<div class="box-info">
<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>
......@@ -62,8 +58,8 @@
<button class="btn btn-info" ng-click="endReading()">停止读卡</button>
</div>
</div>
<div class="box box-primary">
<strong class="box-header">个人邮寄信息详情</strong>
<div class="box box-primary box-default">
<strong class="box-header with-border">个人邮寄信息详情</strong>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-striped postTable" ng-if="postMsgDetail.length>0">
<thead>
......@@ -241,7 +237,6 @@
</tr>
</table>
</div>
<div id="div3">
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm;font-family: '黑体';">
<tr>
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ d210483d
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
......@@ -81,5 +76,5 @@
<!-- /.col -->
</div>
<!-- /.row -->
</section>
</div>
src/main/resources/static/views/task/taskListPrint.html
View file @ d210483d
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
......@@ -92,5 +88,5 @@
<!-- /.col -->
</div>
<!-- /.row -->
</section>
</div>
src/main/resources/static/views/task/taskListQualityCheck.html
View file @ d210483d
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box-header with-border">
<strong>任务单详情</strong>
......@@ -84,7 +77,6 @@
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
src/main/resources/static/views/task/taskListSorting.html
View file @ d210483d
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......@@ -78,9 +72,7 @@
</div>
</div>
<!-- /. box -->
</div>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ d210483d
......@@ -27,13 +27,9 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
邮政信息查询
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary" style="padding: 15px;margin-bottom: 10px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary" >
<strong class="box-header">快递单信息管理</strong>
<div class="box-info">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
......@@ -87,7 +83,9 @@
</div>
</div>
<div class="box box-default">
<div class="box-header">邮寄单详情(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共{{paginationConf.totalItems}}条</span>)</div>
<div class="box-header with-border"><strong>邮寄单详情</strong>
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)</div>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="postData.length>0">
<thead>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ d210483d
......@@ -27,18 +27,14 @@
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
制证包管理
</h4>
</section>
<div style="padding: 15px;">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">制证包上传</strong>
<strong class="box-header with-border">制证包上传</strong>
<div class="box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="10%">选择xml文件：</td>
<td width="10%">选择XML文件：</td>
<td colspan="2" width="35%">
<input type="file"
id="id_file_photo_for_check"
......@@ -53,11 +49,11 @@
</div>
</div>
<div class="box box-primary">
<strong class="box-header">制证包管理</strong>
<strong class="box-header with-border ">制证包管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>Xml导入时间:</td>
<td>XML导入时间:</td>
<td>
<div class="input-group date" style="width: 65%">
<div class="input-group-addon">
......@@ -102,7 +98,7 @@
<td>{{item.commonCardCount}}</td>
<td>{{item.postCardCount}}</td>
<td>
<button class="btn btn-primary" ng-click="analysis()">解析</button>
<button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount)">解析</button>
<button class="btn btn-danger">删除</button>
</td>
</tr>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ d210483d
......@@ -37,15 +37,18 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
};
$scope.paginationConf.totalItems = 50;
$scope.analysis = function () {
$scope.analysis = function (uploadDate,packageCount) {
ngDialog.open({
template: 'dialogs/alert.html' + urlTimeStamp(),
width: 600,
template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
width: 876,
cache: false,
controller: ['$scope', function ($scope) {
$scope.msgText = "弹出框"
$scope.upDate =uploadDate;
$scope.upCount=packageCount;
}]
});
}
$scope.uploadXml = function () {
......
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