Commit aa446cba by 焦荣

Merge remote-tracking branch 'origin/master'

parents e15e037f 300f6754
......@@ -14,7 +14,7 @@ public class DefaultViewConfig implements WebMvcConfigurer {
@Override
public void addViewControllers(ViewControllerRegistry registry) {
registry.addViewController("/toLogin").setViewName("login/login");
registry.addViewController("/toLogin").setViewName("login/login_hainan");
registry.addViewController("/hncsLogin").setViewName("login/login_hncs");
registry.addViewController("/hnzzLogin").setViewName("login/login_hnzz");
registry.addViewController("/hnxtLogin").setViewName("login/login_hnxt");
......@@ -30,9 +30,10 @@ public class DefaultViewConfig implements WebMvcConfigurer {
registry.addViewController("/hnxxLogin").setViewName("login/login_hnxx");
registry.addViewController("/hainanLogin").setViewName("login/login_hainan");
registry.addViewController("/neimengLogin").setViewName("login/login_neimeng");
registry.addViewController("/noLogin").setViewName("login/login");
//registry.addViewController("/").setViewName("login/login_hnzz");
registry.addViewController("/noLogin").setViewName("login/login_hainan");
registry.addViewController("/").setViewName("login/login_hainan");
registry.addViewController("/toFjxz").setViewName("login/fjxz/common_fjxz");
registry.addViewController("/toCzsmxz").setViewName("login/fjxz/common_czsm");
registry.addViewController("/toObjectKJ").setViewName("rygl/objectKJ");
......
......@@ -17,7 +17,7 @@ public class FilterConfig extends WebMvcConfigurerAdapter {
//
registry.addInterceptor(InterceptorConfig).
addPathPatterns("/**").
excludePathPatterns("/","/toLogin","/hncsLogin","/hnzzLogin","/hnxtLogin","/hnhyLogin","/hnsyLogin","/hnyueyLogin","/hnzjjLogin","/hncdLogin","/hnyiyLogin","/hnczLogin","/hnyzLogin","/hnhhLogin","/hnldLogin","/hnxxLogin","/hainanLogin","/getSjcntDetail","/noLogin","/saveSwSjXx",
excludePathPatterns("/","/toLogin","/hncsLogin","/hnzzLogin","/hnxtLogin","/hnhyLogin","/hnsyLogin","/hnyueyLogin","/hnzjjLogin","/hncdLogin","/hnyiyLogin","/hnczLogin","/hnyzLogin","/hnhhLogin","/hnldLogin","/hnxxLogin","/hainanLogin","/neimengLogin","/getSjcntDetail","/noLogin","/saveSwSjXx",
"/saveHmSjXx","/getSwSjXx","/getYthcjryxxByZjhm","/getYthcjUser","/getZfbaUser","/getZwbzJbxxCnt","/getCcbzJbxxCnt","/toswcj",
"/doLogin","/toHome","/static*//**","/refreshCodeCache","/qxdoLogin","/queryNameByCode","/queryTypeCode","/toFjxz","/toCzsmxz","/download/**","/toObjectKJ","/catchimg","/iframe1","/iframe2","/xj","/report","/SavePersonInfo4Nmtc","/singleLoginAct",
"/getYhkDetail","/getSwDetail","/getRyzjzpimages","/getRyzpimages","/getPmimages","/getGdimages"
......
......@@ -36,6 +36,8 @@ import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
/**
* 虹膜采集Controller
......@@ -172,7 +174,12 @@ public class HmCjController {
model.addObject("rybh",request.getParameter("rybh"));
model.addObject("xm",request.getParameter("xm"));
model.addObject("gmsfhm",request.getParameter("gmsfhm"));
String sbcs = request.getParameter("sbcs");
if("5".equals(sbcs)){
model.setViewName("hmcj/shjh");
}else{
model.setViewName("hmcj/index");
}
return model;
}
......@@ -676,4 +683,23 @@ public class HmCjController {
return null;
}
}
@ResponseBody
@RequestMapping("/getRyhmimages")
public Map<String,Object> getRyhmzpimages(String rybh,String zjhm)
{
List<TbStHm> hmxxs = hmCjService.getHmxxInfoList(rybh);
Map<String,Object> rstmap = new HashMap<String,Object>();
if(hmxxs!=null){
for(int i=0;i<hmxxs.size();i++){
TbStHm tbStHm = hmxxs.get(i);
if(tbStHm!=null&&"0".equals(tbStHm.getHmywdm())){
rstmap.put("21",new BASE64Encoder().encode(tbStHm.getHmsj()).replace("\r\n", ""));
}else if(tbStHm!=null&&"1".equals(tbStHm.getHmywdm())){
rstmap.put("22",new BASE64Encoder().encode(tbStHm.getHmsj()).replace("\r\n", ""));
}
}
}
return rstmap;
}
}
\ No newline at end of file
......@@ -161,6 +161,7 @@ public class KhtjController {
int swcjs=0;int swxzcjs=0;int swwcjs=0;
int zjcjs=0;int zjxzcjs=0;int zjwcjs=0;
int hmcjs=0;int hmxzcjs=0;int hmwcjs=0;
int sjcjs=0;int sjxzcjs=0;int sjwcjs=0;
int dnacjs=0;int dnaxzcjs=0;int dnawcjs=0;
for(RstBean aj:rstBeanlist){
aj.setMaxccsjStr(rstBean.getMaxccsjStr());
......@@ -184,6 +185,9 @@ public class KhtjController {
hmcjs=hmcjs+Integer.parseInt(aj.getHmcjs());
hmxzcjs=hmxzcjs+Integer.parseInt(aj.getHmxzcjs());
hmwcjs=hmwcjs+Integer.parseInt(aj.getHmwcjs());
sjcjs=sjcjs+Integer.parseInt(aj.getSjcjs());
sjxzcjs=sjxzcjs+Integer.parseInt(aj.getSjxzcjs());
sjwcjs=sjwcjs+Integer.parseInt(aj.getSjwcjs());
dnacjs=dnacjs+Integer.parseInt(aj.getDnacjs());
dnaxzcjs=dnaxzcjs+Integer.parseInt(aj.getDnaxzcjs());
dnawcjs=dnawcjs+Integer.parseInt(aj.getDnawcjs());
......@@ -216,12 +220,12 @@ public class KhtjController {
rstBean.setDnaxzcjtotal(dnaxzcjs+"");
rstBean.setDnawcjtotal(dnawcjs+"");
*/
rstBean.setZwcjl(jscjl(ycs+"",zwcjs+""));
rstBean.setRxcjl(jscjl(ycs+"",rxcjs+""));
rstBean.setSwcjl(jscjl(ycs+"",swcjs+""));
rstBean.setZjcjl(jscjl(ycs+"",zjcjs+""));
rstBean.setHmcjl(jscjl(ycs+"",hmcjs+""));
rstBean.setDnacjl(jscjl(ycs+"",dnacjs+""));
rstBean.setZwcjl(jscjl(zycs+"",zwcjs+""));
rstBean.setRxcjl(jscjl(zycs+"",rxcjs+""));
rstBean.setSwcjl(jscjl(zycs+"",swcjs+""));
rstBean.setZjcjl(jscjl(zycs+"",zjcjs+""));
rstBean.setHmcjl(jscjl(zycs+"",hmcjs+""));
rstBean.setDnacjl(jscjl(zycs+"",dnacjs+""));
rstBean.setZycs(zycs+"");
rstBean.setYcs(ycs+"");
rstBean.setZwcjs(zwcjs+"");
......
......@@ -48,6 +48,9 @@ public class AutoTbRyZp implements Serializable {
private String zjlxdm;
private String xdhwdm;
private String xydm;
private String xzpp;
private String xzcm;
private String sfcj;
private String tmtzms;
public static long getSerialVersionUID() {
......@@ -246,6 +249,30 @@ public class AutoTbRyZp implements Serializable {
this.tmtzms = tmtzms;
}
public String getXzpp() {
return xzpp;
}
public void setXzpp(String xzpp) {
this.xzpp = xzpp;
}
public String getXzcm() {
return xzcm;
}
public void setXzcm(String xzcm) {
this.xzcm = xzcm;
}
public String getSfcj() {
return sfcj;
}
public void setSfcj(String sfcj) {
this.sfcj = sfcj;
}
@Override
public String toString() {
return "AutoTbRyZp{" +
......
......@@ -46,6 +46,10 @@ public class TbXwYthcjZj implements Serializable {
public String cz_y;
public String xd_y;
public String cjtpxh;
public String iftscg;
public String getXxzjbh() {
return xxzjbh;
}
......@@ -325,4 +329,20 @@ public class TbXwYthcjZj implements Serializable {
public void setSfcj(String sfcj) {
this.sfcj = sfcj;
}
public String getCjtpxh() {
return cjtpxh;
}
public void setCjtpxh(String cjtpxh) {
this.cjtpxh = cjtpxh;
}
public String getIftscg() {
return iftscg;
}
public void setIftscg(String iftscg) {
this.iftscg = iftscg;
}
}
......@@ -94,12 +94,15 @@ public class SysUitl {
} catch (IOException e) {
e.printStackTrace();
}
boolean flag = true;
if(p==null){
flag = false;
}
while(flag) {
InputStreamReader ir = new InputStreamReader(p.getInputStream(), "GBK");
LineNumberReader input = new LineNumberReader(ir);
p.waitFor();
boolean flag = true;
String ipStr = "(" + ip + ")";
while(flag) {
String str = input.readLine();
if (str != null) {
if (str.indexOf(ipStr) > 1) {
......@@ -120,19 +123,23 @@ public class SysUitl {
//根据 nbtstat -A 通过客户端IP获取MAC
public static String getkhdMac(String ip){
String mac = "";
boolean flag = true;
try {
Process p = null;
try {
String comstr = "nbtstat -A " + ip ;
//String comstr = "nbtstat -A " + ip ;//WINDOW系统使用
String comstr = "nmblookup -A " + ip ;//LINUX系统使用
p = Runtime.getRuntime().exec(comstr);
} catch (IOException e) {
flag = false;
e.printStackTrace();
}
if(p==null){
flag = false;
}
while(flag) {
InputStreamReader ir = new InputStreamReader(p.getInputStream(), "GBK");
LineNumberReader input = new LineNumberReader(ir);
p.waitFor();
boolean flag = true;
while(flag) {
String str = input.readLine();
// MAC 地址 = 48-8A-D2-42-5C-D8
if (str!=null && str.indexOf("MAC") > 1) {
......@@ -144,6 +151,7 @@ public class SysUitl {
}else if(str==null){
break;
}
p.waitFor();
}
} catch (Exception e) {
e.printStackTrace(System.out);
......
......@@ -38,6 +38,8 @@
R_WZXX,
R_PMZW,
R_RX,
R_ZW,
R_ZJ,
T.ZWFKXX,
BZ
from AFIS_QUALITY_CK A,TB_RY_RYCJ T where A.R_RYBH=T.RYBH and 1=1
......@@ -51,6 +53,8 @@
R_WZXX,
R_PMZW,
R_RX,
R_ZW,
R_ZJ,
T.ZWFKXX,
BZ
from AFIS_QUALITY_CC A,TB_RY_RYCJ T where T.RYBH=A.R_RYBH(+) and 1=1
......@@ -63,6 +67,8 @@
<if test="entity.RGdzw != null and entity.RGdzw != ''"> R_GDZW = #{entity.RGdzw , jdbcType=VARCHAR }, </if>
<if test="entity.RPmzw != null and entity.RPmzw != ''"> R_PMZW = #{entity.RPmzw , jdbcType=VARCHAR }, </if>
<if test="entity.RRx != null and entity.RRx != ''"> R_RX = #{entity.RRx , jdbcType=VARCHAR }, </if>
<if test="entity.RZw != null and entity.RZw != ''"> R_ZW = #{entity.RZw , jdbcType=VARCHAR }, </if>
<if test="entity.RZj != null and entity.RZj != ''"> R_ZJ = #{entity.RZj , jdbcType=VARCHAR }, </if>
<if test="entity.jcr != null and entity.jcr != ''"> JCR = #{entity.jcr , jdbcType=VARCHAR }, </if>
<if test="entity.jcdw != null and entity.jcdw != ''"> JCDW = #{entity.jcdw , jdbcType=VARCHAR }, </if>
<if test="entity.RCjr != null and entity.RCjr != ''"> R_CJR = #{entity.RCjr , jdbcType=VARCHAR }, </if>
......@@ -98,6 +104,8 @@
<if test="entity.RGdzw != null and entity.RGdzw != ''"> R_GDZW = #{entity.RGdzw , jdbcType=VARCHAR }, </if>
<if test="entity.RPmzw != null and entity.RPmzw != ''"> R_PMZW = #{entity.RPmzw , jdbcType=VARCHAR }, </if>
<if test="entity.RRx != null and entity.RRx != ''"> R_RX = #{entity.RRx , jdbcType=VARCHAR }, </if>
<if test="entity.RZw != null and entity.RZw != ''"> R_ZW = #{entity.RZw , jdbcType=VARCHAR }, </if>
<if test="entity.RZj != null and entity.RZj != ''"> R_ZJ = #{entity.RZj , jdbcType=VARCHAR }, </if>
<if test="entity.ccr != null and entity.ccr != ''"> CCR = #{entity.ccr , jdbcType=VARCHAR }, </if>
<if test="entity.ccdw != null and entity.ccdw != ''"> CCDW = #{entity.ccdw , jdbcType=VARCHAR }, </if>
<if test="entity.RCjr != null and entity.RCjr != ''"> R_CJR = #{entity.RCjr , jdbcType=VARCHAR }, </if>
......@@ -116,7 +124,7 @@
</update>
<insert id="insertAfisQualityCc" parameterType="map">
insert into AFIS_QUALITY_CC (R_RYBH,CCBH,R_XM,R_CSRQ,R_ZWBH,R_WZXX,R_GDZW,R_PMZW,R_RX,CCR,CCDW,R_CJR,R_CJDW,R_CJSJ,R_CJCS,CCSJ,QDZLJCJS,jcjg,BZ)
insert into AFIS_QUALITY_CC (R_RYBH,CCBH,R_XM,R_CSRQ,R_ZWBH,R_WZXX,R_GDZW,R_PMZW,R_RX,R_ZW,R_ZJ,CCR,CCDW,R_CJR,R_CJDW,R_CJSJ,R_CJCS,CCSJ,QDZLJCJS,jcjg,BZ)
values (
<if test="entity.RRybh != null and entity.RRybh != ''"> #{entity.RRybh , jdbcType=VARCHAR }, </if>
<if test="entity.RRybh == null or entity.RRybh == ''">NULL,</if>
......@@ -136,6 +144,10 @@
<if test="entity.RPmzw == null or entity.RPmzw == ''">NULL,</if>
<if test="entity.RRx != null and entity.RRx != ''"> #{entity.RRx , jdbcType=VARCHAR }, </if>
<if test="entity.RRx == null or entity.RRx == ''">NULL,</if>
<if test="entity.RZw != null and entity.RZw != ''"> #{entity.RZw , jdbcType=VARCHAR }, </if>
<if test="entity.RZw == null or entity.RZw == ''">NULL,</if>
<if test="entity.RZj != null and entity.RZj != ''"> #{entity.RZj , jdbcType=VARCHAR }, </if>
<if test="entity.RZj == null or entity.RZj == ''">NULL,</if>
<if test="entity.ccr != null and entity.ccr != ''"> #{entity.ccr , jdbcType=VARCHAR }, </if>
<if test="entity.ccr == null or entity.ccr == ''">NULL,</if>
<if test="entity.ccdw != null and entity.ccdw != ''"> #{entity.ccdw , jdbcType=VARCHAR }, </if>
......@@ -196,6 +208,7 @@
A.R_PMZW as RPmzw,
A.R_GDZW as RGdzw,
A.R_ZW as RZw,
A.R_ZJ as RZj,
A.BZ as bz,
A.R_CJCS as RCjcs,
A.R_CJSJ as RCjsj,
......@@ -246,6 +259,7 @@
cc.R_PMZW as RPmzw,
cc.R_GDZW as RGdzw,
cc.R_ZW as RZw,
cc.R_ZJ as RZj,
cc.BZ as bz,
A.R_CJCS as RCjcs,
A.R_CJSJ as RCjsj,
......@@ -293,6 +307,7 @@
cc.R_GDZW as RGdzw,
cc.R_ZW as RZw,
cc.R_ZJ as RZj,
cc.BZ as bz,
A.R_CJCS as RCjcs,
A.R_CJSJ as RCjsj,
......@@ -340,6 +355,7 @@
cc.R_GDZW as RGdzw,
cc.R_ZW as RZw,
cc.R_ZJ as RZj,
cc.BZ as bz,
A.R_CJCS as RCjcs,
A.R_CJSJ as RCjsj,
......
......@@ -270,7 +270,7 @@
<!-- 按单位分组统计人员采集数(指纹采集数) -->
<select id="getRycjtjListzwcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zwcjs from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and szzwbh is not null
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zwcjs from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) and szzwbh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
......@@ -298,7 +298,7 @@
<!-- 按单位分组统计人员采集数(人像采集数) -->
<select id="getRycjtjListrxcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) rxcjs from TB_RY_RYCJ
where (SCBZ='0' or SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and ZMZPXXBH is not null
where (SCBZ='0' or SCBZ is null) and ZMZPXXBH is not null
and CMZPXXBH is not null
and YCMZPXXBH is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
......@@ -331,7 +331,7 @@
<!-- 按单位分组统计人员采集数(足迹采集数) -->
<select id="getRycjtjListzjcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zjcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_zj group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and s.swrybh is not null
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zjcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_zj group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and s.swrybh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
......@@ -358,7 +358,7 @@
<!-- 按单位分组统计人员采集数(虹膜采集数) -->
<select id="getRycjtjListhmcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) hmcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_hm group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and s.swrybh is not null
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) hmcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_hm group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and s.swrybh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
......@@ -385,7 +385,7 @@
<!-- 按单位分组统计人员采集数(声纹采集数) -->
<select id="getRycjtjListswcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) swcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_sw group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and s.swrybh is not null
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) swcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_sw group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and s.swrybh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
......@@ -412,7 +412,7 @@
<!-- 按单位分组统计手机采集(手机应采数) -->
<select id="getRycjtjListsjycs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12)||'000000000000',1,12) code,count(*) sjycs from TB_RY_RYCJ where (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and (sjbs<![CDATA[<>]]>'0' or sjbs is null)
select substr(substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12)||'000000000000',1,12) code,count(*) sjycs from TB_RY_RYCJ where (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null)
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
......@@ -423,7 +423,7 @@
<select id="getRycjtjListsjcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(p.lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) sjcjs from TB_RY_RYCJ p,(select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_LXRXX sjcj where sjcj.SCBZ = '0' group by sjcj.xyrbh) rt,
(select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_FZXYRSJGL sjcj where sjcj.SCBZ = '0' group by sjcj.xyrbh) sj
where p.rybh = rt.rybh(+) and p.rybh = sj.rybh(+) and (rt.rybh is not null and sj.rybh is not null) and (p.SCBZ='0' or p.SCBZ is null) and (p.ifhb is null or p.ifhb<![CDATA[<>]]>'1') and (p.tbbz = '1' or p.tbbz = '2') and (p.sjbs<![CDATA[<>]]>'0' or p.sjbs is null)
where p.rybh = rt.rybh(+) and p.rybh = sj.rybh(+) and (rt.rybh is not null or sj.rybh is not null) and (p.SCBZ='0' or p.SCBZ is null)
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
......@@ -441,7 +441,7 @@
and p.rybh=lxrxx.xyrbh(+)
and p.rybh=dxjl.xyrbh(+)
and p.rybh=thjl.xyrbh(+)
and (p.SCBZ='0' or p.SCBZ is null) and (p.ifhb is null or p.ifhb<![CDATA[<>]]>'1') and (p.tbbz = '1' or p.tbbz = '2') and (p.sjbs<![CDATA[<>]]>'0' or p.sjbs is null)
and (p.SCBZ='0' or p.SCBZ is null)
and sj.xyrbh is not null
and lxrxx.xyrbh is not null and dxjl.xyrbh is not null and thjl.xyrbh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
......@@ -474,7 +474,7 @@
<!-- 按单位分组统计人员采集数(DNA采集数) -->
<select id="getRycjtjListdnacjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) dnacjs from TB_RY_RYCJ where (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and dnabh is not null
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) dnacjs from TB_RY_RYCJ where (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) and dnabh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
......
......@@ -236,10 +236,13 @@
b.XM xm,
b.GMSFHM gmsfhm,
b.ZJSJ dzwjnr,
b.ZJLX zplxdm,
b.ZJLX zjlxdm,
b.ZJBW zpbw,
b.XDHWDM xdhwdm,
b.XYDM xydm,
b.XZPP xzpp,
b.XZCM xzcm,
b.SFCJ sfcj,
a.ryzpzs
from (select RYBH,count(rybh) as ryzpzs from TB_XW_YTHCJ_ZJ where RYBH = #{rybh} and (XXSC_PDBZ ='0' OR XXSC_PDBZ IS NULL) and dbms_lob.getlength(ZJSJ)>0 group by rybh) a,TB_XW_YTHCJ_ZJ b
where a.rybh = b.rybh
......@@ -272,6 +275,9 @@
ZJBW,
XDHWDM,
XYDM,
XZPP,
XZCM,
SFCJ,
XXDJRY_XM,
DJSJ,
XXDJDW_GAJGJGDM,
......@@ -295,6 +301,12 @@
<if test="entity.xdhwdm == null or entity.xdhwdm == ''">,NULL </if>
<if test="entity.xydm != null and entity.xydm != ''">, #{entity.xydm , jdbcType=VARCHAR }</if>
<if test="entity.xydm == null or entity.xydm == ''">,NULL </if>
<if test="entity.xzpp != null and entity.xzpp != ''">, #{entity.xzpp , jdbcType=VARCHAR }</if>
<if test="entity.xzpp == null or entity.xzpp == ''">,NULL </if>
<if test="entity.xzcm != null and entity.xzcm != ''">, #{entity.xzcm , jdbcType=VARCHAR }</if>
<if test="entity.xzcm == null or entity.xzcm == ''">,NULL </if>
<if test="entity.sfcj != null and entity.sfcj != ''">, #{entity.sfcj , jdbcType=VARCHAR }</if>
<if test="entity.sfcj == null or entity.sfcj == ''">,NULL </if>
<if test="entity.lrr != null and entity.lrr != ''">, #{entity.lrr , jdbcType=VARCHAR }</if>
<if test="entity.lrr == null or entity.lrr == ''">,NULL </if>
<if test="entity.lrsj != null">, #{entity.lrsj , jdbcType=TIMESTAMP }</if>
......@@ -355,6 +367,12 @@
<if test="entity.xdhwdm == null or entity.xdhwdm == ''">XDHWDM = NULL, </if>
<if test="entity.xydm != null and entity.xydm != ''">XYDM = #{entity.xydm , jdbcType=VARCHAR },</if>
<if test="entity.xydm == null or entity.xydm == ''">XYDM = NULL, </if>
<if test="entity.xzpp != null and entity.xzpp != ''">XZPP = #{entity.xzpp , jdbcType=VARCHAR },</if>
<if test="entity.xzpp == null or entity.xzpp == ''">XZPP = NULL, </if>
<if test="entity.xzcm != null and entity.xzcm != ''">XZCM = #{entity.xzcm , jdbcType=VARCHAR },</if>
<if test="entity.xzcm == null or entity.xzcm == ''">XZCM = NULL, </if>
<if test="entity.sfcj != null and entity.sfcj != ''">SFCJ = #{entity.sfcj , jdbcType=VARCHAR },</if>
<if test="entity.sfcj == null or entity.sfcj == ''">SFCJ = NULL, </if>
<if test="entity.dzwjnr != null and entity.dzwjnr != ''">ZJSJ= #{entity.dzwjnr , jdbcType=VARCHAR },</if>
<if test="entity.dzwjnr == null or entity.dzwjnr == ''">ZJSJ=NULL, </if>
<if test="entity.gxsj != null">gxsj=#{entity.gxsj , jdbcType=TIMESTAMP },</if>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
[data-role=page] {
min-height: 100% !important;
height:auto !important;
}
[data-role=footer] {
position: absolute !important;
left: 0 !important;
bottom: 0 !important;
width:100%;
}
.ui-page {
background-color: rgb(49, 114, 175) !important;
}
.ui-page .ui-header {
background-color: #133d74 !important;
background: linear-gradient(#133d74, #133d74) !important;
}
.ui-page .ui-header .ui-btn-right {
background-color: #3d4e99 !important;
}
.ui-page .ui-header .ui-btn-active {
background-color: #505050 !important;
}
.ui-page .ui-content {
padding: 20px !important;
margin-bottom: 30px !important;
width: 100% !important;
overflow: hidden !important;
background-color: rgb(49, 114, 175) !important;
}
#cameracontainer {
float: left;
width: 660px;
left: 50%;
transform: translate(-70%, 0%); /*定义 2D 转换8 */
}
#eyecontainer {
float: left;
width: 320px;
transform: translate(160%, 0%); /*定义 2D 转换8 */
}
#statuscontainer {
float: left;
width: 300px;
}
#main_layout {
float: center;
width: 300px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%); /*定义 2D 转换8 */
color: rgb(45, 109, 146);
text-align: center;
}
#cameraproperties {
margin-left: 1280px;
width: 300px;
background-color: #D0E8D0;
padding: 10px;
border: 2px solid rgb(45, 4, 139);
border-radius: 10px;
}
#camera {
border: 10px #006010 solid;
}
var Camera = (function ()
{
var jpegUrl = 'http://127.0.0.1:8001/camera/jpeg';
var mjpegUrl = 'http://127.0.0.1:8001/camera/mjpeg';
var mjpegMode;
var frameInterval;
var imageElement;
var timeStart;
function refreshImage( )
{
if ( mjpegMode )
{
imageElement.src = mjpegUrl;
}
else
{
timeStart = new Date( ).getTime( );
imageElement.src = jpegUrl + '?t=' + timeStart;
}
}
function onImageError( )
{
// MJPEG/JPEG modes - browsers like IE don't have MJPEG
mjpegMode = !mjpegMode;
// also give it a small pause on error
setTimeout( refreshImage, 1000 );
}
function onImageLoaded( )
{
if ( !mjpegMode )
{
var timeTaken = new Date( ).getTime( ) - timeStart;
setTimeout( refreshImage, ( timeTaken > frameInterval ) ? 0 : frameInterval - timeTaken );
}
}
var start = function( fps )
{
imageElement = document.getElementById( 'camera' );
imageElement.onload = onImageLoaded;
imageElement.onerror = onImageError;
if ( ( typeof fps == 'number' ) && ( fps != 0 ) )
{
frameInterval = 1000 / fps;
}
else
{
frameInterval = 100;
}
mjpegMode = true;
refreshImage( );
};
return {
Start: start
}
} )( );
function setCameraProperty( strVar, strValue )
{
var variablesMap = { };
variablesMap[strVar] = strValue;
setCameraProperties( variablesMap );
}
function setCameraProperties( variablesMap )
{
$.ajax( {
type : "POST",
url : "/camera/config",
data : JSON.stringify( variablesMap ),
contentType : "application/json; charset=utf-8",
dataType : "json",
async : true,
success: function( data )
{
if ( data.status != "OK" )
{
console.log( "Failed setting camera property: " + data.status );
if ( data.property )
{
console.log( "Property: " + data.property );
}
}
},
failure: function( errMsg )
{
console.log( errMsg );
}
} );
}
function handleBoolProperty( cb )
{
setCameraProperty( cb.id, ( cb.checked ) ? 1 : 0 );
}
function handleRangeProperty( range )
{
setCameraProperty( range.id, range.value );
}
function handleSelectionProperty( selection )
{
setCameraProperty( selection.id, selection.value );
}
function queryCaptureRlt( )
{
var variablesMap = {};
variablesMap["type"] = "capResult";
$.ajax({
type: "POST",
url: "http://127.0.0.1:8001/iris/control",
data: JSON.stringify(variablesMap),
contentType: "application/json; charset=utf-8",
dataType: "jsonp",
async: true,
jsonp: "callback",
jsonpCallback: 'successCallback',
success: function (data) {
if (data.status != "OK") {
console.log("Failed switching camera streaming");
}
},
failure: function (errMsg) {
console.log(errMsg);
}
});
}
function successCallback(data) {
if(data.status == "OK")
{
if(data.command == "cap_start")
{
console.log("recv start capture response!");
//接收到采集结果正常
setTimeout( queryCaptureRlt, 300 );
}
if(data.command == "capResult")
{
console.log("recv capture result response");
if(data.result == 0) {
// debugger;
console.log("采集成功");
//读取数据
var nCapNum = data.capNum;
var datas = data["data"];
var ele = document.getElementById("runInfo");
ele.value = ele.value + "采集成功";
// console.log(datas);
for(var i = 0;i < datas.length; i++){
var eyeType = datas[i].eyeType;
var eyeQuailty = datas[i].eyeQuailty;
var eyeImage = datas[i].eyeImage;
var imageW = datas[i].imageW;
var imageH = datas[i].imageH;
var eyeRadius = datas[i].eyeRadius;
if(eyeType == 0){
$('#leftEye').attr("src","data:image/bmp;base64," + eyeImage);
}
if(eyeType == 1){
$('#rightEye').attr("src","data:image/bmp;base64," + eyeImage);
}
}
}
}
}
else{
if(data.command == "capResult")//ERROR情况下,获取采集结果可能有两种情况,采集未完成或者采集失败
{
console.log("Recv capture result response");
if(data.result == 1) {
console.log("采集未就绪");
//继续获取结果
setTimeout( queryCaptureRlt, 300 );
// var text = document.getElementById('#runInfo').text();
// text + data.errorDesc;
var ele = document.getElementById("runInfo");
ele.value = ele.value + data.errorDesc + ">>";
}
else{
console.log("采集失败");
//处理失败情况,停止查询结果
alert("采集失败 :" + data.errorDesc);
}
}
//获取描述信息
console.log("server run error :" + data.errorDesc);
}
}
function openHmcj() {
$('#leftEye').attr("src","");
$('#rightEye').attr("src","");
var variablesMap = {};
variablesMap["type"] = "cap";
variablesMap["op"] = 1;
variablesMap["capNum"]=1;
variablesMap["nMode"] = 2;
$.ajax({
type: "POST",
url: "http://127.0.0.1:8001/iris/control",
data: JSON.stringify(variablesMap),
contentType: "application/json; charset=utf-8",
dataType: "jsonp",
async: true,
jsonp: "callback",
jsonpCallback: 'successCallback',
success: function (data) {
if (data.status != "OK") {
console.log("Failed switching camera streaming");
}
},
failure: function (errMsg) {
console.log(errMsg);
}
});
}
......@@ -807,8 +807,12 @@ function baocun(){
$("#hmqsqkRight").val($("#rightSelect option:selected").val());
$("#hmqsqkLeft").val($("#leftSelect option:selected").val());
$("#sbxh").val($("#device_type option:selected").val());
if($("#hmsjRight").val() == '' && $("#hmsjLeft").val() == null){
layer.alert('采集数据不能为空!');
if(($("#hmsjLeft").val() == '' || $("#hmsjLeft").val() == null) && ("#hmqsqkLeft").val()=='0'){
layer.alert('请选择左眼缺失情况!');
return;
}
if(($("#hmsjRight").val() == '' || $("#hmsjRight").val() == null)&& ("#hmqsqkRight").val()=='0'){
layer.alert('请选择右眼缺失情况!');
return;
}
layer.msg('保存中...');
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -127,6 +127,7 @@ function scanPersonInfotoAfis(barcode,status,s1,s2,s3,flag)
$.messager.alert( '提示',"无相关人员信息!人员信息没有保存至系统!");
return -9;
}
SetPersonDataStatus(zhiwenid,status);
var ifzmzp = false;
var ifcmzp = false;
var ifycmzp = false;
......
......@@ -294,6 +294,37 @@ function SetLoginInfo(AfisUserName,AfisPassword,AfisSvrName){
return rs;
}
//向指纹采集控件传质量检查结果
function SetPersonDataStatus(sFingerID,sStatus){
debugger;
var rs;
var path = "http://127.0.0.1:9980";
var param = "{\"autoSvrID\":\"HLPrtScan.Document\",\"methodName\":\"SetPersonDataStatus\",\"sFingerID\":\""
+sFingerID+"\",\"sStatus\":\""+sStatus+"\"}";
$.ajax({
type: "post",
url: path,
async: false,
data: param,
contentType: "application/x-www-form-urlencoded",
dataType: "json",
success: function(data) {
var rstemp = eval(data);
var status = rstemp.apiStatus;
if(status == "success"){
rs = status;
}else{
alert("向指纹采集控件传质量检查结果失败,错误状态:"+status);
rs = "";
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
//alert("设置用户名,密码,指纹服务器IP失败,错误状态=="+XMLHttpRequest.status);
}
});
return rs;
}
//设置采集方式
function SetScanMode(AfisScanMode){
var rs;
......
function sjcj(){
var rybh = $("#rybh").val();
var xm = $("#xm").val();
var zjhm = $("#gmsfhm").val();
var lxdm = $("#lxdm").val();
if (lxdm == null || lxdm == "") {
lxdm = "0";
}
StartupSJCJ();
//yingyuansjcj(rybh,encodeURI(xm),zjhm,lxdm);
}
//=========手机采集===================================================
//开始手机采集
function StartupSJCJ() {
debugger;
var rybh = $("#rybh").val();
var xm = $("#xm").val();
var zjhm = $("#gmsfhm").val();
var lxdm = $("#lxdm").val();
var salb = $("#ajlbdm").val();
var jh = $("#username").val();
var jyszzzjgdm = $("#unitcode").val();
var bmch = $("#bmch").val();
var zz = $("#xzzXzqhdm").val();
var gzdw = $("#fwcs").val();
var hjxx = $("#hjdzXzqhdm").val();
if (lxdm == null || lxdm == "") {
lxdm = "0";
}
// xml格式
var xmlinfo = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>" +
"<RYXX>" +
"<RYBH>"+rybh+"</RYBH>" +
"<SFZH>"+zjhm+"</SFZH>" +
"<SALB>"+salb+"</SALB>" +
"<SJHM>"+lxdm+"</SJHM>" +
"<JH>"+jh+"</JH>" +
"<JYSZZZJGDM>"+jyszzzjgdm+"</JYSZZZJGDM>" +
"<BMCH>"+bmch+"</BMCH>" +
"<ZZ>"+zz+"</ZZ>" +
"<GZDW>"+gzdw+"</GZDW>" +
"<HJZZ>"+hjxx+"</HJZZ>" +
"</RYXX>";
// 把xml的特殊字符,进行转义,放到json里面,不报错
// 替换全部'双引号'为'斜杆+双引号'
xmlinfo = xmlinfo.replace(/\"/g, "\\\"");
//alert(xmlinfo);
var rs = newActiveXObject("XT_PHONECOLLECT.Document");
var path = "http://127.0.0.1:9980";
var param = "{\"autoSvrID\":\"XT_PHONECOLLECT.Document\",\"methodName\":\"StartupSJCJ\",\"xmlinfo\":\""+xmlinfo+"\"}";
$.ajax({
type: "post",
url: path,
async: false,
data: param,
contentType: "application/x-www-form-urlencoded",
dataType: "json",
success: function(data) {
debugger;
var rstemp = eval(data);
var status = rstemp.apiStatus;
if(status == "success"){
rs = status;
}else{
yingyuansjcj(rybh,encodeURI(xm),zjhm,lxdm);
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
//alert("开始手机采集失败,错误状态=="+XMLHttpRequest.status);
yingyuansjcj(rybh,encodeURI(xm),zjhm,lxdm);
}
});
return rs;
}
function yingyuansjcj(rybh,xm,zjhm,lxdm) {
//alert(Math.round(new Date()/1000));
debugger;
try{
$.ajax({
url:"http://127.0.0.1:1500/Service/?param="+rybh+","+xm+","+zjhm+","+lxdm,//此处换成你的服务端地址
type:"post",
dataType:"json",//jsonp 实现跨域
contentType:"application/x-www-form-urlencoded;charset=gbk",
jsonpCallback:"fun",//服务器返回执行的方法名
xhrFields:{
withCredentials:true
},
crossdomain:true,
success:function (data) {
alert("手机采集设备连接成功,请到采集设备上进行后续操作1!");
},
error:function (err) {
alert("请安装手机采集设备相应的采集控件后再进行手机信息采集!");
}
});
}catch (e){
alert("手机采集设备连接成功,请到采集设备上进行后续操作2!");
}
}
function getNowFormatDate() {
var date = new Date();
var seperator1 = "-";
var seperator2 = ":";
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+ " " + date.getHours() + seperator2 + date.getMinutes()
+ seperator2 + date.getSeconds();
return currentdate;
}
function xdhSjcj() {
debugger;
var rybh = $("#rybh").val();
var xm = $("#xm").val();
var zjhm = $("#gmsfhm").val();
var lxdm = $("#lxdm").val();
var salb = $("#ajlbdm").val();
var jh = $("#username").val();
var jyszzzjgdm = $("#unitcode").val();
var bmch = $("#bmch").val();
var zz = $("#xzzXzqhdm").val();
var gzdw = $("#fwcs").val();
var hjxx = $("#hjdzXzqhdm").val();
if (lxdm == null || lxdm == "") {
lxdm = "0";
}
// xml格式
var xmlinfo = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>" +
"<RYXX>" +
"<RYBH>"+rybh+"</RYBH>" +
"<SFZH>"+zjhm+"</SFZH>" +
"<SALB>"+salb+"</SALB>" +
"<SJHM>"+lxdm+"</SJHM>" +
"<JH>"+jh+"</JH>" +
"<JYSZZZJGDM>"+jyszzzjgdm+"</JYSZZZJGDM>" +
"<BMCH>"+bmch+"</BMCH>" +
"<ZZ>"+zz+"</ZZ>" +
"<GZDW>"+gzdw+"</GZDW>" +
"<HJZZ>"+hjxx+"</HJZZ>" +
"</RYXX>";
// 把xml的特殊字符,进行转义,放到json里面,不报错
// 替换全部'双引号'为'斜杆+双引号'
xmlinfo = xmlinfo.replace(/\"/g, "\\\"");
//alert(xmlinfo);
var rs = newActiveXObject("XT_PHONECOLLECT.Document");
var path = "http://127.0.0.1:9980";
var param = "{\"autoSvrID\":\"XT_PHONECOLLECT.Document\",\"methodName\":\"StartupSJCJ\",\"xmlinfo\":\""+xmlinfo+"\"}";
$.ajax({
type: "post",
url: path,
async: false,
data: param,
contentType: "application/x-www-form-urlencoded",
dataType: "json",
success: function(data) {
debugger;
var rstemp = eval(data);
var status = rstemp.apiStatus;
if(status == "success"){
rs = status;
}else{
alert("请安装手机采集设备相应的采集控件后再进行手机信息采集!");
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
//alert("开始手机采集失败,错误状态=="+XMLHttpRequest.status);
alert("请安装手机采集设备相应的采集控件后再进行手机信息采集!");
}
});
return rs;
}
function jnsjcj() {
//alert(Math.round(new Date()/1000));
debugger;
try{
$.ajax({
url:"http://127.0.0.1:1500/Service/?param="+rybh+","+xm+","+zjhm+","+lxdm,//此处换成你的服务端地址
type:"post",
dataType:"json",//jsonp 实现跨域
contentType:"application/x-www-form-urlencoded;charset=gbk",
jsonpCallback:"fun",//服务器返回执行的方法名
xhrFields:{
withCredentials:true
},
crossdomain:true,
success:function (data) {
alert("手机采集设备连接成功,请到采集设备上进行后续操作1!");
},
error:function (err) {
alert("请安装手机采集设备相应的采集控件后再进行手机信息采集!");
}
});
}catch (e){
alert("手机采集设备连接成功,请到采集设备上进行后续操作2!");
}
}
\ No newline at end of file
......@@ -118,16 +118,23 @@ function btnCheck(obj){
}
}
function updatejcjg(wzxx,gdzw,pmzw,rx){
function updatejcjg(wzxx,gdzw,pmzw,rx,zw,zj){
debugger;
var gdzws = null;
var pmzws = null;
var rxs = null;
var zws = null;
var zjs = null;
if(gdzw!=null)
gdzws = gdzw.split("-");
if(pmzw!=null)
pmzws = pmzw.split("-");
if(rx!=null)
rxs = rx.split("-");
if(zw!=null)
zws = zw.split("-");
if(zj!=null)
zjs = zj.split("-");
if(wzxx!=null&&wzxx!=""){
addClassChangeBhg("wz",wzxx);
}
......@@ -160,6 +167,14 @@ function updatejcjg(wzxx,gdzw,pmzw,rx){
addClassChangeBhg("pmzh",pmzws[8]);
addClassChangeBhg("pmzx",pmzws[9]);
}
if(zw!=null&&zw!=""&&zw.length>=3){
addClassChangeBhg("zszw",zws[0]);
addClassChangeBhg("yszw",zws[1]);
}
if(zj!=null&&zj!=""&&zj.length>=3){
addClassChangeBhg("zz",zjs[0]);
addClassChangeBhg("yz",zjs[1]);
}
}
function btnChange(obj,num,i){
......@@ -174,10 +189,11 @@ function btnChange(obj,num,i){
}else{
if(num=='wz'){
removeClassChange(num,3);
}else if(num=='zmzp'||num=='zcmzp'||num=='ycmzp'){
}else if(num=='zmzp'||num=='zcmzp'||num=='ycmzp'||num=='zz'||num=='yz'){
removeClassChange(num,4);
}else if(num=='gdzm'||num=='gdzs'||num=='gdzz'||num=='gdzh'||num=='gdzx'||num=='gdym'||num=='gdys'||num=='gdyz'||num=='gdyh'||num=='gdyx'||
num=='pmzm'||num=='pmzs'||num=='pmzz'||num=='pmzh'||num=='pmzx'||num=='pmym'||num=='pmys'||num=='pmyz'||num=='pmyh'||num=='pmyx'
num=='pmzm'||num=='pmzs'||num=='pmzz'||num=='pmzh'||num=='pmzx'||num=='pmym'||num=='pmys'||num=='pmyz'||num=='pmyh'||num=='pmyx'||
num=='zszw'||num=='yszw'
){
removeClassChange(num,5);
}
......@@ -301,7 +317,7 @@ function openDialogToZljc(rybh,username){
$("#bz").val(bzs);
$("#jcjg").val("1");
$.ajax({
url:"/saveJcjg?rybh="+$("#rybhStr").val()+"&zwbh="+$("#szzwbhStr").val()+"&RGdzw="+$("#RGdzw").val()+"&RPmzw="+$("#RPmzw").val()+"&RRx="+$("#RRx").val()+"&wzxx="+$("#wzxx").val()+"&bz="+$("#bz").val()+"&jcjg="+$("#jcjg").val(),
url:"/saveJcjg?rybh="+$("#rybhStr").val()+"&zwbh="+$("#szzwbhStr").val()+"&RGdzw="+$("#RGdzw").val()+"&RPmzw="+$("#RPmzw").val()+"&RRx="+$("#RRx").val()+"&wzxx="+$("#wzxx").val()+"&bz="+$("#bz").val()+"&jcjg="+$("#jcjg").val()+"&RZw="+$("#RZw").val()+"&RZj="+$("#RZj").val(),
type:"POST",
success:function(data){
if(data){
......@@ -347,6 +363,7 @@ function clearZwbz(obj){
function changeJcjg(name,num){
debugger;
if(name=="wz"){
$("#wzxx").val(num);
}else if(name=="zmzp"){
......@@ -421,6 +438,22 @@ function changeJcjg(name,num){
var pmzw= $("#RPmzw").val();
$("#RPmzw").val((pmzw.substring(0,18))+num);
}
else if(name=="zszw"){
var zw= $("#RZw").val();
$("#RZw").val(num+(zw.substring(1,zw.length)));
}else if(name=="yszw"){
var zw= $("#RZw").val();
$("#RZw").val((zw.substring(0,2))+num);
}
else if(name=="zz"){
var zj= $("#RZj").val();
$("#RZj").val(num+(zj.substring(1,zj.length)));
}else if(name=="yz"){
var zj= $("#RZj").val();
$("#RZj").val((zj.substring(0,2))+num);
}
}
var BARCODE;
......@@ -430,6 +463,8 @@ function saveZljc(jcjg){
var gdzw = $("#RGdzw").val();
var pmzw = $("#RPmzw").val();
var rx = $("#RRx").val();
var zw = $("#RZw").val();
var zj = $("#RZj").val();
if(wzxx==null||wzxx==""||wzxx=="0"){
$.messager.alert( '提示',"文字信息未检查完成!");
return;
......@@ -446,6 +481,14 @@ function saveZljc(jcjg){
$.messager.alert( '提示',"人像未检查完成!");
return;
}
if(zw.indexOf("0")!=-1){
$.messager.alert( '提示',"掌纹未检查完成!");
return;
}
if(zj.indexOf("0")!=-1){
$.messager.alert( '提示',"足迹未检查完成!");
return;
}
$("#jcjg").val(jcjg);
var clue = jcjg=="0"?"合格":"不合格";
if(jcjg=="0"){
......@@ -461,7 +504,7 @@ function saveZljc(jcjg){
$.messager.confirm('质量检查提示', '确认'+clue+'&结束质量检查吗?', function(r){
if(r) {
$.ajax({
url:"/saveJcjg?rybh="+$("#rybhStr").val()+"&zwbh="+$("#szzwbhStr").val()+"&RGdzw="+$("#RGdzw").val()+"&RPmzw="+$("#RPmzw").val()+"&RRx="+$("#RRx").val()+"&wzxx="+$("#wzxx").val()+"&bz="+$("#bz").val()+"&jcjg="+$("#jcjg").val(),
url:"/saveJcjg?rybh="+$("#rybhStr").val()+"&zwbh="+$("#szzwbhStr").val()+"&RGdzw="+$("#RGdzw").val()+"&RPmzw="+$("#RPmzw").val()+"&RRx="+$("#RRx").val()+"&wzxx="+$("#wzxx").val()+"&bz="+$("#bz").val()+"&jcjg="+$("#jcjg").val()+"&RZw="+$("#RZw").val()+"&RZj="+$("#RZj").val(),
type:"POST",
success:function(data){
if(data){
......
<div id="properties" style="display: none;">
<div id="properties_list">
</div>
<button type="button" id="reset" onclick="resetToDefaults()">Reset to Defaults</button>
</div>
<script>
var config = { };
var properties = [ ];
var configLoaded = false;
var propertiesLoaded = false;
// Reset all camera's properties to their default values
function resetToDefaults( )
{
if ( configLoaded && propertiesLoaded )
{
for ( var i = 0, len = properties.length; i < len; i++ )
{
if ( config[properties[i][0]] )
{
var jControl = $( "#" + properties[i][0] );
var control = jControl[0];
if ( properties[i][1].type == "int" )
{
control.value = properties[i][1].def;
control.onchange( );
jControl.slider( "refresh" );
}
else if ( properties[i][1].type == "bool" )
{
control.checked = ( properties[i][1].def == "1" );
control.onclick( );
jControl.checkboxradio( "refresh" );
}
else if ( properties[i][1].type == "select" )
{
control.value = properties[i][1].def;
control.onchange( );
jControl.change( );
}
}
}
$( "#properties_list" ).html( propertiesHtml ).trigger( 'create' );
$( "#properties" ).show( );
}
}
// Build HTML for camera's properties
function showSettings( )
{
if ( configLoaded && propertiesLoaded )
{
var propertiesHtml = "";
for ( var i = 0, len = properties.length; i < len; i++ )
{
if ( config[properties[i][0]] )
{
var propertyHtml = "<div id=\"div_" + properties[i][0] + "\">";
if ( properties[i][1].type == "int" )
{
propertyHtml += "<label for=\"" + properties[i][0] + "\">" + properties[i][1].name + ":</label>";
propertyHtml += "<input type=\"range\" id=\"" + properties[i][0] + "\" value=\"" + config[properties[i][0]] + "\" " ;
propertyHtml += "min=\"" + properties[i][1].min + "\" max=\"" + properties[i][1].max + "\"";
propertyHtml += "oninput=\"handleRangeProperty(this)\" onchange=\"handleRangeProperty(this)\" />";
}
else if ( properties[i][1].type == "bool" )
{
var check = ( config[properties[i][0]] != "0" ) ? "checked " : "";
propertyHtml += "<input id=\"" + properties[i][0] + "\" type=\"checkbox\" " + check + "data-min=\"true\" onclick=\"handleBoolProperty(this);\" />";
propertyHtml += "<label for=\"" + properties[i][0] +"\">" + properties[i][1].name + "</label>";
}
else if ( properties[i][1].type == "select" )
{
propertyHtml += "<label for=\"" + properties[i][0] + "\">" + properties[i][1].name + ":</label>";
propertyHtml += "<select id=\"" + properties[i][0] + "\" data-mini=\"true\" onchange=\"handleSelectionProperty(this)\">";
for ( var j = 0, choicesCount = properties[i][1].choices.length; j < choicesCount; j++ )
{
var selected = ( properties[i][1].choices[j][0] == config[properties[i][0]] ) ? " selected" : "";
propertyHtml += "<option value=\"" + properties[i][1].choices[j][0] + "\"" + selected + ">" + properties[i][1].choices[j][1] + "</option>";
}
propertyHtml += "</select>";
}
propertyHtml += "</div>";
propertiesHtml += propertyHtml;
}
}
$( "#properties_list" ).html( propertiesHtml ).trigger( 'create' );
$( "#properties" ).show( );
}
}
// Load current values of camera's properties
function loadCurrentSettings( )
{
$.ajax( {
type : "GET",
url : "/camera/config",
contentType : "application/json; charset=utf-8",
async : true,
success: function( data )
{
if ( data.status != "OK" )
{
console.log( "Failed getting camera properties" );
}
else
{
config = data.config;
configLoaded = true;
showSettings( );
}
},
failure: function( errMsg )
{
console.log( errMsg );
}
} );
}
// Load information about camera's properties, like name, type, min/max/default value
function loadPropertiesInfo( )
{
function compare( a, b )
{
if ( a[1].order < b[1].order )
return -1;
if ( a[1].order > b[1].order )
return 1;
return 0;
}
$.ajax( {
type : "GET",
url : "/camera/properties",
contentType : "application/json; charset=utf-8",
async : true,
success: function( data )
{
if ( data.status != "OK" )
{
console.log( "Failed getting camera properties" );
}
else
{
for ( var key in data.config )
{
properties.push( [ key, data.config[key] ] );
}
properties.sort( compare );
propertiesLoaded = true;
showSettings( );
}
},
failure: function( errMsg )
{
console.log( errMsg );
}
} );
}
function getSettings( )
{
configLoaded = false;
propertiesLoaded = false;
loadCurrentSettings( );
loadPropertiesInfo( );
}
getSettings( );
</script>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html xmlns:th="http://www.thymeleaf.org">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="renderer" content="webkit">
<meta name="author" content="方正国际软件有限公司(上海聚虹虹膜采集设备)">
<title>虹膜采集</title>
<script src="/static/hmcj/vendors/jquery/jquery-1.9.1.min.js"></script>
<script src="/static/hmcj/vendors/bootstrap/js/bootstrap.min.js"></script>
<link rel="shortcut icon" href="/static/hmcj/favicon.ico"/>
<link rel="stylesheet" type="text/css" href="/static/hmcj/vendors/bootstrap/css/bootstrap.min.css?v=2.3.2">
<link rel="stylesheet" type="text/css" href="/static/hmcj/css/demo.css">
<link rel="stylesheet" type="text/css" href="/static/hmcj/css/main.css">
<link rel="stylesheet" type="text/css" href="/static/hmcj/css/styles.css" />
<link rel="stylesheet" type="text/css" href="/static/hmcj/css/jquery.mobile.css" />
<script src="/static/hmcj/js/camera.js"></script>
<script src="/static/hmcj/js/cameraproperties.js"></script>
<script>
$(document).bind('mobileinit', function () {
$.mobile.activeBtnClass = 'unused';
});
</script>
<script src="/static/hmcj/js/jquery.mobile.js"></script>
<script src="/static/hmcj/js/command.js" type="text/javascript"></script>
<!--[if lte IE 8]>
<link rel="stylesheet" type="text/css" href="/static/hmcj/css/ie8compact.css">
<![endif]-->
<!--如需通过iframe调用,请仿照如下示例:
<iframe src="http://localhost:7880/index.html" name="myframe" id="irisIframe"></iframe>
DEMO界面请输入网址:http://localhost:7880/?mode=demo&type=GA
-->
</head>
<body>
<table class="full_view">
<tr>
<td class="demo_panel">
<table class="btn_table">
<tr>
<td colspan="3" style="text-align: center">
<a href="#" id="settingsButton" data-icon="gear" class="ui-btn-right">设置</a>
<button type="button" class="btn_style" id="kscj" onclick="openHmcj()">开始采集</button>
</td>
</tr>
<tr>
<td colspan="3" style="text-align: center">
<img id="leftEye" src="/static/hmcj/images/eyesuggest.png" style="width: 200px;height: 200px">
<div >
<h3 style="float: left;margin-left: 22px;">左眼</h3>
<div>
<select id="leftSelect" style="float: left;margin-top: 15px;margin-left: 9px;">
<option value="0">正常</option>
<option value="1">残缺</option>
<option value="2">系统设置不采集</option>
<option value="3">受伤未采集</option>
<option value="9">其他缺失情况</option>
</select>
</div>
</div>
</td>
</tr>
<tr>
<td colspan="3" style="text-align: center">
<img id="rightEye" src="/static/hmcj/images/eyesuggest.png" style="width: 200px;height: 200px">
<div >
<h3 style="float: left;margin-left: 22px;">右眼</h3>
<div>
<select id="rightSelect" style="float: left;margin-top: 15px;margin-left:9px;">
<option value="0">正常</option>
<option value="1">残缺</option>
<option value="2">系统设置不采集</option>
<option value="3">受伤未采集</option>
<option value="9">其他缺失情况</option>
</select>
</div>
</div>
</td>
</tr>
<tr>
<td colspan="3" style="text-align: center">
<button type="button" class="btn_style" id="baocun" onclick="baocun()">保存</button>
</td>
</tr>
</table>
</td>
<td class="display_panel">
<div class="display_area">
<div id="cameracontainer"
style="position: absolute; float: left;width: 700px;margin-top: 30px;margin-left: 100px; /*定义 2D 转换8 */">
<img id="camera" align="right">
</div>
</div>
</td>
</tr>
</table>
<form action="" id="hmForm" name="frminput" method="post" enctype="multipart/form-data">
<input type="hidden" id="rybh" name="rybh" th:value="${rybh}"/>
<input type="hidden" id="xm" name="xm" th:value="${xm}"/>
<input type="hidden" id="gmsfhm" name="gmsfhm" th:value="${gmsfhm}"/>
<input type="hidden" id="hmywdm" name="hmywdm" value="">
<input type="hidden" id="hmsjLeft" name="hmsjLeft" value="">
<input type="hidden" id="hmsjRight" name="hmsjRight" value="">
<input type="hidden" id="hmqsqkLeft" name="hmqsqkLeft" value="">
<input type="hidden" id="hmqsqkRight" name="hmqsqkRight" value="">
<input type="hidden" id="sbxh" name="sbxh" value="">
</form>
<script src="/static/js/layer/layer.js"></script>
<script src="/static/hmcj/js/camera.js"></script>
<script src="/static/hmcj/js/cameraproperties.js"></script>
<script>
$(document).bind('mobileinit', function () {
$.mobile.activeBtnClass = 'unused';
});
</script>
<script src="/static/hmcj/js/jquery.mobile.js"></script>
<script src="/static/hmcj/js/command.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="/static/js/layer/skin/layer.css">
<script>
$(function(){
// $('#runInfo').textareaAutoHeight({ minHeight:25, maxHeight:69 });
})
function getCameraInfo() {
$.ajax({
type: "GET",
url: "/camera/info",
contentType: "application/json; charset=utf-8",
async: true,
success: function (data) {
if (data.status == "OK") {
var title = "";
var config = data.config;
var cameraWidth = parseInt(config.width);
if ((config.title) && (config.title.length != 0)) {
title = config.title;
}
else {
title = config.device;
}
$('#camera').width(config.width);
$('#camera').height(config.height);
$('#title').html(title);
document.title = title;
}
},
failure: function (errMsg) {
console.log(errMsg);
}
});
}
function getVersionInfo() {
$.ajax({
type: "GET",
url: "/version",
contentType: "application/json; charset=utf-8",
async: true,
success: function (data) {
if ((data.status == "OK") && (data.config.version)) {
$('#version').html(" :: " + data.config.version);
}
}
});
}
var showingSettings = false;
// Load camera settings controls
function showSettings() {
if (!showingSettings) {
var timeNow = new Date().getTime();
$.ajax({
url: '/templates/hmcj/cameraproperties.html?=' + timeNow,
success: function (data) {
$("#cameraproperties").html(data).trigger('create');
$("#cameraproperties").show();
$("#settingsButton").addClass('ui-btn-active');
showingSettings = true;
}
});
}
else {
$("#cameraproperties").hide();
$("#settingsButton").removeClass('ui-btn-active');
showingSettings = false;
}
$("#settingsButton").blur();
return false;
}
document.getElementById('settingsButton').onclick = showSettings;
// get camera information
getCameraInfo();
// get version of the irisCapture
getVersionInfo();
// start camera (it defaults to MJPEG; keeping 30 fps rate)
Camera.Start(30);
</script>
</body>
</html>
\ No newline at end of file
......@@ -82,23 +82,44 @@
</ul>
</div>
</div>
<!--案件信息管理-->
<!--信息查询管理-->
<div class="ypgj_box">
<img src="static/xtba/login/images/gzzm_ajxxgl.png">
<img src="static/xtba/login/images/gzzm_xxcxgl.png">
<div class="ypgj_con">
<ul>
<li id="H10B01">
<!--<li id="H10B01">
<a onclick="ajxxgl()">案事件信息管理</a>
</li>-->
<li id="H10B01">
<a onclick="">人员信息查询</a>
</li>
<li id="H10B02">
<a onclick="">手机信息查询</a>
</li>
</ul>
</div>
</div>
<!--信息查询-->
<!--生物特征比对管理-->
<div class="ypgj_box">
<img src="static/xtba/login/images/gzzm_xxcx.png">
<img src="static/xtba/login/images/gzzm_swtzbdgl.png">
<div class="ypgj_con">
<ul>
<li id="H10C01">
<a onclick="">指掌纹比中信息</a>
</li>
<li id="H10C02">
<a onclick="">DNA比中信息</a>
</li>
<li id="H10C03">
<a onclick="">足迹比中信息</a>
</li>
<li id="H10C04">
<a onclick="">虹膜比中信息</a>
</li>
<li id="H10C05">
<a onclick="">声纹比中信息</a>
</li>
<!--<li id="H10C01">
<a onclick="">信息查询工作平台</a>
</li>
<li id="H10C02">
......@@ -115,7 +136,7 @@
</li>
<li id="H10C06">
<a onclick="XZZYYPPT()">刑侦专业研判平台</a>
</li>
</li>-->
</ul>
</div>
</div>
......@@ -143,9 +164,11 @@
<a href="" onclick="qxopen()">用户管理</a>
</li>
</span>
<!--
<li id="H10E01">
<a onclick="">日志管理</a>
</li>
-->
<li id="H10E02">
<a onclick="">字典管理</a>
</li>
......@@ -360,7 +383,7 @@
}
function ZTRYCX(){
var url="http://ztry-zyk.zx.ga/zhyy_zt//pages/xzztry/xzztry.jsp?desktopAppId=1846&biz=zt&ly=ztyw";
var url="http://xz.xz.ga/zhyy/pages/xzztry/xzztry.jsp?desktopAppId=1846";
window.open(url,'_blank');
}
......@@ -368,12 +391,12 @@
function QGSZRYCX(){
/* var url = "http://10.5.152.9/szry_zyk/pages/szry/index.jsp"; */
/* 全国失踪人员接口调整替换 */
var url = "http://10.12.223.175/szry_zyk/pages/szry/index.jsp";
var url = "http://11.33.1.231/szry_zyk/pages/szry/index.jsp";
window.open(url,'_blank');
}
//全国被盗抢机动车查寻
function QGBDQJDCCX(){
var url = "http://10.12.223.18/dqc_ywk/pages/dqjdc/dqjdc.jsp";
var url = "http://bdqqc-zyk.zx.ga/dqc_zyk/pages/dqjdc/dqjdc.jsp?desktopAppId=1769&biz=jdc";
window.open(url,'_blank');
}
......@@ -392,7 +415,7 @@
var sfzh = $("#sfzh").html();
var dhhm = $("#dhhm").html();
var url = "http://65.65.100.192:8187/ITAP/servlet/front/JKS";
url+="?type=YHDL2&PAGE=index.jsp&USERID=admin&TIME=&IP=65.65.66.22&SJH="+dhhm+"&SFZH="+sfzh+"&XM="+yhm+"&JH=admin";
url+="?type=YHDL2&PAGE=index.jsp&USERID=admin&TIME=&IP=&SJH="+dhhm+"&SFZH="+sfzh+"&XM="+yhm+"&JH=admin";
window.open(url,'_blank');
}
......
......@@ -23,19 +23,42 @@
$('.td_text').css({'border-bottom': '1px solid #000'});
document.getElementById("xm").innerHTML = window.parent.document.getElementById("xm").value;
document.getElementById("bmch").innerHTML = window.parent.document.getElementById("bmch").value;
document.getElementById("xbdm").innerHTML = window.parent.document.getElementById("xbdm").value;
document.getElementById("zjhm").innerHTML = window.parent.document.getElementById("zjhm").value;
document.getElementById("mzdm").innerHTML = window.parent.document.getElementById("mzdm").value;
//document.getElementById("xbdm").innerHTML = window.parent.document.getElementById("xbdm").value;
document.getElementById("xbdm").innerHTML = codeFormatter(window.parent.document.getElementById("xbdmStr").value,"CODE_XB");
document.getElementById("zjhm").innerHTML = window.parent.document.getElementById("gmsfhm").value;
//document.getElementById("mzdm").innerHTML = window.parent.document.getElementById("mzdm").value;
document.getElementById("mzdm").innerHTML = codeFormatter(window.parent.document.getElementById("mzdmStr").value,"CODE_MZ");
document.getElementById("csrqQsrq").innerHTML = window.parent.document.getElementById("csrqQsrq").value;
document.getElementById("jgssxdm").innerHTML = window.parent.document.getElementById("jgssxdm").value;
//document.getElementById("jgssxdm").innerHTML = window.parent.document.getElementById("jgssxdm").value;
document.getElementById("jgssxdm").innerHTML = codeFormatter(window.parent.document.getElementById("jgssxdmStr").value,"CODE_XZQH");
document.getElementById("hjdzDzmc").innerHTML = window.parent.document.getElementById("hjdzDzmc").value;
document.getElementById("rybh").innerHTML = window.parent.document.getElementById("rybh").value;
document.getElementById("ajlbdm").innerHTML = window.parent.document.getElementById("ajlbdm").value;
//document.getElementById("ajlbdm").innerHTML = window.parent.document.getElementById("ajlbdm").value;
document.getElementById("ajlbdm").innerHTML = codeFormatter(window.parent.document.getElementById("ajlbdmStr").value,"CODE_AJLB");
document.getElementById("zwcjdwdm").innerHTML = window.parent.document.getElementById("zwcjdwdm").value;
document.getElementById("lrdwdm").innerHTML = window.parent.document.getElementById("lrdwdm").value;
document.getElementById("lrr").innerHTML = window.parent.document.getElementById("lrrXm").value;
document.getElementById("lrsj").innerHTML = window.parent.document.getElementById("lrsj").value;
document.getElementById("lxdm").innerHTML = window.parent.document.getElementById("lxdm").value;
document.getElementById("lxdm").innerHTML = window.parent.document.getElementById("cjRlxdh").value;
}
//格式化字典
function codeFormatter(val,type){
var codeName="";
$.ajax({
url:"/queryNameByCode",
data:{"codeId":val,"codeType":type},
async:false,
type:"post",
dataType:"text",
success:function(data){
codeName=data;
},
error:function(e){
console.log("error="+JSON.stringify(e));
}
});
return codeName;
}
</script>
</head>
......
......@@ -212,7 +212,7 @@
</thead>
<tbody>
<tr>
<th></th>
<th></th>
<td id="gdz1"><span class="bhg-span-c">不清晰</span></td>
<td id="gdz2"><span class="bhg-span-c">不清晰</span></td>
<td id="gdz3"><span class="bhg-span-c">不清晰</span></td>
......@@ -226,7 +226,7 @@
</tr>
<tr>
<th></th>
<th></th>
<td id="gdy1"><span class="bhg-span-c">位置截取不正确</span></td>
<td id="gdy2"><span class="bhg-span-c">不清晰</span></td>
<td id="gdy3"><span class="hg-span-c">合格</span></td>
......@@ -320,10 +320,11 @@
}
function doQuery(){
var table_title = [
{title:"操作",field:"scbz",align:'center',color:'gree',width:140,formatter:function(val,row,index){
{title:"操作",field:"scbz",align:'center',color:'gree',width:110,formatter:function(val,row,index){
var rybh=row.rybh;
var xm=row.xm;
return "<span class='hg-btn' onclick=\"modify('"+rybh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
//return "<span class='hg-btn' onclick=\"modify('"+rybh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
return "<span class='hg-btn' onclick=\"modify('"+rybh+"')\">修改</span>";
}},
{title:"人员编号",field:"rybh",align:'left',width:240,formatter:function(val,row,index){
var rybh=row.rybh;
......@@ -332,7 +333,16 @@
}},
{title:"姓名",field:"xm",align:'left',width:120},
{title:"性别",field:"xbdm",align:'left',width:80},
{title:"证件号码",field:"gmsfhm",align:'left',width:200},
{title:"证件号码",field:"gmsfhm",align:'left',width:200,formatter:function(val,row,index){
var gmsfhm=row.gmsfhm;
var zjhm=row.zjhm;
var rstStr;
if(gmsfhm==null||gmsfhm==""){
rstStr = zjhm;
}else{
rstStr = gmsfhm;
}
}},
{title:"指纹编号",field:"szzwbh",align:'left',width:220},
{title:"平面指纹",field:"pmzw",align:'center',color:'gree',width:90,formatter:function(val,row,index){
var zwfkxx=row.zwfkxx;
......
......@@ -49,7 +49,7 @@
<input id="imgzp13" name="hgzp_y" class="hgzp_y" type="hidden" th:value="${zjxx.hgzp_y}">
<input id="imgzp14" name="xd_y" class="xd_y" type="hidden" th:value="${zjxx.xd_y}">
<input id="img4" name="cz_y" class="cz_y" type="hidden" th:value="${zjxx.cz_y}">
</form>
<!--人员基本信息-->
<div style="width: 100%;">
<p class="div_title" style="width: 80%;"><img src="zjcj/images/jc-icon.png" class="jc-icon" />人员编号:<span th:text="${rybh}"></span>&nbsp;&nbsp;姓名:<span th:text="${xm}"></span>&nbsp;&nbsp;身份证号:<span th:text="${zjhm}"></span></p>
......@@ -59,8 +59,8 @@
<tr>
<td class="td_r">足迹类型:</td>
<td class="td_bg">
<input id="zjlxdm" name="zjlxdm" type="text" style="width:230px; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_YTHCJ_ZJLX',method:'get',textField : 'text', valueField : 'id'" />
<input type="hidden" id="zjlxdmStr" th:value="${zjxx.zjlx}"/>
<input id="zjlx" name="zjlx" type="text" style="width:230px; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_YTHCJ_ZJLX',method:'get',textField : 'text', valueField : 'id'" />
<input type="hidden" id="zjlxStr" th:value="${zjxx.zjlx}"/>
</td>
<td class="td_r">鞋底花纹:</td>
<td class="td_bg" >
......@@ -76,11 +76,11 @@
<tr>
<td class="td_r">鞋子品牌:</td>
<td class="td_bg">
<input id="xzpp" name="zc" th:value="${zjxx.xzpp}" type="text" class="form-control cxnr" />
<input id="xzpp" name="xzpp" th:value="${zjxx.xzpp}" type="text" class="form-control cxnr" />
</td>
<td class="td_r">鞋子尺码:</td>
<td class="td_bg">
<input id="xzcm" name="zc" th:value="${zjxx.xzcm}" type="text" class="form-control cxnr" />
<input id="xzcm" name="xzcm" th:value="${zjxx.xzcm}" type="text" class="form-control cxnr" />
</td>
<td class="td_r">是否残疾:</td>
<td class="td_bg">
......@@ -91,6 +91,7 @@
</table>
</div>
</div>
</form>
<div class="tab1_div zwxx_div" style="height:690px;">
<p class="checklist">
<button type="button" onclick="btnCheck(this,'.zwxx_div')" class="act">
......@@ -130,7 +131,7 @@
onclick="startXmcj(0)" /></dt>
</dl>
</div>
<div class="left" style="position: relative; right: -40%; top: -312px;">
<div class="left" style="position: relative; right: -40%; top: -323px;">
<!--<dl class="fingerprint">
<dd>鞋底静态花纹</dd>
<dt><img src="static/xtba/zljc/images/no_data.jpg" id="content15" layer-pid="l-hand" layer-src="static/xtba/zljc/images/no_data.jpg" alt="鞋底静态花纹"
......@@ -183,7 +184,7 @@
onclick="startXmcj(3)" /></dt>
</dl>
</div>
<div class="left" style="position: relative; right: -40%; top: -312px;">
<div class="left" style="position: relative; right: -40%; top: -323px;">
<!--<dl class="fingerprint">
<dd>鞋底静态花纹</dd>
<dt><img src="static/xtba/zljc/images/no_data.jpg" id="content15" layer-pid="l-hand" layer-src="static/xtba/zljc/images/no_data.jpg" alt="鞋底静态花纹"
......@@ -255,7 +256,7 @@
$("#img"+numtemp).attr('value', context);
$("#content"+numtemp).attr('src', context);
var cjtpxh = $("#cjtpxh").val();
$("#cjtpxh").attr('value', cjtpxh+","+numtemp+",");
$("#cjtpxh").attr('value', cjtpxh+"xd"+numtemp+",");
}
} else {
if (data.Code == 2) {
......@@ -277,7 +278,7 @@
$("#imgzp"+numtemp).attr('value', context);
$("#context"+numtemp).attr('src', context);
var cjtpxh = $("#cjtpxh").val();
$("#cjtpxh").attr('value', cjtpxh+","+numtemp+",");
$("#cjtpxh").attr('value', cjtpxh+"xm"+numtemp+",");
flg = true;
} else {
//$("#context"+numtemp).attr('src', data.context);
......@@ -376,8 +377,15 @@
var isflag = $("#isflag").val();
if (isflag != null && isflag == "1") {
$.messager.alert("提示","信息保存成功!");
}else if(isflag != null && isflag == "2"){
$.messager.alert("提示","信息保存成功,同步至足迹系统失败!");
}
$("#zjlx").combobox("setValue",$("#zjlxStr").val());
$("#xdhwdm").combobox("setValue",$("#xdhwdmStr").val());
$("#xydm").combobox("setValue",$("#xydmStr").val());
$("#sfcj").combobox("setValue",$("#sfcjStr").val());
var gdxdhw_z = $("#img1").val();
if (gdxdhw_z != null && gdxdhw_z != "") {
if(gdxdhw_z.indexOf("data:img/jpg;base64")>=0){
......
......@@ -384,6 +384,7 @@ function doQuery(){
}
return zwcjsjStr+"|"+jcsjStr;
}},
{title:"检查计时",field:"rjcsj",align:'center',width:100},
{title:"检查人",field:"jcr",align:'center',width:85},
{title:"采集<Br/>次数",field:"rcjcs",align:'center',width:65}
];
......
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