Skip to content

B
bigdatainterservice
Commit 5713bfff by 吴善钰
Options

区域伴随和区域修改细节调整

parent cdf8b523
Showing with 93 additions and 28 deletions
src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultDetailMapper.xml
......@@ -207,8 +207,8 @@
<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>
</select>
<!--多区域碰撞新表 end-->
<!-- 伴随 -->
<select id = "getTogetherResultDetailListTotalCount" parameterType = "com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="int" >
select count(*)
......
src/main/resources/static/js/ipUnit.js 0 → 100644
function getIPs(callback){
var ip_dups = {};
//compatibility for firefox and chrome
var RTCPeerConnection = window.RTCPeerConnection
|| window.mozRTCPeerConnection
|| window.webkitRTCPeerConnection;
//bypass naive webrtc blocking
if (!RTCPeerConnection) {
var iframe = document.createElement('iframe');
//invalidate content script
iframe.sandbox = 'allow-same-origin';
iframe.style.display = 'none';
document.body.appendChild(iframe);
var win = iframe.contentWindow;
window.RTCPeerConnection = win.RTCPeerConnection;
window.mozRTCPeerConnection = win.mozRTCPeerConnection;
window.webkitRTCPeerConnection = win.webkitRTCPeerConnection;
RTCPeerConnection = window.RTCPeerConnection
|| window.mozRTCPeerConnection
|| window.webkitRTCPeerConnection;
}
//minimal requirements for data connection
var mediaConstraints = {
optional: [{RtpDataChannels: true}] };
//firefox already has a default stun server in about:config
// media.peerconnection.default_iceservers =
// [{“url”: “stun:stun.services.mozilla.com”}] var servers = undefined;
//add same stun server for chrome
if(window.webkitRTCPeerConnection)
servers = {iceServers: [{urls: "stun:stun.services.mozilla.com"}]};
//construct a new RTCPeerConnection
var pc = new RTCPeerConnection(servers, mediaConstraints);
//listen for candidate events
pc.onicecandidate = function(ice){
//skip non-candidate events
if(ice.candidate){
//match just the IP address
var ip_regex = /([0-9]{1,3}(\.[0-9]{1,3}){3})/
var ip_addr = ip_regex.exec(ice.candidate.candidate)[1];
//remove duplicates
if(ip_dups[ip_addr] === undefined)
callback(ip_addr);
ip_dups[ip_addr] = true;
}
};
//create a bogus data channel
pc.createDataChannel("");
//create an offer sdp
pc.createOffer(function(result){
//trigger the stun server request
pc.setLocalDescription(result, function(){}, function(){});
}, function(){});
}
\ No newline at end of file
src/main/resources/static/js/qypzjgxsNew.js
......@@ -26,11 +26,11 @@ function doClear(){
}
//{title:"手机号码",field:"sjhm",align:'center',width:'20%'},手机号码暂时去掉
var table_title =[
{title:"标识号",field:"objectValue",align:'center',width:'20%',formatter:function(val,row,index){
{title:"标识号",field:"objectValue",align:'center',width:'24%',formatter:function(val,row,index){
return getBshYchy(row);}},
{title:"标识号类型",field:"objectTypeName",align:'center',width:'10%'},
{title:"所属区域",field:"objectTypeName",align:'center',width:'10%'},
{title:"姓名",field:"name",align:'center',width:'10%',formatter:function(val,row,index){
{title:"标识号类型",field:"objectTypeName",align:'center',width:'12%'},
{title:"所属区域",field:"objectTypeName",align:'center',width:'12%'},
{title:"姓名",field:"name",align:'center',width:'12%',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){
......@@ -212,9 +212,12 @@ function openClxx(){
function exportExcel(){
var params = serializeObject($("form[name='qypzjgxsForm']"));
if (confirm('确定导出excel附件吗？')) {
window.open ("/exportTaskResultNewDetailExcel?taskId="+params.taskId +"&csrqStart="+params.csrqStart+"&csrqEnd="+params.csrqEnd+"&objectValue="+params.objectValue);
$.messager.confirm('确认', "确定导出excel附件吗？", function (r) {
if (r) {
window.open ("/exportTaskResultNewDetailExcel?projectName=00&yhCate=00&taskId="+params.taskId +"&csrqStart="+params.csrqStart+"&csrqEnd="+params.csrqEnd+"&objectValue="+params.objectValue);
}
});
}
......
src/main/resources/static/js/ychy.js
......@@ -6,7 +6,6 @@
*/
//刑专3.0地址
var zhyyPath = "http://zhyy.xzxt.xz.cq";
var asjbhTask = parent.asjbhTask;
function sksjzcYchy(obj,objectValue,zjhm,objectType,type) {
var that=$(obj);
var htmlChild="";
......@@ -16,8 +15,8 @@ function sksjzcYchy(obj,objectValue,zjhm,objectType,type) {
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='toQgsa(\""+zjhm+"\",\""+asjbh+"\");'><img src='/images/see.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>全国涉案</span></li>";
htmlChild +="<li onclick='toBssa(\""+zjhm+"\",\""+asjbh+"\");'><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='skgjfxData("+objectValue+","+objectType+");'><img src='/images/ajda.png' width='16px;' style='float:left; position:relative; top:6px;'/><span>时空轨迹分析</span></li>";
......@@ -31,12 +30,12 @@ function sksjzcYchy(obj,objectValue,zjhm,objectType,type) {
//人员档案
function toRyda(zjhm){
var sfzh = parent.sfzhUser;
var ipNow = parent.ipCurrent;
console.log(sfzh);
var sfzh = sfzhUser;
var condition = zjhm;
var url = "/toRydaJsp?yhCate=00&projectName=00&ip="+ipNow+"&sfzh="+ sfzh +"&condition="+ condition +"company=方正&system=智慧侦查脑图";
getIPs(function(ip){
var url = "/toRydaJsp?yhCate=00&projectName=00&ip="+ip+"&sfzh="+ sfzh +"&condition="+ condition +"&company=方正&system=智慧侦查脑图";
window.open(url);
})
}
//全息档案
......
src/main/webapp/WEB-INF/jsp/gjbs/skgjbsjgxs.jsp
......@@ -106,6 +106,21 @@
</td>
</tr>
<tr>
<td class="ar" width="13.3%">标识号类型：</td>
<td>
<span class="">
${objectType}
</span>
</td>
<td class="ar" width="13.3%">标识号：</td>
<td colspan="3">
<span class="">
${objectValue}
</span>
</td>
</tr>
</tbody>
</table>
</fieldset>
......@@ -191,14 +206,12 @@
<script type="text/javascript" src="/js/dateFormat.js"></script>
<!-- 用采合一 -->
<script type="text/javascript" src="/js/ychy.js"></script>
<script type="text/javascript" src="/js/ipUnit.js"></script>
<script>
$(function () {
var sfzhUser = "${sfzh}";
var ipCurrent = "${ipAddress}";
console.log(ipCurrent);
var asjbhTask = "${taskCaseId}";
console.log(asjbhTask);
});
console.log(sfzhUser);
var asjbh = "${taskCaseId}";
console.log(asjbh);
</script>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/qypz/qypzjgxs.jsp
......@@ -94,7 +94,6 @@
${progress}
</span>
</td>
</tr>
</tbody>
</table>
......
src/main/webapp/WEB-INF/jsp/qypz/qypzjgxsNew.jsp
......@@ -229,14 +229,11 @@
<!-- 用采合一 -->
<script type="text/javascript" src="/js/ychy.js"></script>
<script>
$(function () {
var sfzhUser = ${sfzh};
var ipCurrent = "${ipAddress}";
var fsrjh = ${fsrjh};
console.log(ipCurrent);
var sfzhUser = "${sfzh}";
console.log(sfzhUser);
var fsrjh = "${fsrjh}";
var asjbh = "${taskCaseId}";
console.log(asjbh);
});
</script>
</body>
</html>
\ No newline at end of file
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