Commit 4c9dbcb9 by chentian

Merge remote-tracking branch 'origin/master'

parents c8a31dc0 3ebf0ba8
......@@ -139,7 +139,7 @@ public class BkScheduleService {
List<Bkxx> retuList = new ArrayList<>();
for (Bkxx bkxx:bkxxList){
XdhSpUtil xdhSpUtil = new XdhSpUtil();
JSONObject obj = xdhSpUtil.getSpResultUtil(bkxx.getAsjbh(),bkxx.getSqr_sfzh(),bkxx.getBkdxhm(),"智慧侦查脑图",bizCode,cjServiceId);
JSONObject obj = xdhSpUtil.getSpResultUtil(bkxx.getAsjbh(),bkxx.getSqr_sfzh(),bkxx.getBkdxhm(),"信息布控",bizCode,cjServiceId);
String spzt = "";
if (obj!=null){
spzt = (String) obj.get("data");
......
......@@ -248,14 +248,14 @@ function doQueryqk(){
if (zjlx == "--") {
hmurl = "--";
} else if (zjlx == "手机号码"){
hmurl = rows[k].sjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+rows[k].sjhm+','+rows[k].objectType+',3)"/>';
hmurl = rows[k].sjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+rows[k].sjhm+'\',\''+rows[k].objectType+'\',\'3\')"/>';
} else {
hmurl = zjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+zjhm+','+rows[k].objectType+',1)"/>';
hmurl = zjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+zjhm+'\',\''+rows[k].objectType+'\',\'1\')"/>';
}
//姓名
var name = rows[k].name;
var nameurl = "";
var nameurl = name;
var sfFzxyr = rows[k].sfFzxyr;
var sfGwry = rows[k].sfGwry
var qkryBq = "";//前科人员标签
......@@ -266,15 +266,15 @@ function doQueryqk(){
} else {
if (sfFzxyr != null && sfFzxyr !="" && sfFzxyr != undefined) {
qkryBq = "<a class='re_hqzt re_qs'>前科</a>";
nameurl = name + qkryBq;
nameurl += qkryBq;
}
if (sfGwry != null && sfGwry !="" && sfGwry != undefined) {
gwryBq = "<a class='re_hqzt re_hb'>高危</a>";
nameurl = name + gwryBq;
nameurl += gwryBq;
}
if (qkryBq == "" && gwryBq ==""){
zwBq = "<a class='re_hqzt re_no'>标签暂无</a>";
nameurl = name + zwBq;
nameurl += zwBq;
}
}
......@@ -285,7 +285,7 @@ function doQueryqk(){
' <p class="currResultP">' +
' <span class="navSpan rtitleSpan noLinkSpan"><font class="num">'+(k+1)+'</font>.标识号:</span>\n' +
' <span id="" class="navSpan noLinkSpan autoWidthSpan isLongSpan">\n' +
' <a class="commonPopoverlink" search="is-ajbh" searchkey="AJ_ASJBH" onclick="" title="'+rows[k].objectValue+'">'+rows[k].objectValue+'</a><img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+zjhm+','+rows[k].objectType+',2)"/>\n' +
' <a class="commonPopoverlink" search="is-ajbh" searchkey="AJ_ASJBH" onclick="" title="'+rows[k].objectValue+'">'+rows[k].objectValue+'</a><img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+zjhm+'\',\''+rows[k].objectType+'\',\'2\')"/>\n' +
' </span>\n' +
' </p>\n' +
' <p class="currResultP">\n' +
......
......@@ -228,14 +228,14 @@ function doQueryqk(){
if (zjlx == "--") {
hmurl = "--";
} else if (zjlx == "手机号码"){
hmurl = rows[k].sjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+rows[k].sjhm+','+rows[k].objectType+',3)"/>';
hmurl = rows[k].sjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+rows[k].sjhm+'\',\''+rows[k].objectType+'\',\'3\')"/>';
} else {
hmurl = zjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+zjhm+','+rows[k].objectType+',1)"/>';
hmurl = zjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+zjhm+'\',\''+rows[k].objectType+'\',\'1\')"/>';
}
//姓名
var name = rows[k].name;
var nameurl = "";
var nameurl = name;
var sfFzxyr = rows[k].sfFzxyr;
var sfGwry = rows[k].sfGwry
var qkryBq = "";//前科人员标签
......@@ -246,15 +246,15 @@ function doQueryqk(){
} else {
if (sfFzxyr != null && sfFzxyr !="" && sfFzxyr != undefined) {
qkryBq = "<a class='re_hqzt re_qs'>前科</a>";
nameurl = name + qkryBq;
nameurl += qkryBq;
}
if (sfGwry != null && sfGwry !="" && sfGwry != undefined) {
gwryBq = "<a class='re_hqzt re_hb'>高危</a>";
nameurl = name + gwryBq;
nameurl += gwryBq;
}
if (qkryBq == "" && gwryBq ==""){
zwBq = "<a class='re_hqzt re_no'>标签暂无</a>";
nameurl = name + zwBq;
nameurl += zwBq;
}
}
......@@ -265,7 +265,7 @@ function doQueryqk(){
' <p class="currResultP">' +
' <span class="navSpan rtitleSpan noLinkSpan"><font class="num">'+(k+1)+'</font>.标识号:</span>\n' +
' <span id="" class="navSpan noLinkSpan autoWidthSpan isLongSpan">\n' +
' <a class="commonPopoverlink" search="is-ajbh" searchkey="AJ_ASJBH" onclick="" title="'+rows[k].objectValue+'">'+rows[k].objectValue+'</a><img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+zjhm+','+rows[k].objectType+',2)"/>\n' +
' <a class="commonPopoverlink" search="is-ajbh" searchkey="AJ_ASJBH" onclick="" title="'+rows[k].objectValue+'">'+rows[k].objectValue+'</a><img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+zjhm+'\',\''+rows[k].objectType+'\',\'2\')"/>\n' +
' </span>\n' +
' </p>\n' +
' <p class="currResultP">\n' +
......
......@@ -228,14 +228,14 @@ function doQueryqk(){
if (zjlx == "--") {
hmurl = "--";
} else if (zjlx == "手机号码"){
hmurl = rows[k].sjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+rows[k].sjhm+','+rows[k].objectType+',3)"/>';
hmurl = rows[k].sjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+rows[k].sjhm+'\',\''+rows[k].objectType+'\',\'3\')"/>';
} else {
hmurl = zjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+zjhm+','+rows[k].objectType+',1)"/>';
hmurl = zjhm+'<img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+zjhm+'\',\''+rows[k].objectType+'\',\'1\')"/>';
}
//姓名
var name = rows[k].name;
var nameurl = "";
var nameurl = name;
var sfFzxyr = rows[k].sfFzxyr;
var sfGwry = rows[k].sfGwry
var qkryBq = "";//前科人员标签
......@@ -246,15 +246,15 @@ function doQueryqk(){
} else {
if (sfFzxyr != null && sfFzxyr !="" && sfFzxyr != undefined) {
qkryBq = "<a class='re_hqzt re_qs'>前科</a>";
nameurl = name + qkryBq;
nameurl += qkryBq;
}
if (sfGwry != null && sfGwry !="" && sfGwry != undefined) {
gwryBq = "<a class='re_hqzt re_hb'>高危</a>";
nameurl = name + gwryBq;
nameurl += gwryBq;
}
if (qkryBq == "" && gwryBq ==""){
zwBq = "<a class='re_hqzt re_no'>标签暂无</a>";
nameurl = name + zwBq;
nameurl += zwBq;
}
}
......@@ -265,7 +265,7 @@ function doQueryqk(){
' <p class="currResultP">' +
' <span class="navSpan rtitleSpan noLinkSpan"><font class="num">'+(k+1)+'</font>.标识号:</span>\n' +
' <span id="" class="navSpan noLinkSpan autoWidthSpan isLongSpan">\n' +
' <a class="commonPopoverlink" search="is-ajbh" searchkey="AJ_ASJBH" onclick="" title="'+rows[k].objectValue+'">'+rows[k].objectValue+'</a><img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,'+rows[k].objectValue+','+zjhm+','+rows[k].objectType+',2)"/>\n' +
' <a class="commonPopoverlink" search="is-ajbh" searchkey="AJ_ASJBH" onclick="" title="'+rows[k].objectValue+'">'+rows[k].objectValue+'</a><img src="/images/asjxx_ychy.png" width=20 height=20 onclick="sksjzcYchy(this,\''+rows[k].objectValue+'\',\''+zjhm+'\',\''+rows[k].objectType+'\',\'2\')"/>\n' +
' </span>\n' +
' </p>\n' +
' <p class="currResultP">\n' +
......
......@@ -78,17 +78,19 @@ function getRybq(obj){
var qkryBq = "";//前科人员标签
var gwryBq = "";//高位人员标签
var zwBq = "";//暂无标签
if (sfFzxyr != null && sfFzxyr !="" && sfFzxyr != undefined) {
qkryBq = "<a class='re_hqzt re_qs'>前科</a>";
url += qkryBq;
}
if (sfGwry != null && sfGwry !="" && sfGwry != undefined) {
gwryBq = "<a class='re_hqzt re_hb'>高危</a>";
url += gwryBq;
}
if (qkryBq == "" && gwryBq ==""){
zwBq = "<a class='re_hqzt re_no'>标签暂无</a>";
url += zwBq;
if(name != "--") {
if (sfFzxyr != null && sfFzxyr != "" && sfFzxyr != undefined) {
qkryBq = "<a class='re_hqzt re_qs'>前科</a>";
url += qkryBq;
}
if (sfGwry != null && sfGwry != "" && sfGwry != undefined) {
gwryBq = "<a class='re_hqzt re_hb'>高危</a>";
url += gwryBq;
}
if (qkryBq == "" && gwryBq == "") {
zwBq = "<a class='re_hqzt re_no'>标签暂无</a>";
url += zwBq;
}
}
return url;
}
......
......@@ -91,7 +91,7 @@
</div>
<div class="result box-s" style="overflow: hidden;">
<!--查询条件-->
<div class="cxjg">
<div class="cxjg" style="display: none;">
<form name="skgjbsjgzsForm"style="margin-top:15px;">
<fieldset>
<legend class="cursor" onclick="show()" flag="false">
......@@ -212,7 +212,7 @@
<script type="text/javascript" src="/common/datepicker/calendar.js"></script>
<script src="/common/layer/layer.js" type="text/javascript"></script>
<!--- 页面相关js -->
<script type="text/javascript" src="/js/skhsJgzs.js"></script>
<script type="text/javascript" src="/js/sksjzcCommon.js"></script>
<script type="text/javascript" src="/js/skgjbasjgzs.js"></script>
<script type="text/javascript" src="/js/dateFormat.js"></script>
<script type="text/javascript" src="/js/ipUnit.js"></script>
......
......@@ -88,6 +88,47 @@
<%--<div class="statistics">查询结果<span class="st-span total">0</span>
</div>--%>
<div class="result box-s" style="overflow: hidden;">
<!--查询条件-->
<div class="cxjg" style="display: none;">
<form name="qypzjgxsForm"style="margin-top:15px;">
<fieldset>
<legend class="cursor" onclick="show()" flag="false">
查询条件<i class="fa fa-angle-double-down down"></i><i class="fa fa-angle-double-up up" style="display: none"></i>
</legend>
<input type="hidden" id = "yhCate" name="yhCate" value="00" />
<input type="hidden" id = "projectName" name="projectName" value="刑专智慧侦查脑图" />
<input type="hidden" id = "objectType" name="objectType" value="" class="fltj"/>
<input type="hidden" id = "birthday" name="birthday" value="" class="fltj"/>
<input type="hidden" id = "sfbs" name="sfbs" value="" class="fltj"/>
<input type="hidden" id = "sex" name="sex" value="" class="fltj"/>
<input type="hidden" id = "checkVal" name="checkVal" value="" />
<table style="display: none" class="cxtj-table sp_table">
<tbody>
<input type="hidden" name="taskId" value="${taskId}">
<tr>
<td colspan="4" style="height:20px;"></td>
</tr>
<tr>
<td class="ar" width="13.3%">标识号:</td>
<td style="width:20%;">
<span class="textbox">
<input name="objectValue" type="text" id="objectValue"/>
</span>
</td>
</tr>
<tr>
<td colspan="4" style="text-align:center;">
<a class="btn_a btn_search" onclick="doQuery()">查询</a>
<a class="btn_a btn_empty" onclick="doClear()">清空</a>
<%-- <a class="btn_a btn_add" onclick="exportExcel()" id="exportExcel">导出Excel</a>--%>
</td>
</tr>
</tbody>
</table>
</fieldset>
</form>
</div>
<%--分类导航--%>
<div class="cxjg">
<fieldset>
......@@ -182,7 +223,7 @@
<script src="/common/layer/layer.js" type="text/javascript"></script>
<!--- 页面相关js -->
<script type="text/javascript" src="/js/skhsJgzs.js"></script>
<script type="text/javascript" src="/js/sksjzcCommon.js"></script>
<script type="text/javascript" src="/js/qypzjgxsNew.js"></script>
<script type="text/javascript" src="/js/dateFormat.js"></script>
<script type="text/javascript" src="/js/ipUnit.js"></script>
......
......@@ -90,7 +90,7 @@
</div>--%>
<div class="result box-s" style="overflow: hidden;">
<!--查询条件-->
<div class="cxjg">
<div class="cxjg" style="display: none;">
<form name="skhsjgzsForm"style="margin-top:15px;">
<fieldset>
<legend class="cursor" onclick="show()" flag="false">
......@@ -219,7 +219,7 @@
<script type="text/javascript" src="/common/datepicker/calendar.js"></script>
<script src="/common/layer/layer.js" type="text/javascript"></script>
<!--- 页面相关js -->
<script type="text/javascript" src="/js/skhsJgzs.js"></script>
<script type="text/javascript" src="/js/sksjzcCommon.js"></script>
<script type="text/javascript" src="/js/skhsJgzs.js"></script>
<script type="text/javascript" src="/js/dateFormat.js"></script>
<script type="text/javascript" src="/js/ipUnit.js"></script>
......
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