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
6137d816
Commit
6137d816
authored
Oct 17, 2019
by
wangling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批注时间显示
parent
249e9383
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
src/main/java/com/founder/interservice/pzxx/controller/PzxxController.java
+2
-2
src/main/resources/static/js/qypzjgxsNew.js
+10
-5
No files found.
src/main/java/com/founder/interservice/pzxx/controller/PzxxController.java
View file @
6137d816
...
@@ -33,7 +33,7 @@ public class PzxxController {
...
@@ -33,7 +33,7 @@ public class PzxxController {
* @param tbStPzxx
* @param tbStPzxx
* @return
* @return
*/
*/
@RequestMapping
(
"/savePzxx"
)
@RequestMapping
(
value
=
"/savePzxx"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
@ResponseBody
@ResponseBody
public
String
savePzxx
(
TbStPzxx
tbStPzxx
){
public
String
savePzxx
(
TbStPzxx
tbStPzxx
){
//根据objectTypeName和objectValue获取关联任务结果详情表的信息主键编号
//根据objectTypeName和objectValue获取关联任务结果详情表的信息主键编号
...
@@ -87,7 +87,7 @@ public class PzxxController {
...
@@ -87,7 +87,7 @@ public class PzxxController {
return
message
;
return
message
;
}
}
@RequestMapping
(
"/updatePzxx"
)
@RequestMapping
(
value
=
"/updatePzxx"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
}
)
@ResponseBody
@ResponseBody
public
String
updatePzxx
(
TbStPzxx
tbStPzxx
){
public
String
updatePzxx
(
TbStPzxx
tbStPzxx
){
tbStPzxx
.
setFlag
(
"1"
);
tbStPzxx
.
setFlag
(
"1"
);
...
...
src/main/resources/static/js/qypzjgxsNew.js
View file @
6137d816
...
@@ -992,7 +992,7 @@ function insertAnnotation(obj){
...
@@ -992,7 +992,7 @@ function insertAnnotation(obj){
$
(
".w"
).
css
(
"margin-left"
,
'50px'
);
$
(
".w"
).
css
(
"margin-left"
,
'50px'
);
var
index
=
$
(
obj
).
parents
(
"tr"
).
index
();
var
index
=
$
(
obj
).
parents
(
"tr"
).
index
();
var
num
=
(
index
+
1
)
*
7
;
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'>
"
+
fsrjh
+
"
</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
;
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
());
console
.
log
(
X
+
","
+
Y
+
","
+
Y2
+
","
+
$
(
obj
).
parents
(
"td"
).
index
());
$
(
"body"
).
append
(
divWrap
);
$
(
"body"
).
append
(
divWrap
);
...
@@ -1013,7 +1013,7 @@ function viewPzxx(datalist){
...
@@ -1013,7 +1013,7 @@ function viewPzxx(datalist){
$
(
".w"
).
css
(
"margin-left"
,
'50px'
);
$
(
".w"
).
css
(
"margin-left"
,
'50px'
);
}
}
var
tr
=
$
(
"#listdiv .datagrid-body>table tr"
).
eq
(
i
);
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
.
pzr
Xm
+
"</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
divWrap
=
"<div class='insert insert"
+
i
+
"'><p class='line'></p><p class='line2'></p><div class='content'><p><span class='user'>"
+
data
.
pzr
Policemanid
+
"</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'>"
+
data
.
pzgxsj
+
"
</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=$(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
;
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
);
console
.
log
(
X
+
","
+
Y
+
","
+
Y2
+
","
+
$
(
document
).
width
()
-
Y2
-
42
);
...
@@ -1036,7 +1036,7 @@ function getCurrentTime(){
...
@@ -1036,7 +1036,7 @@ function getCurrentTime(){
var
week
=
myDate
.
getDay
();
var
week
=
myDate
.
getDay
();
var
weeks
=
[
"星期日"
,
"星期一"
,
"星期二"
,
"星期三"
,
"星期四"
,
"星期五"
,
"星期六"
];
var
weeks
=
[
"星期日"
,
"星期一"
,
"星期二"
,
"星期三"
,
"星期四"
,
"星期五"
,
"星期六"
];
console
.
log
(
year
,
mon
,
date
,
weeks
[
week
])
console
.
log
(
year
,
mon
,
date
,
weeks
[
week
])
var
date
=
year
+
"
年"
+
mon
+
"月"
+
date
+
"日
"
+
" "
+
h
+
":"
+
m
+
":"
+
s
;
var
date
=
year
+
"
-"
+
mon
+
"-"
+
date
+
"-
"
+
" "
+
h
+
":"
+
m
+
":"
+
s
;
return
date
;
return
date
;
}
}
//保存批注信息
//保存批注信息
...
@@ -1072,8 +1072,8 @@ function savaPzxx(obj,ind){
...
@@ -1072,8 +1072,8 @@ function savaPzxx(obj,ind){
//删除批注信息
//删除批注信息
function
deleteAnnotations
(
obj
,
xxzjbh
){
function
deleteAnnotations
(
obj
,
xxzjbh
){
if
(
xxzjbh
==
1
){
if
(
xxzjbh
==
1
){
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"删除成功!"
});
$
(
obj
).
parents
(
".insert"
).
remove
();
$
(
obj
).
parents
(
".insert"
).
remove
();
pdLength
();
}
else
{
}
else
{
$
.
ajax
({
$
.
ajax
({
method
:
'post'
,
method
:
'post'
,
...
@@ -1082,8 +1082,8 @@ function deleteAnnotations(obj,xxzjbh){
...
@@ -1082,8 +1082,8 @@ function deleteAnnotations(obj,xxzjbh){
data
:
{
"xxzjbh"
:
xxzjbh
,
"yhCate"
:
"00"
,
"projectName"
:
"刑专智慧侦查脑图"
},
data
:
{
"xxzjbh"
:
xxzjbh
,
"yhCate"
:
"00"
,
"projectName"
:
"刑专智慧侦查脑图"
},
success
:
function
(
message
)
{
success
:
function
(
message
)
{
if
(
message
==
'deleteSuccess'
){
if
(
message
==
'deleteSuccess'
){
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"删除成功!"
});
$
(
obj
).
parents
(
".insert"
).
remove
();
$
(
obj
).
parents
(
".insert"
).
remove
();
pdLength
();
}
else
{
}
else
{
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"删除失败!"
});
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
"删除失败!"
});
}
}
...
@@ -1094,5 +1094,10 @@ function deleteAnnotations(obj,xxzjbh){
...
@@ -1094,5 +1094,10 @@ function deleteAnnotations(obj,xxzjbh){
});
});
}
}
}
}
function
pdLength
(){
if
(
$
(
".insert "
).
length
==
0
){
$
(
".w"
).
css
({
"margin-left"
:
"auto"
});
}
}
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