Commit 4031e54d by 吴善钰

区域碰撞和区域搜索代码调整

parent b0d961c8
......@@ -37,5 +37,6 @@ public class RegionalTaskResultDetail {
private String ryzpStr;
private String sfFzxyr;//是否犯罪嫌疑人
private String sfGwry;//是否高危人员
private String regionlist;//所属区域
}
......@@ -136,6 +136,7 @@
t.OBJECT_TYPE as objectType,
t.OBJECT_TYPE_NAME as objectTypeName,
t.OBJECT_VALUE as objectValue,
t.REGIONLIST as regionlist,
td.TASK_RESULT_ID as taskResultId,
td.BIRTHDAY as birthday,
td.NAME as name,
......@@ -271,7 +272,7 @@
<if test="objectValue!= null and objectValue!= ''">and t.OBJECT_VALUE LIKE '%'|| #{objectValue} || '%'</if>
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
order by t.DJSJ desc
order by t.COUNT desc
) t1
where rownum <![CDATA[ <= ]]> #{endNum}
) t2
......
......@@ -26,18 +26,48 @@ function doClear(){
}
//{title:"手机号码",field:"sjhm",align:'center',width:'20%'},手机号码暂时去掉
var table_title =[
{title:"标识号",field:"objectValue",align:'center',width:'30%',formatter:function(val,row,index){
return row.objectValue + "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+row.objectValue+"\",\""+row.zjhm+"\",\""+row.objectType+"\",\"2\")'/>";}},
{title:"标识号",field:"objectValue",align:'center',width:'20%',formatter:function(val,row,index){
return getBshYchy(row);}},
{title:"标识号类型",field:"objectTypeName",align:'center',width:'10%'},
{title:"姓名",field:"name",align:'center',width:'10%'},
{title:"所属区域",field:"objectTypeName",align:'center',width:'10%'},
{title:"姓名",field:"name",align:'center',width:'10%',formatter:function(val,row,index){
return getRybq(row);}},
{title:"证件类型",field:"zjlx",align:'center',width:'20%'},
{title:"证件号码",field:"zjhm",align:'center',width:'20%',formatter:function(val,row,index){
return row.zjhm + "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+row.objectValue+"\",\""+row.zjhm+"\",\""+row.objectType+"\",\"1\")'/>";
}},
{title:"操作",field:"cz",align:'center',width:'10%',formatter:function(val,row,index){
return getCzColumn(row);
}},
return getSfzhYchy(row);
}}
];
function getSfzhYchy(obj){
var zjhm = obj.zjhm;
var url = zjhm;
if(zjhm != null && zjhm != ""){
url += "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+obj.objectValue+"\",\""+ zjhm +"\",\""+obj.objectType+"\",\"1\")'/>";
}
return url;
}
function getBshYchy(obj){
var objectValue = obj.objectValue;
var url = objectValue;
if (objectValue != null && objectValue != "") {
url += "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+objectValue+"\",\""+obj.zjhm+"\",\""+obj.objectType+"\",\"2\")'/>";
}
return url;
}
function getRybq(obj){
var name = obj.name;
var url = name;
var sfFzxyr = obj.sfFzxyr;
var sfGwry = obj.sfGwry
if (sfFzxyr != null && sfFzxyr !="" && sfFzxyr != undefined) {
url += "<a class='re_hqzt re_qs'>前科</a>";
}
if (sfGwry != null && sfGwry !="" && sfGwry != undefined) {
url += "<a class='re_hqzt re_hb'>高危</a>";
}
return url;
}
function doQuery(){
$('#qypzjgxsNewTable').datagrid({
url: "/getTaskResultNewDetailList",
......
......@@ -25,20 +25,39 @@ function doClear(){
});
}
var table_title =[
{title:"标识号",field:"objectValue",align:'center',width:'10%',formatter:function(val,row,index){
return row.objectValue + "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+row.objectValue+"\",\""+row.zjhm+"\",\""+row.objectType+"\",\"2\")'/>";
{title:"标识号",field:"objectValue",align:'center',width:'20%',formatter:function(val,row,index){
return getBshYchy(row);
}},
{title:"标识号类型",field:"objectTypeName",align:'center',width:'10%'},
{title:"伴随次数",field:"count",align:'center',width:'10%'},
{title:"姓名",field:"name",align:'center',width:'10%'},
{title:"证件类型",field:"zjlx",align:'center',width:'15%'},
{title:"证件号码",field:"zjhm",align:'center',width:'15%',formatter:function(val,row,index){
return row.zjhm + "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+row.objectValue+"\",\""+row.zjhm+"\",\""+row.objectType+"\",\"1\")'/>";}},
{title:"入库时间",field:"djsj",align:'center',width:'15%'},
{title:"操作",field:"cz",align:'center',width:'15%',formatter:function(val,row,index){
{title:"证件号码",field:"zjhm",align:'center',width:'20%',formatter:function(val,row,index){
return getSfzhYchy(row);}},
{title:"入库时间",field:"djsj",align:'center',width:'15%'}
/*{title:"操作",field:"cz",align:'center',width:'15%',formatter:function(val,row,index){
return getCzColumn(row);
}},
}}*/,
];
function getSfzhYchy(obj){
var zjhm = obj.zjhm;
var url = zjhm;
if(zjhm != null && zjhm != ""){
url += "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+obj.objectValue+"\",\""+ zjhm +"\",\""+obj.objectType+"\",\"1\")'/>";
}
return url;
}
function getBshYchy(obj){
var objectValue = obj.objectValue;
var url = objectValue;
if (objectValue != null && objectValue != "") {
url += "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+objectValue+"\",\""+obj.zjhm+"\",\""+obj.objectType+"\",\"2\")'/>";
}
return url;
}
function doQuery(){
$('#skgjbsjgzsTable').datagrid({
url: "/getTogetherResultDetailList",
......
......@@ -14,13 +14,13 @@ function sksjzcYchy(obj,objectValue,zjhm,objectType,type) {
htmlChild += "<h4><b onclick='closeLayer();' style='float:right; margin-right:5px; cursor: pointer; font-size:12px; color:#f60;'><span style='position:relative; top:-4px;'>关闭</span></b></h4>";
/*htmlChild +="<h4>"+asjbh+"</h4>";*/
if(type == "1"){//身份证号用采合一
htmlChild += "<li onclick='toRyda("+zjhm+");'><img src='/images/rygtfx.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>人员档案</span></li>";
htmlChild +="<li onclick='toQxda("+zjhm+");'><img src='/images/ajda.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>全息档案</span></li>";
htmlChild +="<li onclick='toQgsa("+zjhm+","+asjbhTask+");'><img src='/images/see.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>全国涉案</span></li>";
htmlChild +="<li onclick='toBssa("+zjhm+","+asjbhTask+");'><img src='/images/bgzczz.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>本省涉案</span></li>";
htmlChild += "<li onclick='toRyda(\""+zjhm+"\");'><img src='/images/rygtfx.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>人员档案</span></li>";
htmlChild +="<li onclick='toQxda(\""+zjhm+"\");'><img src='/images/ajda.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>全息档案</span></li>";
htmlChild +="<li onclick='toQgsa(\""+zjhm+"\",\""+asjbhTask+"\");'><img src='/images/see.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>全国涉案</span></li>";
htmlChild +="<li onclick='toBssa(\""+zjhm+"\",\""+asjbhTask+"\");'><img src='/images/bgzczz.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>本省涉案</span></li>";
}else if(type == "2"){//IMSI用采合一
htmlChild +="<li onclick='toGjhs("+objectValue+","+objectType+");'><img src='/images/ajzb.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>轨迹回溯</span></li>";
htmlChild += "<li data-act='startAnalyze.action' onclick='toQxda("+objectValue+");'><img src='/images/ajda.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>全息档案</span></li>";
htmlChild +="<li onclick='toGjhs(\""+objectValue+"\",\""+objectType+"\");'><img src='/images/ajzb.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>轨迹回溯</span></li>";
htmlChild += "<li data-act='startAnalyze.action' onclick='toQxda(\""+objectValue+"\");'><img src='/images/ajda.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>全息档案</span></li>";
}
htmlChild += "</ul>";
layer.tips(htmlChild, that,{time:15000,tips:[2,'#f3f7f8'],width:380}); //在元素的事件回调体中,follow直接赋予this即可
......@@ -67,4 +67,7 @@ function toGjhs(objectValue,objectType) {
}
var url= "/toYsgjzs?projectName=00&yhCate=00&kssj="+ kssj + "&jssj=" + jssj + "&objValue=" + objectValue + "&objType=" + objectType;
window.open(url);
}
function closeLayer(){
layer.closeAll("tips");
}
\ No newline at end of file
......@@ -53,7 +53,7 @@
<div class="w">
<div class="head clearfix">
<div class="aj_message">
<span class="aj_code">区域碰撞结果展示</span>
<span class="aj_code">时空轨迹伴随结果展示</span>
</div>
</div>
<div class="cxtj box-s">
......@@ -193,7 +193,7 @@
<script type="text/javascript" src="/js/ychy.js"></script>
<script>
$(function () {
var sfzhUser = ${sfzh};
var sfzhUser = "${sfzh}";
var ipCurrent = "${ipAddress}";
console.log(ipCurrent);
var asjbhTask = "${taskCaseId}";
......
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