Skip to content

B
bigdatainterservice
Commit aef40ba8 by chentian
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/resources/static/js/qypzjgxsNew.js
parents 0b6f772f ced35794
Showing with 631 additions and 25 deletions
src/main/java/com/founder/interservice/mapper/xzxt/SBTResultDetailMapper.java
......@@ -25,7 +25,8 @@ public interface SBTResultDetailMapper {
//时空回溯 wsy
List<SpatiotemporalBackTrack> queryTaskList(SpatiotemporalBackTrack spatiotemporalBackTrack);
Integer queryTaskListCount(SpatiotemporalBackTrack spatiotemporalBackTrack);
SpatiotemporalBackTrack findByTaskId(String taskId);
Integer findSkhsDetailListTotalCount(SBTResultDetail sbtResultDetail);
List<SBTResultDetail> findSkhsTaskResultDetailList(SBTResultDetail sbtResultDetail);
}
src/main/java/com/founder/interservice/regionalanalysis/controller/RegionalAnalysisController.java
......@@ -573,6 +573,12 @@ public class RegionalAnalysisController {
regionalTaskResultDetail = regionalAnalysisService.findRegionalTaskResultNewDetailList(param);
if (null != regionalTaskResultDetail && regionalTaskResultDetail.size() > 0) {
for (RegionalTaskResultDetail tsaf : regionalTaskResultDetail) {
String zjhm = tsaf.getZjhm();
if (null == zjhm || "".equals(zjhm)) {
tsaf.setName("--");
tsaf.setZjlx("--");
tsaf.setZjhm("非本市户籍人员");
}
String edzZp = clzp(tsaf);
tsaf.setRyzpStr(edzZp);
}
......
src/main/java/com/founder/interservice/spatiotemporalBackTrack/controller/SpatiotemporalBackTrackController.java
......@@ -19,8 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.persistence.criteria.CriteriaBuilder;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@Controller
......@@ -37,6 +40,7 @@ public class SpatiotemporalBackTrackController {
private String cjServiceId;
@RequestMapping(value = "/sendSpatiotemporalBackTrackTask",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody
public ResultVO sendSpatiotemporalBackTrackTask(String username,String paramStr,String asjbh,String taskName,String qybj,String centerPoint){
ResultVO resultVO = null;
User user = null;
......@@ -187,7 +191,7 @@ public class SpatiotemporalBackTrackController {
taskVO.setState("计算超时");
break;
case "END":
taskVO.setState("比对碰撞已完成");
taskVO.setState("时空回溯已完成");
break;
case "ERROR":
taskVO.setState("执行错误");
......@@ -236,4 +240,137 @@ public class SpatiotemporalBackTrackController {
}
return resultMap;
}
/**
* 跳转到时空回溯结果页面（目前采集调用）
* @param taskId 任务id
* @return
*/
@RequestMapping(value = "/toSkhsJsp",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody
public ModelAndView toSkhsJsp(String taskId, String sfzh, String fsrjh){
SpatiotemporalBackTrack sbt = spatiotemporalBackTrackService.findByTaskId(taskId);
//初始化相关字段
String taskName = "";
String stateTag = "";
String prosessTag = "";
String taskCaseId = "";
Date rksj = null;
//当获取的对象不为空时，获取相应的值
if (null != sbt) {
taskName = sbt.getTaskName();
stateTag = sbt.getState();
prosessTag = sbt.getProgress();
rksj = sbt.getRksj();
taskCaseId = sbt.getTaskCaseId();
}
//状态
String state = "";
//QUEUEING 排队等待、STARTING 开始中、RUNNING 执行中、FINISHED 处理中、TIMEOUT 计算超时、ERROR 执行错误、HANDLE 已完成
if("QUEUEING".equals(stateTag)){
state = "排队等待";
}else if("STARTING".equals(stateTag)){
state = "开始中";
}else if("RUNNING".equals(stateTag)){
state = "执行中";
}else if("FINISHED".equals(stateTag)){
state = "标识号调取完成";
}else if("TIMEOUT".equals(stateTag)){
state = "计算超时";
}else if("ERROR".equals(stateTag)){
state = "执行错误";
}else if("END".equals(stateTag)){
state = "时空回溯已完成";
}
//进度
String progress = "";
if (null != prosessTag) {
if("1".equals(prosessTag)){
progress = "100%";
}else if("0".equals(prosessTag)){
progress = "0%";
}else {
double pi =Double.valueOf(prosessTag);
progress =new DecimalFormat("#%").format(pi);
}
} else {
progress = "0%";
}
ModelAndView modelAndView = new ModelAndView("skhs/skhsJgzs");
//入库时间
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
if (null != rksj) {
modelAndView.addObject("rksj",formatter.format(rksj));
} else {
modelAndView.addObject("rksj","");
}
modelAndView.addObject("taskId",taskId);
modelAndView.addObject("taskName",taskName);
modelAndView.addObject("sfzh",sfzh);//当前用户身份正好（用采合一、人员档案用）
modelAndView.addObject("fsrjh",fsrjh);
modelAndView.addObject("state",state);
modelAndView.addObject("progress",progress);
modelAndView.addObject("taskCaseId",taskCaseId);
return modelAndView;
}
/**
* 获取时空回溯结果列表 wsy
* @param param
* @param page
* @param rows
* @return
*/
@RequestMapping("/getSkhsTaskResultDetailList")
@ResponseBody
public Map<String,Object> getSkhsTaskResultDetailList(SBTResultDetail param ,
@RequestParam(value = "page",defaultValue = "0") int page,
@RequestParam(value = "rows",defaultValue = "0") int rows){
Map<String, Object> resultMap = new HashMap<>();
List<SBTResultDetail> sbtResultDetails;
int totalCount = 0;
try {
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(page);
easyUIPage.setPagePara(rows);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
param.setStartNum(begin);
param.setEndNum(end);
totalCount = spatiotemporalBackTrackService.findSkhsDetailListTotalCount(param);
sbtResultDetails = spatiotemporalBackTrackService.findSkhsTaskResultDetailList(param);
if (null != sbtResultDetails && sbtResultDetails.size() > 0) {
for (SBTResultDetail tsaf : sbtResultDetails) {
String zjhm = tsaf.getZjhm();
if (null == zjhm || "".equals(zjhm)) {
tsaf.setName("--");
tsaf.setZjlx("--");
tsaf.setZjhm("非本市户籍人员");
}
String edzZp = clzp(tsaf);
tsaf.setRyzpStr(edzZp);
}
}
resultMap.put("total", totalCount);
resultMap.put("rows",sbtResultDetails);
}catch (Exception e){
e.printStackTrace();
resultMap.put("total", 0);
resultMap.put("rows", new ArrayList<>());
}
return resultMap;
}
/**
* 照片处理
* @param sbtResultDetail
* @return
*/
private String clzp(SBTResultDetail sbtResultDetail) {
String zp = null;
if(sbtResultDetail.getRyzp() != null){
zp = new String(sbtResultDetail.getRyzp());// 返回Base64编码过的字节数组字符串
}
return zp;
}
}
src/main/java/com/founder/interservice/spatiotemporalBackTrack/model/SBTResultDetail.java
......@@ -9,6 +9,7 @@ import java.util.Date;
@Data
public class SBTResultDetail {
private String XXZJBH;
private String taskId;//任务id
private String taskResultId;//案件编号
private String objectType;
private String objectTypeName;
......
src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/SpatiotemporalBackTrackService.java
......@@ -22,5 +22,8 @@ public interface SpatiotemporalBackTrackService {
//时空回溯相关 开始 wsy
List<SpatiotemporalBackTrack> queryTaskList(SpatiotemporalBackTrack spatiotemporalBackTrack);
Integer queryTaskListCount(SpatiotemporalBackTrack spatiotemporalBackTrack);
SpatiotemporalBackTrack findByTaskId(String taskId);
Integer findSkhsDetailListTotalCount(SBTResultDetail sbtResultDetail);
List<SBTResultDetail> findSkhsTaskResultDetailList(SBTResultDetail sbtResultDetail);
//时空回溯相关 结束
}
src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/impl/SpatiotemporalBackTrackScheduledService.java
......@@ -52,7 +52,7 @@ public class SpatiotemporalBackTrackScheduledService {
* @return:
* @date: 2018/8/22 0022-16:35
*/
@Scheduled(initialDelay = 60000,fixedDelay = 120000) //每次执行完后两分钟后再次执行
//每次执行完后两分钟后再次执行
public void queryTimeBackTrackResult(){
System.out.println("=============SpatiotemporalBackTrack Start Running================");
System.out.println("=============SpatiotemporalBackTrack Start Running================");
......@@ -95,7 +95,7 @@ public class SpatiotemporalBackTrackScheduledService {
* 2.开启新线程调取标识号的关联数据
* 3.调取标识号关联数据完成，然后更新任务
*/
@Scheduled(initialDelay = 120000,fixedDelay = 120000) //项目启动后延迟两分钟执行，每次执行完后两分钟后再次执行
//项目启动后延迟两分钟执行，每次执行完后两分钟后再次执行
public void queryFinishTaskResult(){
System.out.println("=============开始执行时空回溯调取关联数据定时任务================");
System.out.println("线程名称========== " + Thread.currentThread().getName());
......@@ -334,7 +334,6 @@ public class SpatiotemporalBackTrackScheduledService {
}
//begin
List<SpatiotemporalBackTrackResult> resultsList = data.subList(start, end); //从fromIndex（包含），到toIndex（不包含）
try {
for (SpatiotemporalBackTrackResult result : resultsList) {
String objType = result.getObjectType();
String objValue = result.getObjectValue();
......@@ -345,7 +344,12 @@ public class SpatiotemporalBackTrackScheduledService {
JSONObject jsonObj = null;
String relationAll = "";
//获取对象关联关系
relationAll = pushWaDataService.pushRelationAll(DateUtil.getYYYYMMDDHHMM(), DateUtil.getYYYYMMDDHHMM(), "admin", objValue,3);
try {
relationAll = pushWaDataService.pushRelationAll(DateUtil.getYYYYMMDDHHMM(), DateUtil.getYYYYMMDDHHMM(), "admin", objValue,3);
}catch(Exception e){
continue;
}
if(null != relationAll && relationAll.startsWith("{")){
JSONObject json = JSONObject.parseObject(relationAll);
jsonObj = json.getJSONObject("data");
......@@ -391,9 +395,6 @@ public class SpatiotemporalBackTrackScheduledService {
}
}
}
}catch(Exception e){
e.printStackTrace();
}
}
}
}
src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/impl/SpatiotemporalBackTrackServiceImpl.java
......@@ -99,4 +99,19 @@ public class SpatiotemporalBackTrackServiceImpl implements SpatiotemporalBackTra
public Integer queryTaskListCount(SpatiotemporalBackTrack spatiotemporalBackTrack) {
return sBTResultDetailMapper.queryTaskListCount(spatiotemporalBackTrack);
}
@Override
public SpatiotemporalBackTrack findByTaskId(String taskId) {
return sBTResultDetailMapper.findByTaskId(taskId);
}
@Override
public Integer findSkhsDetailListTotalCount(SBTResultDetail sbtResultDetail) {
return sBTResultDetailMapper.findSkhsDetailListTotalCount(sbtResultDetail);
}
@Override
public List<SBTResultDetail> findSkhsTaskResultDetailList(SBTResultDetail sbtResultDetail) {
return sBTResultDetailMapper.findSkhsTaskResultDetailList(sbtResultDetail);
}
}
src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java
......@@ -393,6 +393,12 @@ public class TrackTogetherContoller {
totalCount = trackTogetherService.getTogetherResultDetailListTotalCount(taskParam);
if (null != detailList && detailList.size() > 0) {
for (RegionalTaskResultDetail tsaf : detailList) {
String zjhm = tsaf.getZjhm();
if (null == zjhm || "".equals(zjhm)) {
tsaf.setName("--");
tsaf.setZjlx("--");
tsaf.setZjhm("非本市户籍人员");
}
if(tsaf.getRyzp() != null){
tsaf.setRyzpStr(new String(tsaf.getRyzp()));
}
......
src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultDetailMapper.xml
......@@ -167,7 +167,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 td.name desc nulls last,t.DJSJ desc
) t1
where rownum <![CDATA[ <= ]]> #{endNum}
) t2
......
src/main/resources/mybatis/mapper/xzxt/SBTResultDetailMapper.xml
......@@ -172,4 +172,93 @@
select count(task_id) from tb_st_spatiotemporalbacktrack where TASK_CASE_ID = #{taskCaseId, jdbcType=VARCHAR}
</select>
<!-- 根据时空回溯任务id，查询相应任务信息 -->
<select id="findByTaskId" parameterType="java.lang.String" resultType="com.founder.interservice.spatiotemporalBackTrack.model.SpatiotemporalBackTrack">
select TASK_ID as taskId,
TASK_NAME as taskName,
TASK_CASE_ID as taskCaseId,
PROGRESS as progress,
STATE as state,
QY_NAME as qyName,
QYBJ as qybj,
LC as lc,
START_TIME as startTime,
END_TIME as endTime,
RKSJ as rksj,
FSR_JH as fsrJh,
FSR_SFZH as fsrSfzh,
FSR_XM as fsrXm,
FSR_LXDH as fsrLxdh
from tb_st_spatiotemporalbacktrack
where TASK_ID = #{taskId, jdbcType=VARCHAR}
</select>
<!-- 获取时空回溯结果总数 -->
<select id="findSkhsDetailListTotalCount" parameterType="com.founder.interservice.spatiotemporalBackTrack.model.SBTResultDetail" resultType="java.lang.Integer">
select count(*)
from TB_ST_SPATIOTEMPORALRESULT t
left join SBT_RESULT_DETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
where t.TASK_ID = #{taskId}
<if test="objectType!= null and objectType!= ''">
<choose>
<when test="objectType.indexOf(',') > 0">
and t.OBJECT_TYPE in (${objectType})
</when>
<otherwise>
and t.OBJECT_TYPE in (#{objectType})
</otherwise>
</choose>
</if>
<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>
</select>
<!-- 获取时空回溯list -->
<select id="findSkhsTaskResultDetailList" parameterType="com.founder.interservice.spatiotemporalBackTrack.model.SBTResultDetail" resultType="com.founder.interservice.spatiotemporalBackTrack.model.SBTResultDetail">
select t2.*
from (
select t1.*,
rownum as rn
from (
select
t.XXZJBH as xxzjbh,
t.TASK_ID as taskId,
t.OBJECT_TYPE as objectType,
t.OBJECT_TYPE_NAME as objectTypeName,
t.OBJECT_VALUE as objectValue,
td.TASK_RESULT_ID as taskResultId,
td.BIRTHDAY as birthday,
td.NAME as name,
td.RYZP as ryzp,
td.XZZDZMC as xzzDzmc,
td.CSDDZMC as csdDzmc,
td.ZJLX as zjlx,
td.ZJLX_CODE as zjlxCode,
td.AGE as age,
td.SEX as sex,
td.ZJHM as zjhm,
td.SJHM as sjhm
from TB_ST_SPATIOTEMPORALRESULT t
left join SBT_RESULT_DETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
where t.TASK_ID = #{taskId}
<if test="objectType!= null and objectType!= ''">
<choose>
<when test="objectType.indexOf(',') > 0">
and t.OBJECT_TYPE in (${objectType})
</when>
<otherwise>
and t.OBJECT_TYPE in (#{objectType})
</otherwise>
</choose>
</if>
<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 td.name desc nulls LAST,t.djsj desc
) t1
where rownum <![CDATA[ <= ]]> #{endNum}
) t2
where rn <![CDATA[ > ]]> #{startNum}
</select>
</mapper>
\ No newline at end of file
src/main/resources/static/css/detailStyle.css
......@@ -412,7 +412,7 @@ label {
width: 100%;
height: 22px;
}
.newNavInfo {
.newNavInfo,.newNavInfo-m,.newNavInfo-d {
background: none;
height: 25px;
margin: 0px 10px 0px 10px;
......@@ -570,4 +570,7 @@ a.newNavA:HOVER {
.pageNumberSpan:hover {
background-color: #eaeff2;
}
.navSpan .num{font-size:14px;font-weight:600;margin-right:5px;}
\ No newline at end of file
.navSpan .num{font-size:14px;font-weight:600;margin-right:5px;}
.current-icon{margin-left:15px;margin-right:5px;display: none;}
.current-text{font-size:12px;}
#echarts-wrap{height:300px;}
\ No newline at end of file
src/main/resources/static/js/skgjbasjgzs.js
......@@ -43,7 +43,7 @@ var table_title =[
function getSfzhYchy(obj){
var zjhm = obj.zjhm;
var url = zjhm;
if(zjhm != null && zjhm != ""){
if(zjhm != null && zjhm != "" && zjhm != "非本市户籍人员"){
url += "<img src=\"/images/asjxx_ychy.png\" width=20 height=20 onclick='sksjzcYchy(this,\""+obj.objectValue+"\",\""+ zjhm +"\",\""+obj.objectType+"\",\"1\")'/>";
}
return url;
......
src/main/resources/static/js/skhsJgzs.js 0 → 100644
$(function () {
doQuery();
$(document).on("click",".searchConfigChecks li input",function(){
$("#searchConfigCheckAll").prop("checked", false);
document.getElementById("searchConfigCheckAll").setAttribute("flag", "true");
//获取所有的checkbox
var checkBox = $(".searchConfigChecks li input[type='checkbox']");
//获取选中的checkbox
var selectCheckBox = $(".searchConfigChecks li input[type='checkbox']:checked");
if(checkBox .size()==selectCheckBox.size()){
$("#searchConfigCheckAll").prop("checked", true);
document.getElementById("searchConfigCheckAll").setAttribute("flag", "false");
}
})
});
function show(){
if($(".cursor").attr("flag")=="false"){
$(".cxtj-table").slideDown('fast');
$(".down").hide();
$(".up").show();
$(".cursor").attr("flag","true");
}else{
$(".cxtj-table").slideUp('fast');
$(".down").show();
$(".up").hide();
$(".cursor").attr("flag","false");
}
}
/**
* 清除检索条件
*/
function doClear(){
$("form input[type=text]:visible,form input[class='textbox-value']").val("");//将所有可见的input和class是textbox-value的input框 即代码选择框 的值清空
$("input[name='objectType']").each(function() {
this.checked = false;
});
}
var table_title =[
{title:"标识号",field:"objectValue",align:'center',width:'24%',formatter:function(val,row,index){
return getBshYchy(row);}},
{title:"标识号类型",field:"objectTypeName",align:'center',width:'16%'},
{title:"姓名",field:"name",align:'center',width:'16%',formatter:function(val,row,index){
return getRybq(row);}},
{title:"证件类型",field:"zjlx",align:'center',width:'20%'},
{title:"证件号码",field:"zjhm",align:'center',width:'24%',formatter:function(val,row,index){
return getSfzhYchy(row);
}}
];
function getSfzhYchy(obj){
var zjhm = obj.zjhm;
var url = zjhm;
if(zjhm != null && zjhm != "" && 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(){
$('#skhsjgzsTable').datagrid({
url: "/getSkhsTaskResultDetailList",
columns : [table_title],
queryParams:serializeObject($("form[name='skhsjgzsForm']")),
striped: true,
fitColumns: true,
singleSelect: true,
pagination: true,
nowrap: false, //设置是否换行 false换行 true表示不换行
pageSize: 20,
pageList: [10, 20, 50, 100, 150, 200],
showFooter: true,
selectOnCheck : false,
checkOnSelect : false,
pageNumber:1,
loadFilter: function(data){
$(".total").html(data.total);
return data;
}
});
};
/**
* 将表单序列化
*/
function serializeObject(form){
var o={};
$.each(form.serializeArray(),function(index){
if(o[this['name'] ]){
o[this['name'] ] = o[this['name'] ] + "," + this['value'];
}else{
o[this['name'] ]=this['value'];
}
})
return o;
}
//暂时不用
function getCzColumn(row){
var str="<a href=\"javascript:;\" onclick=\"toZstp('"+row.xzzDzmc+"','"+row.sjhm+"','"+row.age+"','"+row.objectValue+"','"+row.objectTypeName+"','"+row.objectType+"','"+row.ryzpStr+"','"+row.name+"','"+row.birthday+"','"+row.zjlx+"','"+row.zjhm+"','"+row.sfFzxyr+"','"+row.sfGwry+"');\" class=\"cz\"><span>结果显示</span></a>";
return str;
}
function toZstp(xzzDzmc,sjhm,age,objectValue,objectTypeName,objectType,ryzpStrs,name,birthday,zjlx,zjhm,sfFzxyr,sfGwry){
var cllxArr = ["6424","6422","6423","7888"];
var ryzpStr = "";
if(ryzpStrs != "null" && ryzpStrs !=''){
ryzpStr = "<img src=\"data:image/gif;base64," + ryzpStrs + "\"/>";
}else {
ryzpStr = "<img src=\"/images/timg.jpg\" style = \"height:121px;width:100px;\"/>";
}
//获取人员标签
if(sfFzxyr == "1"){
//犯罪嫌疑人
$("#sf-fzxyr").css("display","block");
}
if(sfGwry == "1"){
//高危人员
$("#sf-gwry").css("display","block");
}
var objValue = objectValue== "null"?"":objectValue;
var objTypeName = objectTypeName=="null"?"":objectTypeName;
var zjlxx = zjlx=="null"?"":zjlx;
var zjhmm = zjhm=="null"?"":zjhm;
var agee = age=="null"?"":age;
var namee = name=="null"?"":name;
var birth = birthday=="null"?"":birthday;
var sj = sjhm=="null"?"":sjhm;
var xzz = xzzDzmc=="null"?"":xzzDzmc;
if(cllxArr.indexOf(objectType) > -1){
//车辆
$("#clRyzp").html(ryzpStr);
$("#cph").text(objValue);
$("#cllx").text(objTypeName);
$("#clZjlx").text(zjlxx);
$("#clZjhm").text(zjhmm);
openClxx();
}else {
//人员
$("#ryzp").html(ryzpStr);
$("#ryName").text(namee);
$("#ryAge").text(agee);
$("#rySfzh").text(zjhmm);
$("#ryCsrq").text(birth);
$("#ryDhhm").text(sj);
$("#imsi").text(objValue);
$("#ryAddress").text(xzz);
openRyxx();
}
}
function openRyxx(){
$('#ryjgzs').dialog({
buttons:[{
//确定生成表头配置信息,并重新加载表格数据
text:'确定',
handler:function(){
$('#ryjgzs').dialog('close');
$(document).unbind("scroll");
}
},{
text:'取消',
handler:function(){
$('#ryjgzs').dialog('close');
$(document).unbind("scroll");
}
}],
onClose: function () {
$(document).unbind("scroll");
}
});
$('#ryjgzs').show().dialog('open');
$("#ryjgzs").window('center');
var tops = $(document).scrollTop();//当页面滚动时，把当前距离赋值给页面，这样保持页面滚动条不动
$(document).bind("scroll",function (){$(document).scrollTop(tops); });
}
function openClxx(){
$('#clxxzs').dialog({
buttons:[{
//确定生成表头配置信息,并重新加载表格数据
text:'确定',
handler:function(){
$('#clxxzs').dialog('close');
$(document).unbind("scroll");
}
},{
text:'取消',
handler:function(){
$('#clxxzs').dialog('close');
$(document).unbind("scroll");
}
}],
onClose: function () {
$(document).unbind("scroll");
}
});
$('#clxxzs').show().dialog('open');
$("#clxxzs").window('center');
var tops = $(document).scrollTop();//当页面滚动时，把当前距离赋值给页面，这样保持页面滚动条不动
$(document).bind("scroll",function (){$(document).scrollTop(tops); });
}
function exportExcel(){
var params = serializeObject($("form[name='qypzjgxsForm']"));
$.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);
}
});
}
//分类导航
function checkAllNav(obj){
isChecked = obj.getAttribute("flag") !== "false";
if(isChecked){
obj.setAttribute("flag", "false");
//先获得控制全选反选的input标签
$(".searchConfigChecks li").each(function(){
$(this).find("input").prop("checked", isChecked);
})
}else{
obj.setAttribute("flag", "true");
//先获得控制全选反选的input标签
$(".searchConfigChecks li").each(function(){
$(this).find("input").prop("checked", isChecked);
})
}
}
//更多收起
function goSlide(thisObj){
var newNavbody = $(thisObj).parents(".newNavbody"),
panelObj = newNavbody.find(".newNavInfo").length ? newNavbody.find(".newNavInfo") : newNavbody.find(".newNavMoreInfo"),
isShowed=panelObj.attr('isShowed') === 'true';
if(isShowed){
thisObj.innerHTML='更多';
panelObj.attr('isShowed','false');
panelObj.removeClass('newNavMoreInfo');
panelObj.addClass('newNavInfo');
}else{
thisObj.innerHTML='收起';
panelObj.attr('isShowed','true');
panelObj.addClass('newNavMoreInfo');
panelObj.removeClass('newNavInfo');
}
}
src/main/webapp/WEB-INF/jsp/gjbs/skgjbsjgxs.jsp
......@@ -104,15 +104,8 @@
${progress}
</span>
</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="">
......
src/main/webapp/WEB-INF/jsp/qypz/qypzjgxsNew.jsp
......@@ -42,7 +42,8 @@
border-radius: 11px;
font-size: 12px;color:#fff;}
.over{ overflow: inherit;white-space: inherit;}
.cxtj table input, .cxjg table input{margin-top:-3px;}
.cxtj table input, .cxjg table input{margin-top:-2px;}
.radil_td .radio_inp{height: 14px; }
</style>
<body>
<div class="w">
......@@ -177,7 +178,6 @@
</table>
</fieldset>
</form>
<legend>查询结果<span class="st-span total">0</span></legend>
</div>
<%--分类导航--%>
<div class="cxjg">
......@@ -206,6 +206,7 @@
<a class="btn_a btn_empty" onclick="doClear()">清空</a>
</div>
</fieldset>
<legend>查询结果<span class="st-span total">0</span></legend>
<div class="bootPanelHeading pull-left">
<%-- <span>当前结果共<span class="countTotal red">2211</span>条，共<span class="countTotalPage red">148</span>页</span>--%>
<span><span class="countTotal red"></span><span class="countTotalPage red"></span></span>
......@@ -230,7 +231,7 @@
</div>
</div>
</div>--%>
<%-- <div class="newNav">
<%--<div class="newNav">
<div class="newNavTop">出生日期分类</div>
<div class="newNavbody">
<div class="newLayoutDiv pull-clear" id="XYR_ZHFZXYR_CSRQ_RQGZXXlayoutDiv">
......@@ -273,6 +274,72 @@
</div>
</div>--%>
</div>
<div class="navCategory">
<div class="newNav">
<div class="newNavTop">出生日期分类</div>
<div class="newNavbody">
<div class="newLayoutDiv pull-clear" id="XYR_ZHFZXYR_CSRQ_RQGZXXlayoutDiv">
<a onclick="goBack()" href="javascript:void(0)" class="newNavA pull-left">出生日期导航<span class='current-icon'><<<span class='current-text'></span></span></a>
<a onclick="goSlide(this)" href="javascript:void(0)" class="newNavA newNavBtn newMore newNavTools pull-right">更多</a>
<a href="javascript:void(0)" id="XYR_ZHFZXYR_CSRQ_RQGZXX" onclick="" class="newNavA newNavBtn newMultival_1 newNavTools pull-right" title="图表筛选"> 图表</a>
<div class="fillColorCheckBox pull-right"></div>
</div>
<div class="newNavInfo" isshowed="false">
<div class="newClear"></div>
<a class="newNavA" style="text-decoration:none;" onclick="flclick(this,'111','date','','')" href="javascript:void(0)" onclick="">空值(37)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2006年(1)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2005年(2)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2004年(2)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2003年(6)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2002年(17)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2001年(20)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2000年(23)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1999年(27)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1998年(29)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1997年(36)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1996年(31)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1995年(43)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1994年(38)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1993年(51)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1992年(47)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1991年(56)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1990年(56)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1989(70)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1988(68)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1987(77)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1986(65)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1985(59)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1984(55)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1983(75)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1982(58)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1981(46)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">1980(58)</a>
</div>
<div class="newNavInfo-m" style="display: none;">
<div class="newClear"></div>
<a class="newNavA" style="text-decoration:none;" onclick="flclick(this,'222','date','','')" href="javascript:void(0)" onclick="">月空值(37)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2006年(1)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2005年(2)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2004年(2)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2003年(6)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2002年(17)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2001年(20)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2000年(23)</a>
</div>
<div class="newNavInfo-d" style="display: none;">
<div class="newClear"></div>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">日空值(37)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2006年(1)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2005年(2)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2004年(2)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2003年(6)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2002年(17)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2001年(20)</a>
<a class="newNavA" style="text-decoration:none;" href="javascript:void(0)" onclick="">2000年(23)</a>
</div>
</div>
</div>
</div>
</div>
<%--区块--%>
<div id="qkdiv" class="layoutDiv resultList" style="display: none;">
......@@ -353,6 +420,10 @@
</div>
</div>
</div>
<!--表格设置面板-->
<div id="w" class="easyui-dialog dialog" title="图表" data-options="modal:true,closed:true,collapsible:false,minimizable:false,maximizable:false" style="width:600px;height:420px;padding:10px;overflow-y:auto;display:none;">
<div id="echarts-wrap"></div>
</div>
<script type="text/javascript" src="/js/jquery-1.11.3.js"></script>
<script type="text/javascript" src="/js/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/js/easyui-lang-zh_CN.js"></script>
......@@ -364,6 +435,7 @@
<script type="text/javascript" src="/js/dateFormat.js"></script>
<!-- 用采合一 -->
<script type="text/javascript" src="/js/ychy.js"></script>
<script type="text/javascript" src="/js/echarts.min.js"></script>
<script>
var sfzhUser = "${sfzh}";
console.log(sfzhUser);
......
src/main/webapp/WEB-INF/jsp/skhs/readMe.txt 0 → 100644
时空回溯功能，页面路径
目前包括
1.时空回溯结果展示页面：skhsJgzs.jsp
\ 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