Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
YX_IDENT_beijing_auxiliary_YD
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangyusheng
YX_IDENT_beijing_auxiliary_YD
Commits
5e3e05e9
Commit
5e3e05e9
authored
Mar 07, 2019
by
liboyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增新包日志接口
parent
79593742
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
43 additions
and
14 deletions
+43
-14
service.js
src/main/resources/static/js/service.js
+24
-1
cardProdUpdate.html
...resources/static/views/cardProdUpdate/cardProdUpdate.html
+2
-2
excelAndSearch.html
...resources/static/views/excelAndSearch/excelAndSearch.html
+1
-1
packageLog.html
src/main/resources/static/views/packageLog/packageLog.html
+10
-7
packageLog.js
src/main/resources/static/views/packageLog/packageLog.js
+2
-1
uploadExcelAndSearch.html
...atic/views/uploadExcelAndSearch/uploadExcelAndSearch.html
+1
-1
xmlAndSearch.html
...ain/resources/static/views/xmlAndSearch/xmlAndSearch.html
+3
-1
No files found.
src/main/resources/static/js/service.js
View file @
5e3e05e9
...
@@ -297,7 +297,30 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
...
@@ -297,7 +297,30 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success
(
response
.
data
)
success
(
response
.
data
)
})
})
},
},
// selectPackageLogCount:
selectPackageLogCount
:
function
(
newPackageName
,
idCard
,
date
,
county
,
success
)
{
if
(
angular
.
isUndefined
(
newPackageName
)){
newPackageName
=
''
;
}
if
(
angular
.
isUndefined
(
idCard
)){
idCard
=
''
;
}
if
(
angular
.
isUndefined
(
county
)){
county
=
-
1
;
}
console
.
log
(
newPackageName
,
idCard
,
date
,
county
)
$http
({
method
:
'GET'
,
url
:
"../LogApi/selectNewFileLogCount"
+
urlTimeStamp
(),
params
:{
newFileName
:
newPackageName
,
cardId
:
idCard
,
createDate
:
date
,
uploadCountyCode
:
county
}
}).
then
(
function
successCallback
(
response
)
{
success
(
response
.
data
)
})
},
selectPackageLog
:
function
(
newPackageName
,
idCard
,
date
,
county
,
currentPage
,
itemsPerPage
,
success
){
selectPackageLog
:
function
(
newPackageName
,
idCard
,
date
,
county
,
currentPage
,
itemsPerPage
,
success
){
if
(
angular
.
isUndefined
(
newPackageName
)){
if
(
angular
.
isUndefined
(
newPackageName
)){
newPackageName
=
''
;
newPackageName
=
''
;
...
...
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @
5e3e05e9
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
<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 box-primary"
>
<strong
class=
"box-header"
>
制证信息
打包
</strong>
<strong
class=
"box-header"
>
制证信息
管理
</strong>
<div
class=
"box-info"
>
<div
class=
"box-info"
>
<table
class=
"table table-bordered"
style=
"margin-bottom: 0;"
>
<table
class=
"table table-bordered"
style=
"margin-bottom: 0;"
>
<tr>
<tr>
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
<div
style=
"padding-left: 27%;"
ng-if=
"xmlDatas"
>
<div
style=
"padding-left: 27%;"
ng-if=
"xmlDatas"
>
<tm-pagination
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
<tm-pagination
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
</div>
</div>
<h
3
ng-if=
"postData.length==0"
>
暂无记录。
</h3
>
<h
4
ng-if=
"postData.length==0"
>
暂无记录。
</h4
>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @
5e3e05e9
...
@@ -143,7 +143,7 @@
...
@@ -143,7 +143,7 @@
<div
style=
"padding-left: 27%;"
>
<div
style=
"padding-left: 27%;"
>
<tm-pagination
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
<tm-pagination
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
</div>
</div>
<
h3
ng-if=
"postPackageData.length==0"
>
暂无记录。
</h3
>
<
div
class=
"box-body"
ng-if=
"postPackageData.length==0"
><h4>
暂无记录
</h4></div
>
<div
class=
"row"
style=
"padding:0 25px;"
ng-if=
"postMsgDetail.length>0"
>
<div
class=
"row"
style=
"padding:0 25px;"
ng-if=
"postMsgDetail.length>0"
>
<div
class=
"col-md-11"
></div>
<div
class=
"col-md-11"
></div>
<div
class=
"col-md-1"
style=
"text-align: right;"
>
<div
class=
"col-md-1"
style=
"text-align: right;"
>
...
...
src/main/resources/static/views/packageLog/packageLog.html
View file @
5e3e05e9
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
</tr>
</tr>
</table>
</table>
<table
class=
"table table-bordered table-hover postTable"
ng-if=
"packageLogData"
>
<table
class=
"table table-bordered table-hover postTable"
ng-if=
"packageLogData
.length>0
"
>
<thead>
<thead>
<tr>
<tr>
<th>
NO.
</th>
<th>
NO.
</th>
...
@@ -80,15 +80,18 @@
...
@@ -80,15 +80,18 @@
<tbody>
<tbody>
<tr
ng-repeat=
"item in packageLogData"
>
<tr
ng-repeat=
"item in packageLogData"
>
<td>
{{$index+1}}
</td>
<td>
{{$index+1}}
</td>
<td>
{{item.
newPackageName
}}
</td>
<td>
{{item.
NEW_FILE_NAME
}}
</td>
<td>
{{item.
createDate
}}
</td>
<td>
{{item.
CREATE_DATE | myDateFilter
}}
</td>
<td>
{{item.
cardCount
}}
</td>
<td>
{{item.
RECORD_NUMBER
}}
</td>
<td>
{{item.
readCountyCode
}}
</td>
<td>
{{item.
DWDM
}}
</td>
<td>
{{item.
readCountyName
}}
</td>
<td>
{{item.
DWMC
}}
</td>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
<div
style=
"padding-left: 27%;"
ng-if=
"packageLogData"
>
<div
ng-if=
"packageLogData.length==0"
class=
"box-body"
>
<h4>
暂无数据
</h4>
</div>
<div
style=
"padding-left: 27%;"
ng-if=
"packageLogData.length>0"
>
<tm-pagination
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
<tm-pagination
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
</div>
</div>
</div>
</div>
...
...
src/main/resources/static/views/packageLog/packageLog.js
View file @
5e3e05e9
...
@@ -35,7 +35,8 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
...
@@ -35,7 +35,8 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
$scope
.
getPackageLog
=
function
(){
$scope
.
getPackageLog
=
function
(){
HttpService
.
selectPackageLogCount
(
$scope
.
newPackageName
,
$scope
.
idCard
,
$
(
'#datepicker'
).
val
(),
$scope
.
county
,
function
(
data
)
{
HttpService
.
selectPackageLogCount
(
$scope
.
newPackageName
,
$scope
.
idCard
,
$
(
'#datepicker'
).
val
(),
$scope
.
county
,
function
(
data
)
{
$scope
.
paginationConf
.
totalItems
=
data
.
totalCount
;
console
.
log
(
data
)
$scope
.
paginationConf
.
totalItems
=
data
;
console
.
log
(
$scope
.
paginationConf
.
totalItems
)
console
.
log
(
$scope
.
paginationConf
.
totalItems
)
})
})
HttpService
.
selectPackageLog
(
$scope
.
newPackageName
,
$scope
.
idCard
,
$
(
'#datepicker'
).
val
(),
$scope
.
county
,
$scope
.
paginationConf
.
currentPage
,
$scope
.
paginationConf
.
itemsPerPage
,
function
(
data
){
HttpService
.
selectPackageLog
(
$scope
.
newPackageName
,
$scope
.
idCard
,
$
(
'#datepicker'
).
val
(),
$scope
.
county
,
$scope
.
paginationConf
.
currentPage
,
$scope
.
paginationConf
.
itemsPerPage
,
function
(
data
){
...
...
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @
5e3e05e9
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
<div
style=
"padding-left: 27%;"
>
<div
style=
"padding-left: 27%;"
>
<tm-pagination
ng-if=
"show"
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
<tm-pagination
ng-if=
"show"
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
</div>
</div>
<h
3
ng-if=
"postData.length==0"
>
暂无记录。
</h3
>
<h
4
ng-if=
"postData.length==0"
>
暂无记录。
</h4
>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @
5e3e05e9
...
@@ -97,7 +97,9 @@
...
@@ -97,7 +97,9 @@
<div
style=
"padding-left: 27%;"
>
<div
style=
"padding-left: 27%;"
>
<tm-pagination
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
<tm-pagination
conf=
"paginationConf"
class=
"ul"
></tm-pagination>
</div>
</div>
<h3
ng-if=
"xmlPackageData.length==0"
>
暂无记录。
</h3>
<div
class=
"box-body"
ng-if=
"xmlPackageData.length==0"
>
<h4>
暂无记录。
</h4>
</div>
<div
class=
"row"
style=
"padding:0 25px;"
ng-if=
"postMsgDetail.length>0"
>
<div
class=
"row"
style=
"padding:0 25px;"
ng-if=
"postMsgDetail.length>0"
>
<div
class=
"col-md-11"
></div>
<div
class=
"col-md-11"
></div>
<div
class=
"col-md-1"
style=
"text-align: right;"
>
<div
class=
"col-md-1"
style=
"text-align: right;"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment