修改人员采集中足迹采集和虹膜采集

src/main/java/com/founder/XtbaBootApplication.java

@@ -31,9 +31,9 @@ public class XtbaBootApplication {
 	public MultipartConfigElement multipartConfigElement() {
 		MultipartConfigFactory factory = new MultipartConfigFactory();
 		//单个文件最大
-		factory.setMaxFileSize("215040KB"); //210MB
+		factory.setMaxFileSize("215040MB"); //210MB
 		/// 设置总上传数据总大小
-		factory.setMaxRequestSize("256000KB");//250MB
+		factory.setMaxRequestSize("256000MB");//250MB
 		return factory.createMultipartConfig();
 	}
 }

src/main/java/com/founder/controller/SwCjController.java

@@ -19,6 +19,7 @@ import org.springframework.web.util.WebUtils;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
@@ -402,6 +403,25 @@ public class SwCjController {
 
     }
 
+    @RequestMapping(value = "/voicePage", method = RequestMethod.GET)
+    public ModelAndView voice(HttpServletResponse response) {
+        ModelAndView model = new ModelAndView("voice/test2");
+        model.addObject("name", "caoyong");
+        return model;
+    }
+
+    @RequestMapping(value = "/uploadSwxx")
+    public boolean upload(HttpServletRequest request, HttpServletResponse response,TbStSw tbStSw,@RequestParam("sw") MultipartFile sw) throws IOException {
+        try {
+            tbStSw.setSwsj(sw.getBytes());
+            //File localFile = ExcelUtil.createLocalFile(request, "data", "D:/files/");
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+        //ResponseJsonUtils.responseJson("{\"result\":\"success\"}", response);
+    }
+
     public static boolean GenerateImage(byte[] bytes, String imgFilePath) {// 对字节数组字符串进行Base64解码并生成图片
         try {            // Base64解码
             for (int i = 0; i < bytes.length; ++i) {

src/main/java/com/founder/controller/TbXwRycjController.java

@@ -75,6 +75,8 @@ public class TbXwRycjController {
     private IParamService paramService;
     @Autowired
     private LoginService loginService;
+    @Autowired
+    private IDnaCjService dnaCjService;
 
     private String no_finger;        // 没有滚动指纹
     private String no_pmfinger;      // 没有平面指纹
@@ -808,6 +810,9 @@ public class TbXwRycjController {
         zbfzxyr.setLrr(user.getUsername());
         //zbfzxyr.setXxdjryLxdh(user.getTelephone());
         boolean bool = rycjService.insertRyxx(zbfzxyr);
+        if(bool){
+            //boolean bools = dnaCjService.saveDnaXx(zbfzxyr);
+        }
         AutoTbStRy xyrC = rycjService.getRyxxByRybh(zbfzxyr.getRybh());
         if(user.getTrueName()==null||"".equals(user.getTrueName())){
             try{

src/main/java/com/founder/dao/DnaCjDao.java

+package com.founder.dao;
+
+import com.founder.model.AutoTbStRy;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface DnaCjDao {
+    Boolean insertDnaXx(AutoTbStRy entity);
+    Boolean updateDnaXx(AutoTbStRy entity);
+    List<AutoTbStRy> getDnaXx(String rybh);
+}

src/main/java/com/founder/dao/SgTzZcCjDao.java

+package com.founder.dao;
+
+import com.founder.model.AutoTbStRy;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface SgTzZcCjDao {
+    int insertSgTzZcXx(AutoTbStRy entity);
+    int updateSgTzZcXx(AutoTbStRy entity);
+    List<AutoTbStRy> getSgTzZcXx(String rybh);
+}

src/main/java/com/founder/dao/TbXwRycjDao.java

@@ -18,6 +18,7 @@ public interface TbXwRycjDao {
     public List<AutoTbStRy> queryPageList(Map<String, Object> map);
     public List<AutoTbStRy> queryPageList_new(Map<String, Object> map);
 
+    public List<AutoTbStRy> getRyxxByRybh(Map<String, Object> map);
     public List<AutoTbStRy> getRyxxByRybh_new(Map<String, Object> map);
 
     public List<AutoTbStRy> getRyxxByZjhm(Map<String, Object> map);
@@ -26,8 +27,10 @@ public interface TbXwRycjDao {
 
     public List<AutoTbStRy> getRyxxBySzzwbh(Map<String, Object> map);
 
+    public boolean deleteRyxx(Map<String, Object> map);
     public boolean deleteRyxx_new(Map<String, Object> map);
 
+    public boolean insertRyxx(Map<String, Object> map);
     public boolean insertRyxx_new(Map<String, Object> map);
 
     public boolean updateRyxx(Map<String, Object> map);

src/main/java/com/founder/dao/TstzCjDao.java

+package com.founder.dao;
+
+import com.founder.model.AutoTbStRy;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface TstzCjDao {
+    int insertTstzXx(AutoTbStRy entity);
+    int updateTstzXx(AutoTbStRy entity);
+    List<AutoTbStRy> getTstzXx(String rybh);
+}

src/main/java/com/founder/model/TbXwYthcjZj.java

@@ -24,6 +24,24 @@ public class TbXwYthcjZj implements Serializable {
     public String lrr_policemanid;//录入人警号
     public String xxsc_pdbz;//删除标志
 
+    public String gdxdhw_z;
+    public String jtxdhw_z;
+    public String nczp_z;
+    public String wczp_z;
+    public String hgzp_z;
+    public String zmzp_z;
+    public String cz_z;
+    public String xd_z;
+
+    public String gdxdhw_y;
+    public String jtxdhw_y;
+    public String nczp_y;
+    public String wczp_y;
+    public String hgzp_y;
+    public String zmzp_y;
+    public String cz_y;
+    public String xd_y;
+
     public String getXxzjbh() {
         return xxzjbh;
     }
@@ -143,4 +161,132 @@ public class TbXwYthcjZj implements Serializable {
     public void setXxsc_pdbz(String xxsc_pdbz) {
         this.xxsc_pdbz = xxsc_pdbz;
     }
+
+    public String getGdxdhw_z() {
+        return gdxdhw_z;
+    }
+
+    public void setGdxdhw_z(String gdxdhw_z) {
+        this.gdxdhw_z = gdxdhw_z;
+    }
+
+    public String getJtxdhw_z() {
+        return jtxdhw_z;
+    }
+
+    public void setJtxdhw_z(String jtxdhw_z) {
+        this.jtxdhw_z = jtxdhw_z;
+    }
+
+    public String getNczp_z() {
+        return nczp_z;
+    }
+
+    public void setNczp_z(String nczp_z) {
+        this.nczp_z = nczp_z;
+    }
+
+    public String getWczp_z() {
+        return wczp_z;
+    }
+
+    public void setWczp_z(String wczp_z) {
+        this.wczp_z = wczp_z;
+    }
+
+    public String getHgzp_z() {
+        return hgzp_z;
+    }
+
+    public void setHgzp_z(String hgzp_z) {
+        this.hgzp_z = hgzp_z;
+    }
+
+    public String getZmzp_z() {
+        return zmzp_z;
+    }
+
+    public void setZmzp_z(String zmzp_z) {
+        this.zmzp_z = zmzp_z;
+    }
+
+    public String getCz_z() {
+        return cz_z;
+    }
+
+    public void setCz_z(String cz_z) {
+        this.cz_z = cz_z;
+    }
+
+    public String getXd_z() {
+        return xd_z;
+    }
+
+    public void setXd_z(String xd_z) {
+        this.xd_z = xd_z;
+    }
+
+    public String getGdxdhw_y() {
+        return gdxdhw_y;
+    }
+
+    public void setGdxdhw_y(String gdxdhw_y) {
+        this.gdxdhw_y = gdxdhw_y;
+    }
+
+    public String getJtxdhw_y() {
+        return jtxdhw_y;
+    }
+
+    public void setJtxdhw_y(String jtxdhw_y) {
+        this.jtxdhw_y = jtxdhw_y;
+    }
+
+    public String getNczp_y() {
+        return nczp_y;
+    }
+
+    public void setNczp_y(String nczp_y) {
+        this.nczp_y = nczp_y;
+    }
+
+    public String getWczp_y() {
+        return wczp_y;
+    }
+
+    public void setWczp_y(String wczp_y) {
+        this.wczp_y = wczp_y;
+    }
+
+    public String getHgzp_y() {
+        return hgzp_y;
+    }
+
+    public void setHgzp_y(String hgzp_y) {
+        this.hgzp_y = hgzp_y;
+    }
+
+    public String getZmzp_y() {
+        return zmzp_y;
+    }
+
+    public void setZmzp_y(String zmzp_y) {
+        this.zmzp_y = zmzp_y;
+    }
+
+    public String getCz_y() {
+        return cz_y;
+    }
+
+    public void setCz_y(String cz_y) {
+        this.cz_y = cz_y;
+    }
+
+    public String getXd_y() {
+        return xd_y;
+    }
+
+    public void setXd_y(String xd_y) {
+        this.xd_y = xd_y;
+    }
 }

src/main/java/com/founder/service/IDnaCjService.java

+package com.founder.service;
+
+import com.founder.model.AutoTbStRy;
+
+import java.util.List;
+
+public interface IDnaCjService {
+    /**
+     * 保存DNA信息
+     * @param ryxx
+     * @return
+     */
+    Boolean saveDnaXx(AutoTbStRy ryxx);
+
+    /**update
+     * 修改DNA信息
+     * @param ryxx
+     * @return
+     */
+    Boolean updateDnaXx(AutoTbStRy ryxx);
+
+    /**
+     * 修改DNA信息
+     * @param rybh
+     * @return
+     */
+    List<AutoTbStRy> getDnaXx(String rybh);
+}

src/main/java/com/founder/service/ISgTzZcService.java

+package com.founder.service;
+
+import com.founder.model.AutoTbStRy;
+
+public interface ISgTzZcService {
+    /**
+     * 保存身高体重足长信息
+     * @param ryxx
+     * @return
+     */
+    Boolean saveSgTzZcXx(AutoTbStRy ryxx);
+
+    /**update
+     * 修改身高体重足长信息
+     * @param ryxx
+     * @return
+     */
+    Boolean updateSgTzZcXx(AutoTbStRy ryxx);
+
+    /**
+     * 修改身高体重足长信息
+     * @param rybh
+     * @return
+     */
+    AutoTbStRy getSgTzZcXx(String rybh);
+}

src/main/java/com/founder/service/impl/AutoTbXwRycjServiceImpl.java

@@ -43,17 +43,19 @@ public class AutoTbXwRycjServiceImpl extends BaseService<AutoTbStRy> implements
         String sort = page.getSort();
         String order = page.getOrder();
         if (StringUtils.isEmpty(sort)) { // 默认排序
-            sort = "DJSJ";
+            sort = "LRSJ";
             order = "desc";
         }
         map.put("sort", sort);
         map.put("order", order);
         map.put("entity", entity);
-        page.setTotal(mapper.queryPageCount_new(map));
+        //page.setTotal(mapper.queryPageCount_new(map));
+        page.setTotal(mapper.queryPageCount(map));
         if (page.getTotal() == 0) {
             page.setRows(new ArrayList<>());
         } else {
-            page.setRows(mapper.queryPageList_new(map));
+            //page.setRows(mapper.queryPageList_new(map));
+            page.setRows(mapper.queryPageList(map));
         }
         return page;
     }
@@ -121,7 +123,8 @@ public class AutoTbXwRycjServiceImpl extends BaseService<AutoTbStRy> implements
     public boolean deleteRyxx(String asjxgrybh){
         Map<String, Object> map = new HashMap<>();
         map.put("rybh", asjxgrybh);
-        boolean bool = mapper.deleteRyxx_new(map);
+        //boolean bool = mapper.deleteRyxx_new(map);
+        boolean bool = mapper.deleteRyxx(map);
         return bool;
     }
 
@@ -130,7 +133,8 @@ public class AutoTbXwRycjServiceImpl extends BaseService<AutoTbStRy> implements
         AutoTbStRy xyrC=new AutoTbStRy();
         Map<String, Object> map = new HashMap<>();
         map.put("rybh", asjxgrybh);
-        List<AutoTbStRy> xyrCs = mapper.getRyxxByRybh_new(map);
+        //List<AutoTbStRy> xyrCs = mapper.getRyxxByRybh_new(map);
+        List<AutoTbStRy> xyrCs = mapper.getRyxxByRybh(map);
         if(xyrCs!=null&&xyrCs.size()>0){
             xyrC = xyrCs.get(0);
         }
@@ -198,7 +202,7 @@ public class AutoTbXwRycjServiceImpl extends BaseService<AutoTbStRy> implements
         }
         map.put("entity", entity);
         map.put("begin",0);
-        map.put("sort", "DJSJ");
+        map.put("sort", "LRSJ");
         map.put("order", "desc");
         map.put("end",mapper.queryPageCount(map));
         List<AutoTbStRy> xyrCs = mapper.queryPageList(map);
@@ -210,7 +214,8 @@ public class AutoTbXwRycjServiceImpl extends BaseService<AutoTbStRy> implements
         AutoTbStRy xyrC=new AutoTbStRy();
         Map<String, Object> map = new HashMap<>();
         map.put("entity", entity);
-        boolean bool = mapper.insertRyxx_new(map);
+        //boolean bool = mapper.insertRyxx_new(map);
+        boolean bool = mapper.insertRyxx(map);
         return bool;
     }
 

src/main/java/com/founder/service/impl/DnaCjServiceImpl.java

+package com.founder.service.impl;
+
+import com.founder.dao.DnaCjDao;
+import com.founder.model.AutoTbStRy;
+import com.founder.service.IDnaCjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DnaCjServiceImpl implements IDnaCjService {
+
+    @Autowired
+    private DnaCjDao dnaCjDao;
+    @Override
+    public Boolean saveDnaXx(AutoTbStRy entity) {
+        Boolean b = false;
+        try {
+            b = dnaCjDao.insertDnaXx(entity);
+        }catch (Exception e){
+            System.out.println("插入DNA数据失败"+e);
+        }
+        return b;
+    }
+    @Override
+    public Boolean updateDnaXx(AutoTbStRy entity) {
+        Boolean b = false;
+        try {
+            b = dnaCjDao.updateDnaXx(entity);
+        }catch (Exception e){
+            System.out.println("修改DNA数据失败"+e);
+        }
+        return b;
+    }
+    @Override
+    public List<AutoTbStRy> getDnaXx(String rybh){
+        return dnaCjDao.getDnaXx(rybh);
+    }
+}

src/main/resources/application-dev.properties

@@ -90,6 +90,9 @@ zhyyPath=/toLogin
 #zhyyPath=http://zhyy.xzxt.nm:7001
 qxUrl=http://xtba.xzxt.hn:9044
 
-multipart.maxFileSize=210Mb
-multipart.maxRequestSize=250Mb
+multipart.maxFileSize=210MB
+multipart.maxRequestSize=250MB
+server.maxHttpHeaderSize=102400000
+server.maxHttpPostSize =102400000
+server.tomcat.max-http-post-size=-1
 

src/main/resources/mapper/AutoTbXwRycjSqlMap.xml

@@ -5,60 +5,58 @@
         <id column="RYBH"  property="rybh"  jdbcType="VARCHAR"/>
         <result column="ASJBH"  property="asjbh"  jdbcType="VARCHAR"/>
         <result column="XM"  property="xm"  jdbcType="VARCHAR"/>
-        <result column="XMHYPY"  property="xmhypy"  jdbcType="VARCHAR"/>
-        <result column="WWXM"  property="wwxm"  jdbcType="VARCHAR"/>
         <result column="CYM"  property="cym"  jdbcType="VARCHAR"/>
         <result column="BMCH"  property="bmch"  jdbcType="VARCHAR"/>
         <result column="CYZJDM"  property="cyzjdm"  jdbcType="VARCHAR"/>
-        <result column="GMSFHM"  property="gmsfhm"  jdbcType="VARCHAR"/>
         <result column="ZJHM"  property="zjhm"  jdbcType="VARCHAR"/>
-        <result column="CSRQ"  property="csrqQsrq"  jdbcType="TIMESTAMP"/>
+        <result column="CSRQ_QSRQ"  property="csrqQsrq"  jdbcType="TIMESTAMP"/>
+        <result column="CSRQ_JZRQ"  property="csrqJzrq"  jdbcType="TIMESTAMP"/>
         <result column="XBDM"  property="xbdm"  jdbcType="VARCHAR"/>
         <result column="GJDM"  property="gjdm"  jdbcType="VARCHAR"/>
+        <result column="JGSSXDM"  property="jgssxdm"  jdbcType="VARCHAR"/>
         <result column="MZDM"  property="mzdm"  jdbcType="VARCHAR"/>
-        <result column="CSDXZQH"  property="csdXzqhdm"  jdbcType="VARCHAR"/>
-        <result column="CSDXZ"  property="csdDzmc"  jdbcType="VARCHAR"/>
-        <result column="HJDXZQH"  property="hjdzXzqhdm"  jdbcType="VARCHAR"/>
-        <result column="HJDXZ"  property="hjdzDzmc"  jdbcType="VARCHAR"/>
-        <result column="XZDXZQH"  property="xzzXzqhdm"  jdbcType="VARCHAR"/>
-        <result column="XZDXZ"  property="xzzDzmc"  jdbcType="VARCHAR"/>
-        <result column="LXDH"  property="lxdm"  jdbcType="VARCHAR"/>
-        <result column="GRSFDM"  property="sarysfdm"  jdbcType="VARCHAR"/>
-        <result column="ZJXYDM"  property="zjxydm"  jdbcType="VARCHAR"/>
-        <result column="ZZMMDM"  property="zzmmdm"  jdbcType="VARCHAR"/>
-        <result column="XLDM"  property="xldm"  jdbcType="VARCHAR"/>
-        <result column="HYZKDM"  property="jyzkdm"  jdbcType="VARCHAR"/>
-        <result column="TSSFDM"  property="tssfdm"  jdbcType="VARCHAR"/>
-        <result column="WFFZJLMS"  property="wffzjlms"  jdbcType="VARCHAR"/>
-
-        <result column="SG"  property="sgsx"  jdbcType="INTEGER"/>
-        <result column="TZ"  property="tzsx"  jdbcType="INTEGER"/>
+        <result column="CSD_XZQHDM"  property="csdXzqhdm"  jdbcType="VARCHAR"/>
+        <result column="CSD_DZMC"  property="csdDzmc"  jdbcType="VARCHAR"/>
+        <result column="HJDZ_XZQHDM"  property="hjdzXzqhdm"  jdbcType="VARCHAR"/>
+        <result column="HJDZ_DZMC"  property="hjdzDzmc"  jdbcType="VARCHAR"/>
+        <result column="XZZ_XZQHDM"  property="xzzXzqhdm"  jdbcType="VARCHAR"/>
+        <result column="XZZ_DZMC"  property="xzzDzmc"  jdbcType="VARCHAR"/>
+        <result column="JWZZ_GJHDQDM"  property="jwzzGjhdqdm"  jdbcType="VARCHAR"/>
+        <result column="JWZZ_DZMC"  property="jwzzDzmc"  jdbcType="VARCHAR"/>
+        <result column="SGSX"  property="sgsx"  jdbcType="INTEGER"/>
+        <result column="SGXX"  property="sgxx"  jdbcType="INTEGER"/>
+        <result column="TZSX"  property="tzsx"  jdbcType="INTEGER"/>
+        <result column="TZXX"  property="tzxx"  jdbcType="INTEGER"/>
         <result column="ZC"  property="zc"  jdbcType="INTEGER"/>
         <result column="TMTZMS"  property="tmtzms"  jdbcType="VARCHAR"/>
-        <result column="ZHSJ"  property="zhsj"  jdbcType="TIMESTAMP"/>
-        <result column="ZHDXZQH"  property="zhddqh"  jdbcType="VARCHAR"/>
-        <result column="ZHDXZ"  property="zhddxz"  jdbcType="VARCHAR"/>
-        <result column="ZHDWDM"  property="zhdwdm"  jdbcType="VARCHAR"/>
-        <result column="DAZT"  property="daztdm"  jdbcType="VARCHAR"/>
-        <result column="IP"  property="ip"  jdbcType="VARCHAR"/>
-
         <result column="TBBJMS"  property="tbbjms"  jdbcType="VARCHAR"/>
         <result column="RQTTZMS"  property="rqttzms"  jdbcType="VARCHAR"/>
-        <result column="JGSSXDM"  property="jgssxdm"  jdbcType="VARCHAR"/>
         <result column="FWCS"  property="fwcs"  jdbcType="VARCHAR"/>
+        <result column="LXDM"  property="lxdm"  jdbcType="VARCHAR"/>
         <result column="XXDM"  property="xxdm"  jdbcType="VARCHAR"/>
-
+        <result column="ZJXYDM"  property="zjxydm"  jdbcType="VARCHAR"/>
+        <result column="ZZMMDM"  property="zzmmdm"  jdbcType="VARCHAR"/>
+        <result column="XLDM"  property="xldm"  jdbcType="VARCHAR"/>
+        <result column="JYZKDM"  property="jyzkdm"  jdbcType="VARCHAR"/>
         <result column="BYZKDM"  property="byzkdm"  jdbcType="VARCHAR"/>
         <result column="ZYLBDM"  property="zylbdm"  jdbcType="VARCHAR"/>
         <result column="ZYLBDMBCMS"  property="zylbdmbcms"  jdbcType="VARCHAR"/>
+
         <result column="ZHFSDM"  property="zhfsdm"  jdbcType="VARCHAR"/>
         <result column="ZHFSDMBCMS"  property="zhfsdmbcms"  jdbcType="VARCHAR"/>
+        <result column="ZHSJ"  property="zhsj"  jdbcType="TIMESTAMP"/>
+        <result column="ZHDDQH"  property="zhddqh"  jdbcType="VARCHAR"/>
+        <result column="ZHDDXZ"  property="zhddxz"  jdbcType="VARCHAR"/>
+        <result column="ZHDWDM"  property="zhdwdm"  jdbcType="VARCHAR"/>
+        <result column="DAZT"  property="daztdm"  jdbcType="VARCHAR"/>
         <result column="XYRDW"  property="sadwzydm"  jdbcType="VARCHAR"/>
+
+        <result column="SARYSFDM"  property="sarysfdm"  jdbcType="VARCHAR"/>
         <result column="SARYSFDMBCMS"  property="sarysfdmbcms"  jdbcType="VARCHAR"/>
         <result column="TSZCDM"  property="tszcdm"  jdbcType="VARCHAR"/>
         <result column="TSZCDMBCMS"  property="tszcdmbcms"  jdbcType="VARCHAR"/>
         <result column="JL"  property="jl"  jdbcType="VARCHAR"/>
-
+        <result column="WFFZJLMS"  property="wffzjlms"  jdbcType="VARCHAR"/>
         <result column="ZWWFCJSM"  property="zwwfcjsm"  jdbcType="VARCHAR"/>
         <result column="WZJYYDM"  property="wzjyydm"  jdbcType="VARCHAR"/>
         <result column="SFSZ"  property="sfszryPdbz"  jdbcType="VARCHAR"/>
@@ -103,7 +101,10 @@
         <result column="ZJ"  property="zj"  jdbcType="VARCHAR"/>
         <result column="SW"  property="sw"  jdbcType="VARCHAR"/>
         <result column="YHK"  property="yhk"  jdbcType="VARCHAR"/>
-
+        <result column="GMSFHM"  property="gmsfhm"  jdbcType="VARCHAR"/>
+        <result column="XMHYPY"  property="xmhypy"  jdbcType="VARCHAR"/>
+        <result column="WWXM"  property="wwxm"  jdbcType="VARCHAR"/>
+        <result column="TSSFDM"  property="tssfdm"  jdbcType="VARCHAR"/>
         <result column="DNAYBLXDM"  property="dnayblxdm"  jdbcType="VARCHAR"/>
         <result column="ZJLXDM"  property="zjlxdm"  jdbcType="VARCHAR"/>
         <result column="XDHWDM"  property="xdhwdm"  jdbcType="VARCHAR"/>

src/main/resources/mapper/AutoTbXwRycjSqlMap_new.xml

@@ -491,7 +491,7 @@
 
 
     <select id="getAjaxGettoAfisStr_new" parameterMap="proSetlongstringMap_new" statementType="CALLABLE">
-        {call PD_RYXX_RYXXCJ(?,?,?)}
+        {call PD_RYXX_YTHRYCJ(?,?,?)}
     </select>
 
     <parameterMap type="java.util.Map" id="proSetlongstringMap_new">

src/main/resources/mapper/TbRyRyzpSqlMapper.xml

@@ -219,14 +219,14 @@
         b.XM xm,
         b.GMSFHM gmsfhm,
         b.ZJSJ dzwjnr,
-        b.ZJLXDM zplxdm,
-        b.ZJBWDM zpbw,
+        b.ZJLX zplxdm,
+        b.ZJBW zpbw,
         b.XDHWDM xdhwdm,
         b.XYDM xydm,
         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
-        <if test="zpbw != null and zpbw != ''">and b.ZJBWDM = #{zpbw}</if>
+        <if test="zpbw != null and zpbw != ''">and b.ZJBW = #{zpbw}</if>
     </select>
     <select id="getRyTstzzpInfo" parameterType="map" resultType="com.founder.model.AutoTbRyZp">
         select
@@ -250,13 +250,13 @@
         XM,
         GMSFHM,
         ZJSJ,
-        ZJLXDM,
-        ZJBWDM,
+        ZJLX,
+        ZJBW,
         XDHWDM,
         XYDM,
-        LRR,
-        CJSJ,
-        LRDWDM,
+        XXDJRY_XM,
+        DJSJ,
+        XXDJDW_GAJGJGDM,
         XXSC_PDBZ
         )values(
         <if test="entity.xxbh != null and entity.xxbh != ''">#{entity.xxbh , jdbcType=VARCHAR }</if>
@@ -331,8 +331,8 @@
         <if test="entity.xm == null or entity.xm == ''">XM = NULL, </if>
         <if test="entity.gmsfhm != null and entity.gmsfhm != ''">GMSFHM = #{entity.gmsfhm , jdbcType=VARCHAR },</if>
         <if test="entity.gmsfhm == null or entity.gmsfhm == ''">GMSFHM = NULL, </if>
-        <if test="entity.zjlxdm != null and entity.zjlxdm != ''">ZJLXDM = #{entity.zjlxdm , jdbcType=VARCHAR },</if>
-        <if test="entity.zjlxdm == null or entity.zjlxdm == ''">ZJLXDM = NULL, </if>
+        <if test="entity.zjlxdm != null and entity.zjlxdm != ''">ZJLX = #{entity.zjlxdm , jdbcType=VARCHAR },</if>
+        <if test="entity.zjlxdm == null or entity.zjlxdm == ''">ZJLX = NULL, </if>
         <if test="entity.xdhwdm != null and entity.xdhwdm != ''">XDHWDM = #{entity.xdhwdm , jdbcType=VARCHAR },</if>
         <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>
@@ -341,8 +341,8 @@
         <if test="entity.dzwjnr == null or entity.dzwjnr == ''">ZJSJ=NULL, </if>
         <if test="entity.gxsj != null">gxsj=#{entity.gxsj , jdbcType=TIMESTAMP },</if>
         <if test="entity.gxsj == null">gxsj=NULL, </if>
-        <if test="entity.zpbw != null and entity.zpbw != ''">ZJBWDM= #{entity.zpbw , jdbcType=VARCHAR }</if>
-        <if test="entity.zpbw == null or entity.zpbw == ''">ZJBWDM=NULL</if>
+        <if test="entity.zpbw != null and entity.zpbw != ''">ZJBW= #{entity.zpbw , jdbcType=VARCHAR }</if>
+        <if test="entity.zpbw == null or entity.zpbw == ''">ZJBW=NULL</if>
         WHERE XXZJBH=#{entity.xxbh , jdbcType=VARCHAR }
     </update>
 

src/main/resources/static/swcj/js/recorderWorker.js

+/**
+ * Created by Administrator on 2020/3/30.
+ */
+var recLength = 0,
+    recBuffersL = [],
+    recBuffersR = [],
+    sampleRate;
+
+this.onmessage = function(e){
+    switch(e.data.command){
+        case 'init':
+            init(e.data.config);
+            break;
+        case 'record':
+            record(e.data.buffer);
+            break;
+        case 'exportWAV':
+            exportWAV(e.data.type);
+            break;
+        case 'exportMonoWAV':
+            exportMonoWAV(e.data.type);
+            break;
+        case 'getBuffers':
+            getBuffers();
+            break;
+        case 'clear':
+            clear();
+            break;
+    }
+};
+
+function init(config){
+    sampleRate = config.sampleRate;
+}
+
+function record(inputBuffer){
+    recBuffersL.push(inputBuffer[0]);
+    recBuffersR.push(inputBuffer[1]);
+    recLength += inputBuffer[0].length;
+}
+
+function exportWAV(type){
+    var bufferL = mergeBuffers(recBuffersL, recLength);
+    var bufferR = mergeBuffers(recBuffersR, recLength);
+    var interleaved = interleave(bufferL, bufferR);
+    var dataview = encodeWAV(interleaved);
+    var audioBlob = new Blob([dataview], { type: type });
+
+    this.postMessage(audioBlob);
+}
+
+function exportMonoWAV(type){
+    var bufferL = mergeBuffers(recBuffersL, recLength);
+    var dataview = encodeWAV(bufferL, true);
+    var audioBlob = new Blob([dataview], { type: type });
+
+    this.postMessage(audioBlob);
+}
+
+function getBuffers() {
+    var buffers = [];
+    buffers.push( mergeBuffers(recBuffersL, recLength) );
+    buffers.push( mergeBuffers(recBuffersR, recLength) );
+    this.postMessage(buffers);
+}
+
+function clear(){
+    recLength = 0;
+    recBuffersL = [];
+    recBuffersR = [];
+}
+
+function mergeBuffers(recBuffers, recLength){
+    var result = new Float32Array(recLength);
+    var offset = 0;
+    for (var i = 0; i < recBuffers.length; i++){
+        result.set(recBuffers[i], offset);
+        offset += recBuffers[i].length;
+    }
+    return result;
+}
+
+function interleave(inputL, inputR){
+    var length = inputL.length + inputR.length;
+    var result = new Float32Array(length);
+
+    var index = 0,
+        inputIndex = 0;
+
+    while (index < length){
+        result[index++] = inputL[inputIndex];
+        result[index++] = inputR[inputIndex];
+        inputIndex++;
+    }
+    console.log(result);
+    return result;
+}
+
+function floatTo16BitPCM(output, offset, input){
+    for (var i = 0; i < input.length; i++, offset+=2){
+        var s = Math.max(-1, Math.min(1, input[i]));
+        output.setInt16(offset, s < 0 ? s * 0x8000 : s * 0x7FFF, true);
+    }
+}
+
+function writeString(view, offset, string){
+    for (var i = 0; i < string.length; i++){
+        view.setUint8(offset + i, string.charCodeAt(i));
+    }
+}
+
+function encodeWAV(samples, mono){
+    var buffer = new ArrayBuffer(44 + samples.length * 2);
+    var view = new DataView(buffer);
+
+    /* RIFF identifier */
+    writeString(view, 0, 'RIFF');
+    /* file length */
+    view.setUint32(4, 32 + samples.length * 2, true);
+    /* RIFF type */
+    writeString(view, 8, 'WAVE');
+    /* format chunk identifier */
+    writeString(view, 12, 'fmt ');
+    /* format chunk length */
+    view.setUint32(16, 16, true);
+    /* sample format (raw) */
+    view.setUint16(20, 1, true);
+    /* channel count */
+    view.setUint16(22, mono?1:2, true);
+    /* sample rate */
+    view.setUint32(24, sampleRate, true);
+    /* byte rate (sample rate * block align) */
+    view.setUint32(28, sampleRate * 4, true);
+    /* block align (channel count * bytes per sample) */
+    view.setUint16(32, 4, true);
+    /* bits per sample */
+    view.setUint16(34, 16, true);
+    /* data chunk identifier */
+    writeString(view, 36, 'data');
+    /* data chunk length */
+    view.setUint32(40, samples.length * 2, true);
+
+    floatTo16BitPCM(view, 44, samples);
+
+    return view;
+}

src/main/resources/static/swcj/js/swmain.js

+/**
+ * Created by Administrator on 2020/3/30.
+ */
+window.AudioContext = window.AudioContext || window.webkitAudioContext;
+
+var audioContext = new AudioContext();
+var audioInput = null,
+    realAudioInput = null,
+    inputPoint = null,
+    audioRecorder = null,
+    analyserNode=null,
+    zeroGain = null;
+var rafID = null;
+var analyserContext = null;
+var canvasWidth, canvasHeight;
+var recIndex = 0;
+
+/* TODO:
+
+ - offer mono option
+ - "Monitor input" switch
+ */
+
+function saveAudio() {
+    audioRecorder.exportWAV( doneEncoding );
+// could get mono instead by saying
+// audioRecorder.exportMonoWAV( doneEncoding );
+}
+
+function gotBuffers( buffers ) {
+    var canvas = document.getElementById( "wavedisplay" );
+
+    drawBuffer( canvas.width, canvas.height, canvas.getContext('2d'), buffers[0] );
+
+// the ONLY time gotBuffers is called is right after a new recording is completed -
+// so here's where we should set up the download.
+    audioRecorder.exportWAV( doneEncoding );
+}
+
+function doneEncoding( blob ) {
+    audioRecorder.upload( blob, "myRecording" + ((recIndex<10)?"0":"") + recIndex + ".wav" );
+//	Recorder.setupDownload( blob, "myRecording" + ((recIndex<10)?"0":"") + recIndex + ".wav" );
+    recIndex++;
+}
+
+function toggleRecording( e ) {
+    if (e.classList.contains("recording")) {
+// stop recording
+        audioRecorder.stop();
+        e.classList.remove("recording");
+        audioRecorder.getBuffers( gotBuffers );
+    } else {
+// start recording
+        if (!audioRecorder)
+            return;
+        e.classList.add("recording");
+        audioRecorder.clear();
+        audioRecorder.record();
+    }
+}
+
+function convertToMono( input ) {
+    var splitter = audioContext.createChannelSplitter(2);
+    var merger = audioContext.createChannelMerger(2);
+
+    input.connect( splitter );
+    splitter.connect( merger, 0, 0 );
+    splitter.connect( merger, 0, 1 );
+    return merger;
+}
+
+function cancelAnalyserUpdates() {
+    window.cancelAnimationFrame( rafID );
+    rafID = null;
+}
+
+function updateAnalysers(time) {
+    if (!analyserContext) {
+        var canvas = document.getElementById("analyser");
+        canvasWidth = canvas.width;
+        canvasHeight = canvas.height;
+        analyserContext = canvas.getContext('2d');
+    }
+
+// analyzer draw code here
+    {
+        var SPACING = 3;
+        var BAR_WIDTH = 1;
+        var numBars = Math.round(canvasWidth / SPACING);
+        var freqByteData = new Uint8Array(analyserNode.frequencyBinCount);
+
+        analyserNode.getByteFrequencyData(freqByteData);
+
+        analyserContext.clearRect(0, 0, canvasWidth, canvasHeight);
+        analyserContext.fillStyle = '#F6D565';
+        analyserContext.lineCap = 'round';
+        var multiplier = analyserNode.frequencyBinCount / numBars;
+
+// Draw rectangle for each frequency bin.
+        for (var i = 0; i < numBars; ++i) {
+            var magnitude = 0;
+            var offset = Math.floor( i * multiplier );
+// gotta sum/average the block, or we miss narrow-bandwidth spikes
+            for (var j = 0; j< multiplier; j++)
+                magnitude += freqByteData[offset + j];
+            magnitude = magnitude / multiplier;
+// var magnitude2 = freqByteData[i * multiplier];
+            analyserContext.fillStyle = "hsl( " + Math.round((i*360)/numBars) + ", 100%, 50%)";
+            analyserContext.fillRect(i * SPACING, canvasHeight, BAR_WIDTH, -magnitude);
+        }
+    }
+
+    rafID = window.requestAnimationFrame( updateAnalysers );
+}
+
+function toggleMono() {
+    if (audioInput != realAudioInput) {
+        audioInput.disconnect();
+        realAudioInput.disconnect();
+        audioInput = realAudioInput;
+    } else {
+        realAudioInput.disconnect();
+        audioInput = convertToMono( realAudioInput );
+    }
+
+    audioInput.connect(inputPoint);
+}
+
+function gotStream(stream) {
+    inputPoint = audioContext.createGain();
+
+// Create an AudioNode from the stream.
+    realAudioInput = audioContext.createMediaStreamSource(stream);
+    audioInput = realAudioInput;
+    audioInput.connect(inputPoint);
+
+// audioInput = convertToMono( input );
+
+    analyserNode = audioContext.createAnalyser();
+    analyserNode.fftSize = 2048;
+    inputPoint.connect(analyserNode);
+    var config = {
+        "workerPath" : "source/js/voice/recorderWorker.js",
+        "uploadUrl":"/lenovobot/upload.do"
+    };
+    audioRecorder = new Recorder(inputPoint, config);
+
+    zeroGain = audioContext.createGain();
+    zeroGain.gain.value = 0.0;
+    inputPoint.connect(zeroGain);
+    zeroGain.connect(audioContext.destination);
+    updateAnalysers();
+}
+
+function initAudio() {
+    if (!navigator.getUserMedia)
+        navigator.getUserMedia = navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
+    if (!navigator.cancelAnimationFrame)
+        navigator.cancelAnimationFrame = navigator.webkitCancelAnimationFrame || navigator.mozCancelAnimationFrame;
+    if (!navigator.requestAnimationFrame)
+        navigator.requestAnimationFrame = navigator.webkitRequestAnimationFrame || navigator.mozRequestAnimationFrame;
+
+    navigator.getUserMedia(
+        {
+            "audio": {
+                "mandatory": {
+                    "googEchoCancellation": "false",
+                    "googAutoGainControl": "false",
+                    "googNoiseSuppression": "false",
+                    "googHighpassFilter": "false"
+                },
+                "optional": []
+            },
+        }, gotStream, function(e) {
+            var msg = 'Error getting audio';
+            alert(msg);
+        });
+}
+
+function drawBuffer( width, height, context, data ) {
+    var step = Math.ceil( data.length / width );
+    var amp = height / 2;
+    context.fillStyle = "silver";
+    context.clearRect(0,0,width,height);
+    for(var i=0; i < width; i++){
+        var min = 1.0;
+        var max = -1.0;
+        for (var j=0; j<step; j++) {
+            var datum = data[(i*step)+j];
+            if (datum < min)
+                min = datum;
+            if (datum > max)
+                max = datum;
+        }
+        context.fillRect(i,(1+min)*amp,1,Math.max(1,(max-min)*amp));
+    }
+}
+
+window.addEventListener('load', initAudio );
+
+recorder.js
+var Recorder = function(source, cfg){
+    var config = cfg || {};
+    var bufferLen = config.bufferLen || 4096;
+    this.context = source.context;
+    if(!this.context.createScriptProcessor){
+        this.node = this.context.createJavaScriptNode(bufferLen, 2, 2);
+    } else {
+        this.node = this.context.createScriptProcessor(bufferLen, 2, 2);
+    }
+
+    var worker = new Worker(config.workerPath);
+    worker.postMessage({
+        command: 'init',
+        config: {
+            sampleRate: this.context.sampleRate
+        }
+    });
+    var recording = false,
+        currCallback;
+
+    this.node.onaudioprocess = function(e){
+        if (!recording) return;
+        worker.postMessage({
+            command: 'record',
+            buffer: [
+                e.inputBuffer.getChannelData(0),
+                e.inputBuffer.getChannelData(1)
+            ]
+        });
+    }
+
+    this.configure = function(cfg){
+        for (var prop in cfg){
+            if (cfg.hasOwnProperty(prop)){
+                config[prop] = cfg[prop];
+            }
+        }
+    }
+
+    this.record = function(){
+        recording = true;
+    }
+
+    this.stop = function(){
+        recording = false;
+    }
+
+    this.clear = function(){
+        worker.postMessage({ command: 'clear' });
+    }
+
+    this.getBuffers = function(cb) {
+        currCallback = cb || config.callback;
+        worker.postMessage({ command: 'getBuffers' })
+    }
+
+    this.exportWAV = function(cb, type){
+        currCallback = cb || config.callback;
+        type = type || config.type || 'audio/wav';
+        if (!currCallback) throw new Error('Callback not set');
+        worker.postMessage({
+            command: 'exportWAV',
+            type: type
+        });
+    }
+
+    this.exportMonoWAV = function(cb, type){
+        currCallback = cb || config.callback;
+        type = type || config.type || 'audio/wav';
+        if (!currCallback) throw new Error('Callback not set');
+        worker.postMessage({
+            command: 'exportMonoWAV',
+            type: type
+        });
+    }
+
+    worker.onmessage = function(e){
+        var blob = e.data;
+        currCallback(blob);
+    }
+
+    source.connect(this.node);
+    this.node.connect(this.context.destination); // if the script node is not connected to an output the "onaudioprocess" event is not triggered in chrome.
+
+
+    this.upload = function(soundBlob, filename){
+        var fd = new FormData();
+        fd.append('fname', filename);
+        fd.append('data', soundBlob);
+        var options = {
+            url : config.uploadUrl,
+            type : 'post',
+            data : fd,
+            processData : false,
+            contentType : false,
+            dataType : 'json',
+            success : function(obj) {
+                console.log(obj);
+            },
+            error : function(jqXHR, textStatus, errorThrown) {
+                alert(textStatus + "---" + errorThrown);
+            }
+
+        };
+        $.ajax(options);
+    }
+
+
+    this.setupDownload = function(blob, filename){
+        var url = (window.URL || window.webkitURL).createObjectURL(blob);
+        var link = document.getElementById("save");
+        link.href = url;
+        link.download = filename || 'output.wav';
+    }
+};
+

src/main/resources/static/xtba/sswp/css/dialog.css

+@charset "UTF-8";
+ul,li,p,div{margin:0;padding:0;list-style: none;}
+.cx-top table td {
+    height: 34px;
+    line-height: 34px;
+}
+.ar {
+    text-align: right;
+}
+.cx-top table .textbox{
+    display: inline-block;
+    height: 28px;
+    line-height: 28px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    width: 80%;
+}
+.cx-top table {width:100%;}
+.cx-top table input{
+    line-height: 26px;
+    margin-top: -4px;
+    width: 100%;
+    border:none;
+    outline-style: none;
+}
+.btn_a{
+    padding: 5px 12px;
+    color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    margin-right: 10px;
+    cursor: pointer;
+}
+.btn_a:hover{
+    color: #fff;
+}
+.btn_search{
+    background-color: #3692C6;
+    border-color: #217cb1;
+}
+.btn_search:hover{
+    background-color: #217cb1;
+}
+.btn_empty{
+    background-color: #f60;
+    border-color: #d45602;
+}
+.btn_empty:hover{
+    background-color: #d45602;
+}
+.btn_add{
+    background-color: #3AB500;
+    border-color: #34B51E;
+}
+.btn_add:hover{
+    background-color: #3AB500;
+}
+.cx-bottom{padding:10px;}
+.selected{line-height: 28px;}
+.selected{color:red;}
+.jy-list{overflow: hidden;}
+.jy-list li{float: left;width:25%;line-height: 30px;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;}
+.sx-left,.sx-btn,.preview{float: left;height:335px;}
+.dialogclass{overflow: hidden;}
+.sx-btn{line-height: 40px;text-align:center;position: relative;}
+.sx-left{width:300px;border:1px solid #ccc;border-radius:10px;}
+.sx-btn{width:173px;}
+.preview{width:300px;border:1px solid #ccc;border-radius:10px;}
+.sx-btn .btn_a{
+    position: absolute;
+    top: 50%;
+    height: 24px;
+    left: 50%;
+    line-height: 24px;
+    margin-top: -42px;
+}
+.sx-btn .btn_search{margin-left: -63px;}
+.sx-btn .btn_empty{margin-left: 13px;}
\ No newline at end of file

src/main/resources/static/xtba/sswp/js/easyui-lang-zh_CN.js

+if ($.fn.pagination){
+	$.fn.pagination.defaults.beforePageText = '第';
+	$.fn.pagination.defaults.afterPageText = '共{pages}页';
+	$.fn.pagination.defaults.displayMsg = '显示{from}到{to},共{total}记录';
+}
+if ($.fn.datagrid){
+	$.fn.datagrid.defaults.loadMsg = '正在处理，请稍待。。。';
+}
+if ($.fn.treegrid && $.fn.datagrid){
+	$.fn.treegrid.defaults.loadMsg = $.fn.datagrid.defaults.loadMsg;
+}
+if ($.messager){
+	$.messager.defaults.ok = '确定';
+	$.messager.defaults.cancel = '取消';
+}
+$.map(['validatebox','textbox','passwordbox','filebox','searchbox',
+		'combo','combobox','combogrid','combotree',
+		'datebox','datetimebox','numberbox',
+		'spinner','numberspinner','timespinner','datetimespinner'], function(plugin){
+	if ($.fn[plugin]){
+		$.fn[plugin].defaults.missingMessage = '该输入项为必输项';
+	}
+});
+if ($.fn.validatebox){
+	$.fn.validatebox.defaults.rules.email.message = '请输入有效的电子邮件地址';
+	$.fn.validatebox.defaults.rules.url.message = '请输入有效的URL地址';
+	$.fn.validatebox.defaults.rules.length.message = '输入内容长度必须介于{0}和{1}之间';
+	$.fn.validatebox.defaults.rules.remote.message = '请修正该字段';
+}
+if ($.fn.calendar){
+	$.fn.calendar.defaults.weeks = ['日','一','二','三','四','五','六'];
+	$.fn.calendar.defaults.months = ['一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月'];
+}
+if ($.fn.datebox){
+	$.fn.datebox.defaults.currentText = '今天';
+	$.fn.datebox.defaults.closeText = '关闭';
+	$.fn.datebox.defaults.okText = '确定';
+	$.fn.datebox.defaults.formatter = function(date){
+		var y = date.getFullYear();
+		var m = date.getMonth()+1;
+		var d = date.getDate();
+		return y+'-'+(m<10?('0'+m):m)+'-'+(d<10?('0'+d):d);
+	};
+	$.fn.datebox.defaults.parser = function(s){
+		if (!s) return new Date();
+		var ss = s.split('-');
+		var y = parseInt(ss[0],10);
+		var m = parseInt(ss[1],10);
+		var d = parseInt(ss[2],10);
+		if (!isNaN(y) && !isNaN(m) && !isNaN(d)){
+			return new Date(y,m-1,d);
+		} else {
+			return new Date();
+		}
+	};
+}
+if ($.fn.datetimebox && $.fn.datebox){
+	$.extend($.fn.datetimebox.defaults,{
+		currentText: $.fn.datebox.defaults.currentText,
+		closeText: $.fn.datebox.defaults.closeText,
+		okText: $.fn.datebox.defaults.okText
+	});
+}
+if ($.fn.datetimespinner){
+	$.fn.datetimespinner.defaults.selections = [[0,4],[5,7],[8,10],[11,13],[14,16],[17,19]]
+}

src/main/resources/static/xtba/ssxdwp/css/dialog.css

+@charset "UTF-8";
+ul,li,p,div{margin:0;padding:0;list-style: none;}
+.cx-top table td {
+    height: 34px;
+    line-height: 34px;
+}
+.ar {
+    text-align: right;
+}
+.cx-top table .textbox{
+    display: inline-block;
+    height: 28px;
+    line-height: 28px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    width: 80%;
+}
+.cx-top table {width:100%;}
+.cx-top table input{
+    line-height: 26px;
+    margin-top: -4px;
+    width: 100%;
+    border:none;
+    outline-style: none;
+}
+.btn_a{
+    padding: 5px 12px;
+    color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    margin-right: 10px;
+    cursor: pointer;
+}
+.btn_a:hover{
+    color: #fff;
+}
+.btn_search{
+    background-color: #3692C6;
+    border-color: #217cb1;
+}
+.btn_search:hover{
+    background-color: #217cb1;
+}
+.btn_empty{
+    background-color: #f60;
+    border-color: #d45602;
+}
+.btn_empty:hover{
+    background-color: #d45602;
+}
+.btn_add{
+    background-color: #3AB500;
+    border-color: #34B51E;
+}
+.btn_add:hover{
+    background-color: #3AB500;
+}
+.cx-bottom{padding:10px;}
+.selected{line-height: 28px;}
+.selected{color:red;}
+.jy-list{overflow: hidden;}
+.jy-list li{float: left;width:25%;line-height: 30px;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;}
+.sx-left,.sx-btn,.preview{float: left;height:335px;}
+.dialogclass{overflow: hidden;}
+.sx-btn{line-height: 40px;text-align:center;position: relative;}
+.sx-left{width:300px;border:1px solid #ccc;border-radius:10px;}
+.sx-btn{width:173px;}
+.preview{width:300px;border:1px solid #ccc;border-radius:10px;}
+.sx-btn .btn_a{
+    position: absolute;
+    top: 50%;
+    height: 24px;
+    left: 50%;
+    line-height: 24px;
+    margin-top: -42px;
+}
+.sx-btn .btn_search{margin-left: -63px;}
+.sx-btn .btn_empty{margin-left: 13px;}
\ No newline at end of file

src/main/resources/static/xtba/ythcj/js/callhm.js

+"use strict"
+var _global;
+//简化document.getElementById方法
+function BOX$(i) {
+	return document.getElementById(i)
+}
+function getIrisPage(w,h,params,url){
+	 new Mysysbox({
+			width: w,
+			height: h,
+			url:url,
+			params: params
+		});
+}
+//简化document.createElement方法
+function BOXLAYER$(i) {
+	return document.createElement(i)
+}
+
+function extend(o, n, override) {
+	for(var key in n) {
+		if(n.hasOwnProperty(key) && (!o.hasOwnProperty(key) || override)) {
+			o[key] = n[key];
+		}
+	}
+	return o;
+}
+function onclose(boxclose,boxshade,boxiframe,iframe) {
+	boxclose.onclick = function() {
+		iframe.contentWindow.postMessage("gbcj",'*');
+		setTimeout(function(){boxshade.parentNode.removeChild(boxshade);
+	 	boxiframe.parentNode.removeChild(boxiframe);},100)
+	}
+}
+function Mysysbox(options) {
+	this._initial(options);
+}
+Mysysbox.prototype = {
+	constructor: this,
+	_initial: function(options) {
+		var par = {
+		};
+		this.par = extend(par, options, true);
+		this.hasClsss = function(elements, cName) {
+			return !!elements.className.match(new RegExp("(\\s|^)" + cName + "(\\s|$)"));
+		}
+		this.show(this.par);
+	},
+	show: function(callback) {
+		var _this = this;
+		var  boxiframe,layercontent;
+		var w = callback.width,
+			h = callback.height,			
+			params=callback.params,	
+			url=callback.url;
+		 var boxshade=BOXLAYER$('div');
+		 boxshade.setAttribute("style",'position:fixed; _position:absolute; pointer-events: auto;top:0; left:0; width:100%; height:100%; _height:expression(document.body.offsetHeight+"px");z-index: 19891015;background-color: rgb(0, 0, 0);opacity: 0.8;');
+		 document.body.appendChild(boxshade);
+		  boxiframe=BOXLAYER$('div');
+		 var t = (this.height() -h) / 2;
+		 t = t < 10 ? 10 : t;
+		var top = (t+ this.top()) + 'px';
+		var left = (this.width() / 2) - (w / 2) + 'px';
+		w=w ? w + 'px' : 'auto';
+		h=h ? h + 'px' : 'auto';
+		 boxiframe.setAttribute("style","margin: 0;padding: 0;background-color: #fff;border-radius: 2px;box-shadow: 1px 1px 50px rgba(0,0,0,.3);position: fixed;pointer-events: auto;z-index: 19891016; width:"+w+"; height: "+h+"; top: "+top+"; left: "+left+";");
+		 layercontent=BOXLAYER$('div');
+		 layercontent.setAttribute("style","position:relative;");
+		 boxiframe.appendChild(layercontent);
+		 var layersetwin=BOXLAYER$('span');
+		 layersetwin.setAttribute("style"," position: absolute;right: 10px;*right: 0;top: 0px;font-size: 0;line-height: initial");
+		 var boxclose=BOXLAYER$('a');
+		 boxclose.setAttribute("style","width:30px;font-size:28px; text-decoration:none; cursor: pointer");
+		 boxclose.innerHTML="×";
+		 layersetwin.appendChild(boxclose);
+		 boxiframe.appendChild(layersetwin);
+		 document.body.appendChild(boxiframe);
+		 var frame="<iframe  id='irisIframe'  src='"+url+"' style='height:"+h+";width:"+w+";'   frameborder='0'  scrolling='auto' allowtransparency='true'></iframe>";
+			layercontent.innerHTML = frame;
+			var iframe=document.getElementById("irisIframe");
+		      if(iframe.attachEvent){//ie
+	        	   iframe.attachEvent("onreadystatechange", function() {
+	        	   if (iframe.readyState === "complete" || iframe.readyState == "loaded") {
+	        		   iframe.contentWindow.postMessage(params,'*');
+	        		   onclose(boxclose,boxshade,boxiframe,iframe);
+	        	   }
+	        	   });
+	       	   }else{
+	        	   iframe.addEventListener("load", function() {
+		        	   iframe.contentWindow.postMessage(params,'*');
+		        	   onclose(boxclose,boxshade,boxiframe,iframe);
+	        	   }, false);
+	       	   }
+	},
+	top: function() {
+		return document.documentElement.offsetTop || document.body.offsetTop
+	},
+	width: function() {
+		return self.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+	},
+	height: function() {
+		return self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+
+	}
+};
+_global = (function() {
+	return this || (0, eval)('this');
+}());
+if(typeof module !== "undefined" && module.exports) {
+	module.exports = Mysysbox;
+} else if(typeof define === "function" && define.amd) {
+	define(function() {
+		return Mysysbox;
+	});
+} else {
+	!('Mysysbox' in _global) && (_global.Mysysbox = Mysysbox);
+}
\ No newline at end of file

src/main/resources/static/zjcj/css/layer/mobile/layer.js

+/*! layer mobile-v2.0.0 Web弹层组件 MIT License  http://layer.layui.com/mobile  By 贤心 */
+ ;!function(e){"use strict";var t=document,n="querySelectorAll",i="getElementsByClassName",a=function(e){return t[n](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var n in e)t[n]=e[n];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var r=0,o=["layui-m-layer"],c=function(e){var t=this;t.config=l.extend(e),t.view()};c.prototype.view=function(){var e=this,n=e.config,s=t.createElement("div");e.id=s.id=o[0]+r,s.setAttribute("class",o[0]+" "+o[0]+(n.type||0)),s.setAttribute("index",r);var l=function(){var e="object"==typeof n.title;return n.title?'<h3 style="'+(e?n.title[1]:"")+'">'+(e?n.title[0]:n.title)+"</h3>":""}(),c=function(){"string"==typeof n.btn&&(n.btn=[n.btn]);var e,t=(n.btn||[]).length;return 0!==t&&n.btn?(e='<span yes type="1">'+n.btn[0]+"</span>",2===t&&(e='<span no type="0">'+n.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(n.fixed||(n.top=n.hasOwnProperty("top")?n.top:100,n.style=n.style||"",n.style+=" top:"+(t.body.scrollTop+n.top)+"px"),2===n.type&&(n.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(n.content||"")+"</p>"),n.skin&&(n.anim="up"),"msg"===n.skin&&(n.shade=!1),s.innerHTML=(n.shade?"<div "+("string"==typeof n.shade?'style="'+n.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(n.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(n.skin?"layui-m-layer-"+n.skin+" ":"")+(n.className?n.className:"")+" "+(n.anim?"layui-m-anim-"+n.anim:"")+'" '+(n.style?'style="'+n.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+n.content+"</div>"+c+"</div></div></div>",!n.type||2===n.type){var d=t[i](o[0]+n.type),y=d.length;y>=1&&layer.close(d[0].getAttribute("index"))}document.body.appendChild(s);var u=e.elem=a("#"+e.id)[0];n.success&&n.success(u),e.index=r++,e.action(n,u)},c.prototype.action=function(e,t){var n=this;e.time&&(l.timer[n.index]=setTimeout(function(){layer.close(n.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),layer.close(n.index)):e.yes?e.yes(n.index):layer.close(n.index)};if(e.btn)for(var s=t[i]("layui-m-layerbtn")[0].children,r=s.length,o=0;o<r;o++)l.touch(s[o],a);if(e.shade&&e.shadeClose){var c=t[i]("layui-m-layershade")[0];l.touch(c,function(){layer.close(n.index,e.end)})}e.end&&(l.end[n.index]=e.end)},e.layer={v:"2.0",index:r,open:function(e){var t=new c(e||{});return t.index},close:function(e){var n=a("#"+o[0]+e)[0];n&&(n.innerHTML="",t.body.removeChild(n),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[i](o[0]),n=0,a=e.length;n<a;n++)layer.close(0|e[0].getAttribute("index"))}},"function"==typeof define?define(function(){return layer}):function(){var e=document.scripts,n=e[e.length-1],i=n.src,a=i.substring(0,i.lastIndexOf("/")+1);n.getAttribute("merge")||document.head.appendChild(function(){var e=t.createElement("link");return e.href=a+"need/layer.css?2.0",e.type="text/css",e.rel="styleSheet",e.id="layermcss",e}())}()}(window);
\ No newline at end of file

src/main/resources/static/zjcj/css/layer/mobile/need/layer.css

+.layui-m-layer{position:relative;z-index:19891014}.layui-m-layer *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.layui-m-layermain,.layui-m-layershade{position:fixed;left:0;top:0;width:100%;height:100%}.layui-m-layershade{background-color:rgba(0,0,0,.7);pointer-events:auto}.layui-m-layermain{display:table;font-family:Helvetica,arial,sans-serif;pointer-events:none}.layui-m-layermain .layui-m-layersection{display:table-cell;vertical-align:middle;text-align:center}.layui-m-layerchild{position:relative;display:inline-block;text-align:left;background-color:#fff;font-size:14px;border-radius:5px;box-shadow:0 0 8px rgba(0,0,0,.1);pointer-events:auto;-webkit-overflow-scrolling:touch;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@-webkit-keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}.layui-m-anim-scale{animation-name:layui-m-anim-scale;-webkit-animation-name:layui-m-anim-scale}@-webkit-keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}.layui-m-anim-up{-webkit-animation-name:layui-m-anim-up;animation-name:layui-m-anim-up}.layui-m-layer0 .layui-m-layerchild{width:90%;max-width:640px}.layui-m-layer1 .layui-m-layerchild{border:none;border-radius:0}.layui-m-layer2 .layui-m-layerchild{width:auto;max-width:260px;min-width:40px;border:none;background:0 0;box-shadow:none;color:#fff}.layui-m-layerchild h3{padding:0 10px;height:60px;line-height:60px;font-size:16px;font-weight:400;border-radius:5px 5px 0 0;text-align:center}.layui-m-layerbtn span,.layui-m-layerchild h3{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-m-layercont{padding:50px 30px;line-height:22px;text-align:center}.layui-m-layer1 .layui-m-layercont{padding:0;text-align:left}.layui-m-layer2 .layui-m-layercont{text-align:center;padding:0;line-height:0}.layui-m-layer2 .layui-m-layercont i{width:25px;height:25px;margin-left:8px;display:inline-block;background-color:#fff;border-radius:100%;-webkit-animation:layui-m-anim-loading 1.4s infinite ease-in-out;animation:layui-m-anim-loading 1.4s infinite ease-in-out;-webkit-animation-fill-mode:both;animation-fill-mode:both}.layui-m-layerbtn,.layui-m-layerbtn span{position:relative;text-align:center;border-radius:0 0 5px 5px}.layui-m-layer2 .layui-m-layercont p{margin-top:20px}@-webkit-keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}@keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}.layui-m-layer2 .layui-m-layercont i:first-child{margin-left:0;-webkit-animation-delay:-.32s;animation-delay:-.32s}.layui-m-layer2 .layui-m-layercont i.layui-m-layerload{-webkit-animation-delay:-.16s;animation-delay:-.16s}.layui-m-layer2 .layui-m-layercont>div{line-height:22px;padding-top:7px;margin-bottom:20px;font-size:14px}.layui-m-layerbtn{display:box;display:-moz-box;display:-webkit-box;width:100%;height:50px;line-height:50px;font-size:0;border-top:1px solid #D0D0D0;background-color:#F2F2F2}.layui-m-layerbtn span{display:block;-moz-box-flex:1;box-flex:1;-webkit-box-flex:1;font-size:14px;cursor:pointer}.layui-m-layerbtn span[yes]{color:#40AFFE}.layui-m-layerbtn span[no]{border-right:1px solid #D0D0D0;border-radius:0 0 0 5px}.layui-m-layerbtn span:active{background-color:#F6F6F6}.layui-m-layerend{position:absolute;right:7px;top:10px;width:30px;height:30px;border:0;font-weight:400;background:0 0;cursor:pointer;-webkit-appearance:none;font-size:30px}.layui-m-layerend::after,.layui-m-layerend::before{position:absolute;left:5px;top:15px;content:'';width:18px;height:1px;background-color:#999;transform:rotate(45deg);-webkit-transform:rotate(45deg);border-radius:3px}.layui-m-layerend::after{transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}body .layui-m-layer .layui-m-layer-footer{position:fixed;width:95%;max-width:100%;margin:0 auto;left:0;right:0;bottom:10px;background:0 0}.layui-m-layer-footer .layui-m-layercont{padding:20px;border-radius:5px 5px 0 0;background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn{display:block;height:auto;background:0 0;border-top:none}.layui-m-layer-footer .layui-m-layerbtn span{background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn span[no]{color:#FD482C;border-top:1px solid #c2c2c2;border-radius:0 0 5px 5px}.layui-m-layer-footer .layui-m-layerbtn span[yes]{margin-top:10px;border-radius:5px}body .layui-m-layer .layui-m-layer-msg{width:auto;max-width:90%;margin:0 auto;bottom:-150px;background-color:rgba(0,0,0,.7);color:#fff}.layui-m-layer-msg .layui-m-layercont{padding:10px 20px}
\ No newline at end of file

src/main/resources/static/zjcj/css/zjcj.css

+@charset "UTF-8";
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-family:"ËÎÌå","serif","sans-serif","cursive","fantasy","monospace","Times New Roman",Georgia,Serif;
+  	font-size: 12px;
+}
+ul,
+li {
+    font-size: 12px;
+    margin: 0px;
+    padding: 0px;
+    list-style-type: none;
+    line-height: 24px;
+}
+.lf{float:left;}
+.rg{float:right;}
+/*****header*****/
+#header {
+    width: 100%;
+    height: 80px;
+    line-height: 80px;
+    background: url(../images/banner.jpg);
+    color: #fff;
+    position: relative;
+}
+.h_icon {
+    display: inline-block;
+    float: left;
+    width: 60px;
+    height: 100%;
+    text-align: center;
+    line-height: 60px;
+    background: #EC704C;
+    color: #fff;
+    margin-left: 50px;
+}
+.h_triangle {
+    float: left;
+    width: 0px;
+    height: 0px;
+    font-size: 0;
+    line-height: 0;
+    overflow: hidden;
+    border-width: 8px;
+    border-style: dashed dashed solid dashed;
+    border-color: transparent transparent transparent #EC704C;
+    position: relative;
+    top: 50%;
+    margin-top: -7px;
+}
+.h_title {
+    float: left;
+    width:268px;
+    display: inline-block;
+    height: 41px;
+    line-height: 41px;
+    margin-left: 24px;
+    margin-top: 15px;
+    background: url(../images/title-bjzycx.png);
+}
+.color1{color:#ec704c;}
+/************menu*************/
+#menu{width:100%;height:30px;background: #053d76;}
+.menu_list{float:left;color:#fff;height:100%;line-height: 30px;margin-left:111px;}
+.menu_list li{float:left;margin:0 18px;height:100%;line-height: 30px;font-weight:600;}
+.menu_list li a{display: inline-block;position:relative;width:100%;height:100%;line-height: 30px;cursor: pointer;}
+.act{border-bottom:1.5px solid #F59D8E;color: #f59d8e;}
+.bot_triangle{width: 0px;height: 0px;*width: 8px;   *height: 8px;font-size: 0;line-height: 0; overflow: hidden;border-width: 8px;border-style: dashed dashed solid dashed;border-color:#EC704C transparent transparent transparent;position:absolute;bottom:-16px;left:50%;margin-left: -4px;}
+/***************content_box1**************/
+.condition{margin-bottom:14px;}
+.content_box{padding:18px;margin:10px auto 15px;width:91%;box-shadow:2px 2px 10px #909090;background:#e8e5e4;}
+.cx_t{width:100%;height:19px;line-height:19px;border-bottom:1px dashed #ccc;}
+.cx_t span{font-size: 12px;font-weight: 600;margin:0 10px;}
+table .td_r{text-align: right;padding-right: 15px;background-image: linear-gradient(to bottom,#cbdff1 0,#4aa9e1 100%);background-repeat: repeat-x;color:#fff;}
+table .td_rc{text-align: right;color:#122ee2;}
+table .td_c{text-align: center;}
+.common_t>tr,.common_t>tbody>tr{border-bottom:1px dashed #ccc;}
+.cx_table_tj td{height:40px;line-height: 40px;}
+.cx_table_tj td input,.cx_table_tj td select{margin: 0px;padding:0 8px;height: 24px;line-height: 24px;width: 210px;white-space: normal;vertical-align: top;outline-style: none;resize: none;-moz-border-radius: 5px 5px 5px 5px;-webkit-border-radius: 5px 5px 5px 5px;border-radius: 5px 5px 5px 5px;border: 1px solid #ccc;background-color: #fff;vertical-align: middle;display: inline-block;overflow: hidden;white-space: nowrap;}
+.cx_table_tj td select{width:228px;}
+.cx_table_tj td input[type="radio"]{width:16px;height:16px;margin:0 5px;}
+.btn_cx{padding: 5px 12px;margin-left:16px;border: 1px solid #245580;background-color: #337ab7;color: #fff;background-image: linear-gradient(to bottom,#337ab7 0,#265a88 100%);background-repeat: repeat-x;text-shadow: 0 -1px 0 rgba(0,0,0,.2);box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);border-radius: 4px;font-weight: normal;font-size: 12px;cursor: pointer;}
+.btn_cx:hover {background: #2c689d;}
+.btn_qkcxtj{margin-left:16px;padding: 5px 12px;border: 1px solid #b92c28;background-color: #d9534f;color: #fff;background-image: linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);background-repeat: repeat-x;text-shadow: 0 -1px 0 rgba(0,0,0,.2);box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);border-radius: 4px;font-weight: normal;font-size: 12px;cursor: pointer;}
+.btn_qkcxtj:hover {background: #c12e2a;}
+.datagrid-btable tr td:nth-child(1) a{cursor: pointer;margin:0 4px;}
+.icon_expend {
+    width: 58px;font-size: 12px;
+    border: 1px solid #EAEAEA;
+    background-color: #EAEAEA;
+    color: #000;
+    line-height: 21px;
+    margin: 3px 10px 2px 0px;
+    border-radius: 1000px;
+    -webkit-user-select: none;
+    padding: 0 8px;
+    float: right;
+    cursor: pointer;
+}
+.icon-span{display:inline-block;float:right;margin: 0 20px 10px;}
+.export-excel{    
+	background: url(../images/excel.png) no-repeat scroll 0 4px transparent;
+    color: #359FF1;
+    text-decoration: none;
+    line-height: 16px;
+    padding-top: 5px;
+    padding-left: 19px;
+    font-size: 12px;
+    background-size: 15px;
+    margin-right:8px;
+    cursor: pointer;
+}
+.easyui-div{height:24px;line-height: 24px;}
+/*********************/
+/* .ellipsis{overflow: hidden;text-overflow:ellipsis;white-space: nowrap;} */
+.datagrid-cell{text-overflow:ellipsis;}
+
+/* 人员信息 */
+.photos_wrap{
+    display: flex;
+    justify-content: center;
+}
+.photo_wrap{
+    margin-left: 20px;
+}
+.tab_wrap{
+    position: relative;
+    margin-top: 15px;
+}
+.tab1_ul{
+    position: absolute;
+    top: -38px;
+    left: 0px;
+    box-shadow: 1px -4px 10px #e5e5e5;
+}
+.tab1_lis{
+    float: left;
+    /* border: 1px solid #ccc; */
+    /* border-bottom: none; */
+    font-size: 14px;
+    margin-left: -1px;
+    padding: 8px 26px;
+    background:#f9f8f8;/*-webkit-linear-gradient(#b7b3b3,#b1b1b1);    */
+    color: #000;
+    box-shadow: -1px -3px 5px #d1d1d1;
+    cursor: pointer;
+    position: relative;
+}
+.tab1_lis.active{
+    background: #e8e5e4;
+    color: #2578b9;
+}
+.tab1_lis:first-child{
+    border-radius: 5px 0 0 0;
+}
+.tab1_lis:last-child{
+    border-radius: 0 5px 0 0;
+}
+.bot,.checklist .bot{
+    display:inline-block;
+    padding:1px 3px;
+    border-radius:7px;
+    background:#FF9900;
+    position:relative;
+    line-height:16px;
+    /* top:-7px; */
+    /* left:2px; */
+    color:#fff;
+    height: auto;
+    margin-left: 5px;
+    border: none;
+}
+.condition table a{
+    text-decoration: none;
+}
+.st{
+    margin-left: 220px;
+}
+#photo-dialog img{
+    width: 300px;
+    height:auto;
+}
+.panel.window{
+    padding-bottom: 30px;
+}
+.rybjxx-dialog_div{
+    padding: 10px;
+}
+.rybjxx-dialog_div p{
+    text-indent: 2em;
+    line-height: 28px;
+}
+.swxx_div td i{
+    font-size: 18px;
+}
\ No newline at end of file