Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bigdatainterservice
Overview
Overview
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
曹鹏
bigdatainterservice
Commits
5f927c45
Commit
5f927c45
authored
Oct 12, 2019
by
caojingji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增批注功能
parent
9cc42c9b
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
70 additions
and
17 deletions
+70
-17
src/main/resources/static/css/style.css
+13
-0
src/main/resources/static/js/qyphResult.js
+4
-4
src/main/resources/static/js/qypzjgxsNew.js
+46
-6
src/main/resources/static/js/skgjbasjgzs.js
+3
-3
src/main/resources/static/js/skhsJgzs.js
+4
-4
No files found.
src/main/resources/static/css/style.css
View file @
5f927c45
...
...
@@ -371,3 +371,16 @@ a.left-list-ftitle:hover{
}
#copyResult
{
position
:
fixed
;
font-weight
:
600
;
left
:
50%
;
top
:
50%
;
margin-left
:
-47px
;
margin-top
:
-16px
;
background
:
#fff
;
border
:
1px
solid
#ccc
;
border-radius
:
5px
;
padding
:
5px
6px
;
z-index
:
10000
;}
#copyResult
.fa
{
margin
:
0
4px
;
color
:
#109700
;
font-size
:
18px
;
position
:
relative
;
top
:
2px
;}
.insert
.line
{
float
:
left
;
width
:
100px
;
height
:
28px
;
border-bottom
:
1px
dashed
#0940da
;}
.insert
.line2
{
float
:
left
;
width
:
50px
;
height
:
28px
;
border-left
:
1px
dashed
#0940da
;
transform
:
rotate
(
45deg
);
position
:
relative
;
top
:
21px
;
left
:
2px
;}
.insert
:active
.line
,
.insactive
.line
,
.insert
:hover
.line
,
.insactive
.line2
,
.insert
:hover
.line2
,
.insert
:focus
.line2
{
border-style
:
solid
;}
.insert
.content
{
padding-top
:
1px
;
height
:
40px
;
float
:
left
;
margin-left
:
-30px
;
background
:
none
;
color
:
#fff
;
border
:
none
;
position
:
relative
;
top
:
-18px
;}
.insert
.content
:active
,
.insert
.content
:focus
,
.insactive
.content
{
height
:
40px
;
float
:
left
;
margin-left
:
-30px
;
background
:
#3a3a74
;
color
:
#fff
;
border
:
1px
solid
#0940da
;
position
:
relative
;
top
:
-18px
;}
.insert
.content
p
{
margin
:
0
8px
;
overflow
:
hidden
;}
.insert
.content
p
span
{
display
:
inline-block
;
height
:
12px
;
line-height
:
12px
;}
.insert
.content
p
span
.user
{
float
:
left
;
font-size
:
12px
;}
.insert
.content
p
span
.editDate
{
margin-right
:
8px
;}
.insert
.content
p
span
.editicon
{
cursor
:
pointer
;}
.insert
.content
p
span
.editicon
,
.insert
.content
p
span
.editDate
{
float
:
right
;
font-size
:
11px
;}
.insert
.content
input
{
width
:
100%
;
height
:
18px
;
line-height
:
18px
;
color
:
#000
;
background
:
#f7f3f3
;}
src/main/resources/static/js/qyphResult.js
View file @
5f927c45
...
...
@@ -53,11 +53,11 @@ function doClearFl(){
}
var
table_title
=
[
{
title
:
'标识号'
,
field
:
'objectValue'
,
align
:
'center'
,
width
:
"2
2
%"
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
'标识号'
,
field
:
'objectValue'
,
align
:
'center'
,
width
:
"2
4
%"
,
formatter
:
function
(
val
,
row
,
index
){
return
"<span style='display:inline-block;height:18px;line-height:17px;padding:0 3px;border: 1px solid #f35d13;color:#f35d13;border-radius:5px;font-size:10px;position:relative;top:-1px;'>"
+
row
.
objectTypeName
+
"</span>"
+
getBshYchy
(
row
)
+
"<i class=
\"
fa fa-clone
\"
aria-hidden=
\"
true
\"
style='position: relative;top:2px;color: #1563f5 !important;' title='复制' onclick='copyContent(this)'></i>"
;
}
},
{
title
:
'号码'
,
field
:
'zjhm'
,
align
:
'center'
,
width
:
"2
0
%"
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
'号码'
,
field
:
'zjhm'
,
align
:
'center'
,
width
:
"2
4
%"
,
formatter
:
function
(
val
,
row
,
index
){
var
hm
=
''
;
var
lx
=
getLx
(
row
);
if
(
lx
!=
'--'
){
...
...
@@ -71,7 +71,7 @@ var table_title =[
}},
{
title
:
"出现次数"
,
field
:
"count"
,
align
:
"center"
,
width
:
"8%"
},
{
title
:
"姓名"
,
field
:
"name"
,
align
:
'center'
,
width
:
'1
4
%'
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
"姓名"
,
field
:
"name"
,
align
:
'center'
,
width
:
'1
0
%'
,
formatter
:
function
(
val
,
row
,
index
){
return
getRybq
(
row
);}},
{
title
:
"性别"
,
field
:
"sex"
,
align
:
'center'
,
width
:
'10%'
,
formatter
:
function
(
val
,
row
,
index
){
return
getXbmc
(
row
);}},
...
...
@@ -91,7 +91,7 @@ function doQuery(){
fitColumns
:
true
,
singleSelect
:
true
,
pagination
:
true
,
nowrap
:
fals
e
,
//设置是否换行 false换行 true表示不换行
nowrap
:
tru
e
,
//设置是否换行 false换行 true表示不换行
pageSize
:
20
,
pageList
:
[
10
,
20
,
50
,
100
,
150
,
200
],
showFooter
:
true
,
...
...
src/main/resources/static/js/qypzjgxsNew.js
View file @
5f927c45
...
...
@@ -38,7 +38,15 @@ $(function () {
$.messager.alert({title: '提示', msg: "出错:" + e});
}
})*/
$
(
document
).
bind
(
"click"
,
function
(
e
){
//id为menu的是菜单,id为open的是打开菜单的按钮
if
(
$
(
e
.
target
).
closest
(
".insert"
).
length
==
0
&&
$
(
e
.
target
).
closest
(
".fa-pencil-square-o"
).
length
==
0
){
console
.
log
(
e
.
target
)
$
(
".insert"
).
removeClass
(
"insactive"
);
}
else
{
$
(
e
.
target
).
closest
(
".insert"
).
addClass
(
"insactive"
);
}
})
});
function
loading
(
type
,
msg
){
...
...
@@ -70,8 +78,8 @@ function doClearFl(){
});
}
var
table_title
=
[
{
title
:
'标识号'
,
field
:
'objectValue'
,
align
:
'center'
,
width
:
"2
2
%"
,
formatter
:
function
(
val
,
row
,
index
){
return
"<span style='display:inline-block;height:18px;line-height:17px;padding:0 3px;border: 1px solid #f35d13;color:#f35d13;border-radius:5px;font-size:10px;position:relative;top:-1px;'>"
+
row
.
objectTypeName
+
"</span>"
+
getBshYchy
(
row
)
+
"<i class=
\"
fa fa-clone
\"
aria-hidden=
\"
true
\"
style='position: relative;top:2px;color: #1563f5 !important;' title='复制' onclick='copyContent(this)'></i>"
;
{
title
:
'标识号'
,
field
:
'objectValue'
,
align
:
'center'
,
width
:
"2
4
%"
,
formatter
:
function
(
val
,
row
,
index
){
return
"<span style='display:inline-block;height:18px;line-height:17px;padding:0 3px;border: 1px solid #f35d13;color:#f35d13;border-radius:5px;font-size:10px;position:relative;top:-1px;'>"
+
row
.
objectTypeName
+
"</span>"
+
getBshYchy
(
row
)
+
"<i class=
\"
fa fa-clone
\"
aria-hidden=
\"
true
\"
style='position: relative;top:2px;color: #1563f5 !important;' title='复制' onclick='copyContent(this)'></i>
</span>
"
;
}
},
/* {title:"标识号类型",field:"objectTypeName",align:'center',width:'10%'},*/
...
...
@@ -81,7 +89,7 @@ var table_title =[
/* {title:"类型",field:"zjlx",align:'center',width:'10%',formatter:function(val,row,index){
return getLx(row);
}},*/
{
title
:
'号码'
,
field
:
'zjhm'
,
align
:
'center'
,
width
:
"
28
%"
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
'号码'
,
field
:
'zjhm'
,
align
:
'center'
,
width
:
"
33
%"
,
formatter
:
function
(
val
,
row
,
index
){
var
hm
=
''
;
var
lx
=
getLx
(
row
);
if
(
lx
!=
'--'
){
...
...
@@ -90,11 +98,11 @@ var table_title =[
if
(
lx
==
'--'
){
return
hm
+
getSfzhYchy
(
row
);
}
else
{
return
hm
+
getSfzhYchy
(
row
)
+
"<i class=
\"
fa fa-clone
\"
aria-hidden=
\"
true
\"
style='position: relative;top:2px;color: #1563f5 !important;' title='复制' onclick='copyContent
(this)'></i>"
;
return
hm
+
getSfzhYchy
(
row
)
+
"<i class=
\"
fa fa-clone
fa-fw
\"
aria-hidden=
\"
true
\"
style='position: relative;top:2px;color: #1563f5 !important;' title='复制' onclick='copyContent(this)'></i><i class=
\"
fa fa-pencil-square-o fa-fw
\"
style='position: relative;top:4px;color: #1563f5 !important;font-size: 17px;' aria-hidden=
\"
true
\"
title='插入批注' onclick='insertAnnotation
(this)'></i>"
;
}
}
},
{
title
:
"姓名"
,
field
:
"name"
,
align
:
'center'
,
width
:
'1
5
%'
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
"姓名"
,
field
:
"name"
,
align
:
'center'
,
width
:
'1
0
%'
,
formatter
:
function
(
val
,
row
,
index
){
return
getRybq
(
row
);}},
{
title
:
"性别"
,
field
:
"sex"
,
align
:
'center'
,
width
:
'5%'
,
formatter
:
function
(
val
,
row
,
index
){
return
getXbmc
(
row
);}},
...
...
@@ -978,6 +986,38 @@ function copyDialog(){
$
(
"#copyResult"
).
hide
();
},
2000
);
}
/*插入批注*/
function
insertAnnotation
(
obj
){
$
(
".w"
).
css
(
"margin-left"
,
'50px'
);
var
index
=
$
(
obj
).
parents
(
"tr"
).
index
();
var
num
=
(
index
+
1
)
*
7
;
var
divWrap
=
"<div class='insert insert"
+
index
+
"'><p class='line'></p><p class='line2'></p><div class='content'><p><span class='user'>11111111111</span><span class='editicon' onclick='showList()'><i class=
\"
fa fa-trash-o
\"
aria-hidden=
\"
true
\"
title='删除' onclick='deleteAnnotations(this)'></i></span><span class='editDate'>2019.02.14 12:00:00</span></p><p><input type='text'/></p></div></div>"
;
var
X
=
$
(
obj
).
parents
(
"td"
).
offset
().
top
,
Y
=
$
(
obj
).
parents
(
"td"
).
offset
().
left
,
Y2
=
$
(
".w"
).
offset
().
left
+
1200
;
console
.
log
(
X
+
","
+
Y
+
","
+
Y2
+
","
+
$
(
obj
).
parents
(
"td"
).
index
());
$
(
"body"
).
append
(
divWrap
);
$
(
".insert"
+
index
).
find
(
".editDate"
).
html
(
getCurrentTime
());
$
(
".insert"
+
index
).
addClass
(
"insactive"
);
$
(
".insert"
+
index
).
css
({
"position"
:
"absolute"
,
"left"
:
Y
,
"top"
:
X
,
"z-index"
:
"10000"
});
$
(
".insert"
+
index
).
find
(
".line"
).
width
(
Y2
-
Y
);
$
(
".insert"
+
index
).
find
(
".content"
).
css
({
width
:
$
(
document
).
width
()
-
Y2
-
42
,
top
:
-
18
+
num
});
}
function
getCurrentTime
(){
var
myDate
=
new
Date
;
var
year
=
myDate
.
getFullYear
();
//获取当前年
var
mon
=
myDate
.
getMonth
()
+
1
;
//获取当前月
var
date
=
myDate
.
getDate
();
//获取当前日
var
h
=
myDate
.
getHours
();
//获取当前小时数(0-23)
var
m
=
myDate
.
getMinutes
();
//获取当前分钟数(0-59)
var
s
=
myDate
.
getSeconds
();
//获取当前秒
var
week
=
myDate
.
getDay
();
var
weeks
=
[
"星期日"
,
"星期一"
,
"星期二"
,
"星期三"
,
"星期四"
,
"星期五"
,
"星期六"
];
console
.
log
(
year
,
mon
,
date
,
weeks
[
week
])
var
date
=
year
+
"年"
+
mon
+
"月"
+
date
+
"日"
+
" "
+
h
+
":"
+
m
+
":"
+
s
;
return
date
;
}
function
deleteAnnotations
(
obj
){
$
(
obj
).
parents
(
".insert"
).
remove
();
}
src/main/resources/static/js/skgjbasjgzs.js
View file @
5f927c45
...
...
@@ -58,7 +58,7 @@ var table_title =[
},
{
title
:
"伴随次数"
,
field
:
"count"
,
align
:
'center'
,
width
:
'10%'
},
{
title
:
'号码'
,
field
:
'zjhm'
,
align
:
'center'
,
width
:
"
28
%"
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
'号码'
,
field
:
'zjhm'
,
align
:
'center'
,
width
:
"
33
%"
,
formatter
:
function
(
val
,
row
,
index
){
var
hm
=
''
;
var
lx
=
getLx
(
row
);
if
(
lx
!=
'--'
){
...
...
@@ -73,7 +73,7 @@ var table_title =[
}
},
{
title
:
"姓名"
,
field
:
"name"
,
align
:
'center'
,
width
:
'1
7
%'
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
"姓名"
,
field
:
"name"
,
align
:
'center'
,
width
:
'1
2
%'
,
formatter
:
function
(
val
,
row
,
index
){
return
getRybq
(
row
);}},
{
title
:
"性别"
,
field
:
"sex"
,
align
:
'center'
,
width
:
'10%'
,
formatter
:
function
(
val
,
row
,
index
){
return
getXbmc
(
row
);}},
...
...
@@ -94,7 +94,7 @@ function doQuery(){
fitColumns
:
true
,
singleSelect
:
true
,
pagination
:
true
,
nowrap
:
fals
e
,
//设置是否换行 false换行 true表示不换行
nowrap
:
tru
e
,
//设置是否换行 false换行 true表示不换行
pageSize
:
20
,
pageList
:
[
10
,
20
,
50
,
100
,
150
,
200
],
showFooter
:
true
,
...
...
src/main/resources/static/js/skhsJgzs.js
View file @
5f927c45
...
...
@@ -53,7 +53,7 @@ function doClearFl(){
}
var
table_title
=
[
{
title
:
'标识号'
,
field
:
'objectValue'
,
align
:
'center'
,
width
:
"2
2
%"
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
'标识号'
,
field
:
'objectValue'
,
align
:
'center'
,
width
:
"2
4
%"
,
formatter
:
function
(
val
,
row
,
index
){
return
"<span style='display:inline-block;height:18px;line-height:17px;padding:0 3px;border: 1px solid #f35d13;color:#f35d13;border-radius:5px;font-size:10px;position:relative;top:-1px;'>"
+
row
.
objectTypeName
+
"</span>"
+
getBshYchy
(
row
)
+
"<i class=
\"
fa fa-clone
\"
aria-hidden=
\"
true
\"
style='position: relative;top:2px;color: #1563f5 !important;' title='复制' onclick='copyContent(this)'></i>"
;
}
},
...
...
@@ -61,7 +61,7 @@ var table_title =[
/*{title:"类型",field:"zjlx",align:'center',width:'10%',formatter:function(val,row,index){
return getLx(row);
}},*/
{
title
:
'号码'
,
field
:
'zjhm'
,
align
:
'center'
,
width
:
"
28
%"
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
'号码'
,
field
:
'zjhm'
,
align
:
'center'
,
width
:
"
32
%"
,
formatter
:
function
(
val
,
row
,
index
){
var
hm
=
''
;
var
lx
=
getLx
(
row
);
if
(
lx
!=
'--'
){
...
...
@@ -74,7 +74,7 @@ var table_title =[
}
}},
{
title
:
"姓名"
,
field
:
"name"
,
align
:
'center'
,
width
:
'1
4
%'
,
formatter
:
function
(
val
,
row
,
index
){
{
title
:
"姓名"
,
field
:
"name"
,
align
:
'center'
,
width
:
'1
0
%'
,
formatter
:
function
(
val
,
row
,
index
){
return
getRybq
(
row
);}},
{
title
:
"性别"
,
field
:
"sex"
,
align
:
'center'
,
width
:
'10%'
,
formatter
:
function
(
val
,
row
,
index
){
return
getXbmc
(
row
);}},
...
...
@@ -94,7 +94,7 @@ function doQuery(){
fitColumns
:
true
,
singleSelect
:
true
,
pagination
:
true
,
nowrap
:
fals
e
,
//设置是否换行 false换行 true表示不换行
nowrap
:
tru
e
,
//设置是否换行 false换行 true表示不换行
pageSize
:
20
,
pageList
:
[
10
,
20
,
50
,
100
,
150
,
200
],
showFooter
:
true
,
...
...
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