Commit 249e9383 by wangling

结果列表批注功能修改

parent 0686500f
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
GXSJ as gxsj, GXSJ as gxsj,
DJSJ as djsj DJSJ as djsj
FROM TB_ST_PZXX 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="glxxXxzjbh != null and glxxXxzjbh !=''"> and GLXX_XXZJBH = #{glxxXxzjbh}</if>
<if test="taskId != null and taskId !=''"> and TASK_ID = #{taskId}</if> <if test="taskId != null and taskId !=''"> and TASK_ID = #{taskId}</if>
<if test="objectType != null and objectType !=''"> and OBJECT_TYPE = #{objectType}</if> <if test="objectType != null and objectType !=''"> and OBJECT_TYPE = #{objectType}</if>
......
...@@ -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'>批注内容</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.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=$(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);
...@@ -1052,10 +1052,12 @@ function savaPzxx(obj,ind){ ...@@ -1052,10 +1052,12 @@ function savaPzxx(obj,ind){
success: function (message) { success: function (message) {
if(message=='saveSuccess'){ if(message=='saveSuccess'){
$.messager.alert({title: '提示', msg: "保存成功!"}); $.messager.alert({title: '提示', msg: "保存成功!"});
doQuery();
}else if(message=='saveFail'){ }else if(message=='saveFail'){
$.messager.alert({title: '提示', msg: "保存失败!"}); $.messager.alert({title: '提示', msg: "保存失败!"});
}else if(message=='updateSuccess') { }else if(message=='updateSuccess') {
$.messager.alert({title: '提示', msg: "修改成功!"}); $.messager.alert({title: '提示', msg: "修改成功!"});
doQuery();
}else if(message=='updateFail') { }else if(message=='updateFail') {
$.messager.alert({title: '提示', msg: "修改失败!"}); $.messager.alert({title: '提示', msg: "修改失败!"});
}else if(message=='repeat'){ }else if(message=='repeat'){
...@@ -1069,7 +1071,7 @@ function savaPzxx(obj,ind){ ...@@ -1069,7 +1071,7 @@ function savaPzxx(obj,ind){
} }
//删除批注信息 //删除批注信息
function deleteAnnotations(obj,xxzjbh){ function deleteAnnotations(obj,xxzjbh){
if(xxzjbh == '1'){ if(xxzjbh == 1){
$.messager.alert({title: '提示', msg: "删除成功!"}); $.messager.alert({title: '提示', msg: "删除成功!"});
$(obj).parents(".insert").remove(); $(obj).parents(".insert").remove();
} else { } else {
......
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