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
249e9383
Commit
249e9383
authored
Oct 16, 2019
by
wangling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
结果列表批注功能修改
parent
0686500f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
src/main/resources/mybatis/mapper/xzxt/PzxxMapper.xml
+1
-1
src/main/resources/static/js/qypzjgxsNew.js
+5
-3
No files found.
src/main/resources/mybatis/mapper/xzxt/PzxxMapper.xml
View file @
249e9383
...
...
@@ -41,7 +41,7 @@
GXSJ as gxsj,
DJSJ as djsj
FROM TB_ST_PZXX
WHERE 1=1
WHERE 1=1
and XXSC_PDBZ = '0'
<if
test=
"glxxXxzjbh != null and glxxXxzjbh !=''"
>
and GLXX_XXZJBH = #{glxxXxzjbh}
</if>
<if
test=
"taskId != null and taskId !=''"
>
and TASK_ID = #{taskId}
</if>
<if
test=
"objectType != null and objectType !=''"
>
and OBJECT_TYPE = #{objectType}
</if>
...
...
src/main/resources/static/js/qypzjgxsNew.js
View file @
249e9383
...
...
@@ -992,7 +992,7 @@ 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'>批注内容</span><span class='editicon'><i class=
\"
fa fa-file-excel-o
\"
aria-hidden=
\"
true
\"
title='保存' onclick='savaPzxx(this,"
+
index
+
")' style='margin-right:5px;'></i><i class=
\"
fa fa-trash-o
\"
aria-hidden=
\"
true
\"
title='删除' onclick='deleteAnnotations(this,
'1'
)'></i></span><span class='editDate'>2019.02.14 12:00:00</span></p><p><input type='text'/></p></div></div>"
;
var
divWrap
=
"<div class='insert insert"
+
index
+
"'><p class='line'></p><p class='line2'></p><div class='content'><p><span class='user'>批注内容</span><span class='editicon'><i class=
\"
fa fa-file-excel-o
\"
aria-hidden=
\"
true
\"
title='保存' onclick='savaPzxx(this,"
+
index
+
")' style='margin-right:5px;'></i><i class=
\"
fa fa-trash-o
\"
aria-hidden=
\"
true
\"
title='删除' onclick='deleteAnnotations(this,
1
)'></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
);
...
...
@@ -1013,7 +1013,7 @@ function viewPzxx(datalist){
$
(
".w"
).
css
(
"margin-left"
,
'50px'
);
}
var
tr
=
$
(
"#listdiv .datagrid-body>table tr"
).
eq
(
i
);
var
divWrap
=
"<div class='insert insert"
+
i
+
"'><p class='line'></p><p class='line2'></p><div class='content'><p><span class='user'>"
+
data
.
pzrXm
+
"</span><span class='editicon'><i class=
\"
fa fa-file-excel-o
\"
aria-hidden=
\"
true
\"
title='保存' onclick='savaPzxx(this,"
+
i
+
")' style='margin-right:5px;'></i><i class=
\"
fa fa-trash-o
\"
aria-hidden=
\"
true
\"
title='删除' onclick='deleteAnnotations(this,
\"
"
+
data
.
pzxxzjbh
+
"
\"
)'></i></span><span class='editDate'>
2019.02.14 12:00:00
</span></p><p><input type='text' value='"
+
data
.
pzNr
+
"'/></p></div></div>"
;
var
divWrap
=
"<div class='insert insert"
+
i
+
"'><p class='line'></p><p class='line2'></p><div class='content'><p><span class='user'>"
+
data
.
pzrXm
+
"</span><span class='editicon'><i class=
\"
fa fa-file-excel-o
\"
aria-hidden=
\"
true
\"
title='保存' onclick='savaPzxx(this,"
+
i
+
")' style='margin-right:5px;'></i><i class=
\"
fa fa-trash-o
\"
aria-hidden=
\"
true
\"
title='删除' onclick='deleteAnnotations(this,
\"
"
+
data
.
pzxxzjbh
+
"
\"
)'></i></span><span class='editDate'></span></p><p><input type='text' value='"
+
data
.
pzNr
+
"'/></p></div></div>"
;
//var X=$(obj).parents("td").offset().top,Y=$(obj).parents("td").offset().left,Y2=$(".w").offset().left+1200;
var
X
=
tr
.
offset
().
top
,
Y
=
tr
.
find
(
"td"
).
eq
(
2
).
offset
().
left
,
Y2
=
$
(
".w"
).
offset
().
left
+
1200
;
console
.
log
(
X
+
","
+
Y
+
","
+
Y2
+
","
+
$
(
document
).
width
()
-
Y2
-
42
);
...
...
@@ -1052,10 +1052,12 @@ function savaPzxx(obj,ind){
success
:
function
(
message
)
{
if
(
message
==
'saveSuccess'
){
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"保存成功!"
});
doQuery
();
}
else
if
(
message
==
'saveFail'
){
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"保存失败!"
});
}
else
if
(
message
==
'updateSuccess'
)
{
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"修改成功!"
});
doQuery
();
}
else
if
(
message
==
'updateFail'
)
{
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"修改失败!"
});
}
else
if
(
message
==
'repeat'
){
...
...
@@ -1069,7 +1071,7 @@ function savaPzxx(obj,ind){
}
//删除批注信息
function
deleteAnnotations
(
obj
,
xxzjbh
){
if
(
xxzjbh
==
'1'
){
if
(
xxzjbh
==
1
){
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"删除成功!"
});
$
(
obj
).
parents
(
".insert"
).
remove
();
}
else
{
...
...
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