Commit 6137d816 by wangling

批注时间显示

parent 249e9383
......@@ -33,7 +33,7 @@ public class PzxxController {
* @param tbStPzxx
* @return
*/
@RequestMapping("/savePzxx")
@RequestMapping(value = "/savePzxx", method = {RequestMethod.GET, RequestMethod.POST})
@ResponseBody
public String savePzxx(TbStPzxx tbStPzxx){
//根据objectTypeName和objectValue获取关联任务结果详情表的信息主键编号
......@@ -87,7 +87,7 @@ public class PzxxController {
return message;
}
@RequestMapping("/updatePzxx")
@RequestMapping(value = "/updatePzxx", method = {RequestMethod.GET, RequestMethod.POST})
@ResponseBody
public String updatePzxx(TbStPzxx tbStPzxx){
tbStPzxx.setFlag("1");
......
......@@ -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'>"+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;
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'></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.pzrPolicemanid+"</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=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);
......@@ -1036,7 +1036,7 @@ function getCurrentTime(){
var week = myDate.getDay();
var weeks = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
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;
}
//保存批注信息
......@@ -1072,8 +1072,8 @@ function savaPzxx(obj,ind){
//删除批注信息
function deleteAnnotations(obj,xxzjbh){
if(xxzjbh == 1){
$.messager.alert({title: '提示', msg: "删除成功!"});
$(obj).parents(".insert").remove();
pdLength();
} else {
$.ajax({
method: 'post',
......@@ -1082,8 +1082,8 @@ function deleteAnnotations(obj,xxzjbh){
data: {"xxzjbh":xxzjbh, "yhCate":"00", "projectName":"刑专智慧侦查脑图"},
success: function (message) {
if(message=='deleteSuccess'){
$.messager.alert({title: '提示', msg: "删除成功!"});
$(obj).parents(".insert").remove();
pdLength();
}else{
$.messager.alert({title: '提示', msg: "删除失败!"});
}
......@@ -1094,5 +1094,10 @@ function deleteAnnotations(obj,xxzjbh){
});
}
}
function pdLength(){
if($(".insert ").length==0){
$(".w").css({"margin-left": "auto"});
}
}
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