修改批注

src/main/resources/static/css/style.css

@@ -375,7 +375,7 @@ a.left-list-ftitle:hover{
 .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;border: 1px solid #71aada;}
+.insert .content{padding-top: 1px;height:36px;float:left;    margin-left: -30px;background:none;color:#fff;border:none;position: relative;top:-18px;border: 1px solid #71aada;}
 .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;}
@@ -383,4 +383,4 @@ a.left-list-ftitle:hover{
 .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;}
+.insert .content input{width:100%;height:16px;line-height:16px;color:#000;background: #f7f3f3;}

src/main/resources/static/js/qypzjgxsNew.js

@@ -992,39 +992,38 @@ 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' onclick='showList()'><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)'></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)'></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).css({"position":"absolute","left":Y,"top":X,"z-index":"1000"});
     $(".insert"+index).find(".line").width(Y2-Y);
     $(".insert"+index).find(".content").css({width:$(document).width()-Y2-42,top:-18+num});
 }
 /*查询显示*/
-function viewPzxx(data){
+function viewPzxx(datalist){
     var n=0,num;
-    for(var i=0;i<data.length;i++){
-        if(data[i].pzNr !="" && data[i].pzNr != null){
+    $.each(datalist,function (i,data){
+        if(data.pzNr !="" && data.pzNr != null){
             n=1;
             num=(i+1)*7;
             if(n==1){
                 $(".w").css("margin-left",'50px');
             }
-            var i=0;
             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[i].pzrXm+"</span><span class='editicon' onclick='showList()'><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)'></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"+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 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);
             $("body").append(divWrap);
             $(".insert"+i).addClass("insactive");
-            $(".insert"+i).css({"position":"absolute","left":Y,"top":X,"z-index":"10000"});
+            $(".insert"+i).css({"position":"absolute","left":Y,"top":X,"z-index":"1000"});
             $(".insert"+i).find(".line").width(Y2-Y);
             $(".insert"+i).find(".content").css({width:$(document).width()-Y2-42,top:-18+num});
         }
-    }
+    });
 }
 function getCurrentTime(){
     var myDate = new Date;
@@ -1069,7 +1068,8 @@ function savaPzxx(obj,ind){
     });
 }
 //删除批注信息
-function deleteAnnotations(obj){
+function deleteAnnotations(obj,xxzjbh){
+    alert("xxzjbh============="+xxzjbh);
     $.ajax({
         method: 'post',
         url: '/updatePzxx',