Skip to content

H
hnxtbaboot
Commit ccdb9eec by e
Options

质量抽查模块bug修改

parent 93231e71
Showing with 95 additions and 28 deletions
src/main/java/com/founder/service/AfisQualityService.java
......@@ -22,6 +22,8 @@ public interface AfisQualityService extends IService<AfisQualityCk> {
public EasyUIPage queryZlccPage(EasyUIPage page, AfisQualityCk entity,int ccfs,String rwbh,String flg);
public List<AfisQualityCk> queryZljcList(AfisQualityCk entity);
public List<AfisQualityCk> queryZlccList(AfisQualityCk entity,String rwbh);
/**
* 指纹质量检查保存函数
* @param afisQualityCk
......
src/main/java/com/founder/service/impl/AfisQualityServiceImpl.java
......@@ -73,6 +73,7 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
List<AfisQualityCk> afisQualityCks = mapper.queryZljcPageList(map);
return afisQualityCks;
}
@Override
public AfisQualityCk getAfisQuality(String szzwbh)
{
......@@ -169,6 +170,21 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
}
return result;
}
@Override
public List<AfisQualityCk> queryZlccList(AfisQualityCk entity,String rwbh) {
Map<String, Object> map = new HashMap<>();
map.put("begin", "0");
map.put("end", "10000");
map.put("sort", "LRSJ");
map.put("order", "desc");
map.put("rwbh",rwbh);
map.put("ccbh",entity.getCcbh());
map.put("entity", entity);
List<AfisQualityCk> afisQualityCks = mapper.queryZlccWcPageList(map);
return afisQualityCks;
}
@Override
public EasyUIPage queryZlccPage(EasyUIPage page, AfisQualityCk entity,int ccfs,String rwbh,String flg) {
Map<String, Object> map = new HashMap<>();
......
src/main/resources/static/rygl/js/catchimg.js
......@@ -28,6 +28,7 @@ function demo_getDataURL()
{
var url=clipimg.getDataURL(450);
document.querySelector('.dialog_clipped_img').src=url;
savePic();
}
function demo_good()
......
src/main/resources/static/rygl/js/clipimg.js
......@@ -76,7 +76,6 @@ function Clipimg(element, options){
//获取截图对应的canvas和context
function getcancon(clipSize)
{
debugger;
clipSize= clipSize || 256;
var ratio_canvas_clipBox=clipSize/clipbox.clientWidth;
......@@ -108,7 +107,6 @@ function Clipimg(element, options){
//获取截取的图片的原始像素级数据
function getImageData(clipeSize)
{
debugger;
clipSize= clipSize || 256;
var cancon=getcancon(clipSize);
......@@ -121,7 +119,6 @@ function Clipimg(element, options){
//获取截取的图片的URL
function getDataURL(clipSize, format, quality)
{
debugger;
clipSize= clipSize || 256;
format= format || 'image/png';
quality= quality || 0.5;
......@@ -144,7 +141,6 @@ function Clipimg(element, options){
//获取截取的图片的二进制表示
function getBlob(clipSize, format, quality)
{
debugger;
clipSize= clipSize || 256;
format= format || 'image/png';
quality= quality || 0.5;
......
src/main/resources/templates/home.html
......@@ -71,10 +71,12 @@
<li id="H10A05">
<a onclick="zlcc()">指纹质量抽查</a>
</li>
<!--
<li id="H10A03">
<a onclick="ryxxgl()">人员信息管理</a>
</li>
<li id="H10A04">
-->
<li id="H10A03">
<a onclick="swtzbdfk()">人员生物特征比对反馈</a>
</li>
</ul>
......
src/main/resources/templates/rygl/addryxx.html
......@@ -1393,7 +1393,7 @@
<input type="file" class="input" id="R_ZMZP_File" style="width: 185px;" name="R_ZMZP_File" size="3" onchange="showpic2(this)" />
<!-- <input type="file" onchange="previewImage2(this)" /> -->
<div class="btn-group btn-group-sm" style=" margin-left: 32px; margin-top: 8px;">
<button type="button" class="btn btn-primary" onclick="getRxbclj('2')"><i class="fa fa-hand-lizard-o"></i> 采集 </button>
<button type="button" class="btn btn-primary" onclick="pz('2')"><i class="fa fa-hand-lizard-o"></i> 采集 </button>
<button type="button" class="btn btn-danger" onclick="catchimg('2')"><i class="fa fa-crop"></i> 截图 </button>
</div>
</div>
......@@ -1717,7 +1717,7 @@
</div>
</form>
</div>
<!--
<div id="w" class="easyui-dialog dialog" title="摄像头" data-options="modal:true,closed:true,collapsible:false,minimizable:false,maximizable:false" style="width:1100px;height:720px;padding:10px;max-height:720px;overflow-y:auto;display:none;">
<div class="dialogclass">
<div class="sx-left">
......@@ -1734,7 +1734,6 @@
</div>
</div>
</div>
-->
<div class="foot">
......@@ -2199,7 +2198,7 @@ function catchimg(zpbw){
return;
}
$("#zpbw").val(zpbw);
var dialogId='w';
var dialogId='jt';
openUrlForm({
id:dialogId,
url:'catchimg',
......@@ -2208,20 +2207,20 @@ function catchimg(zpbw){
height:720,
cache:false,
onClose:function(){
alert(1)
//alert(1);
}
},[
{
//确定生成表头配置信息,并重新加载表格数据
text:'确定',
text:'完成',
handler:function(){
$('#w').dialog('close');
$('#jt').dialog('close');
$(document).unbind("scroll");
}
},{
text:'取消',
handler:function(){
$('#w').dialog('close');
$('#jt').dialog('close');
$(document).unbind("scroll");
}
}
......
src/main/resources/templates/rygl/demo.html
......@@ -5,7 +5,6 @@
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
<title>clipimg</title>
<script type="text/javascript" src="static/rygl/js/clipimg.js"></script>
<script type="text/javascript" src="static/easyui-window/js/jquery.easyui.min.js"></script>
<link rel="stylesheet" type="text/css" href="static/easyui-window/css/easyui.css">
<link rel="stylesheet" type="text/css" href="static/easyui-window/css/icon.css">
<script type="text/javascript" src="static/js/function_tck.js"></script>
......@@ -32,15 +31,11 @@
window.parent.document.getElementById("ycmzpflag").value="1";
window.parent.document.getElementById("R_YCMZP_File").value="";
}
$('#w').dialog('close');
$(document).unbind("scroll");
//window.location.href="about:blank";
//window.close();
}
</script>
</head>
<body>
<div id="w" class="dialog" style="height: 100%;width: 100%;">
<div id="jt" class="dialog" style="height: 100%;width: 100%;">
<div class="dialog_mask"></div>
<div class="dialog_wrap" style="height: 100%;width: 100%;margin-top: 0px;">
<div class="dialog_container_clip" style="height: 100%;width: 100%;margin-top: 0px;">
......@@ -51,8 +46,8 @@
<div class="dialog_center_div dialog_buttons">
<input id="dialog_picture" onchange="demo_loadFile(this.files)" type="file" style="position:absolute; z-index: -1; visibility: hidden;" accept="image/*" />
<label for="dialog_picture" class="dialog_button">上传</label><!-- 这个label对应上面的input，这是为了不显示input的文件名和按钮 -->
<div id="dialog_ok" onclick="demo_getDataURL()" class="dialog_button">截图</div>
<div onclick="savePic()" class="dialog_button">完成</div>
<div id="dialog_ok" onclick="demo_getDataURL()" class="dialog_button">截取</div>
<!--<div onclick="savePic()" class="dialog_button">完成</div>-->
</div>
<div class="dialog_center_div dialog_buttons">
<div id="dialog_zoomIn" onclick="demo_zoomIn()" class="dialog_button">放大</div>
......
src/main/resources/templates/rygl/sxt.html
......@@ -21,7 +21,7 @@
<body style="overflow: auto">
<!--表格设置面板-->
<div id="w" class="dialogclass">
<div id="jt" class="dialogclass">
<div class="sx-left">
<div class="dialog_mask"></div>
<div class="dialog_wrap">
......
src/main/resources/templates/zlcc/rwlist.html
......@@ -154,7 +154,7 @@
var jcfs=row.jcfs;
var ccsjQssjStr=row.ccsjQssjStr;
var ccsjJzsjStr=row.ccsjJzsjStr;
return "<a href='javascript:void(0)' onclick='zlcc(\"" + xxbh + "\",\"2\")'>"+rwbh+"</a>";;
return "<a href='javascript:void(0)' onclick='zlcc(\"" + xxbh + "\",\"3\")'>"+rwbh+"</a>";;
}},
{title:"任务时间",field:"ccsjQssjStr",align:'center',width:285,formatter:function(val,row,index){
var ccsjQssjStr=row.ccsjQssjStr;
......
src/main/resources/templates/zlcc/zlccxq.html
......@@ -32,7 +32,7 @@
</header>
<article class="main-cen-box">
<div class="cxtj">
<input type="hidden" id="flg" name="flg" value="2"/>
<input type="hidden" id="flg" name="flg" th:value="${flg}"/>
<input type="hidden" id="ccsjQssj" name="ccsjQssj" th:value="${ccrw.ccsjQssjStr}"/>
<input type="hidden" id="ccsjJzsj" name="ccsjJzsj" th:value="${ccrw.ccsjJzsjStr}"/>
<input type="hidden" id="ccdw" name="ccdw" th:value="${ccrw.ccdw}"/>
......@@ -50,7 +50,7 @@
<td colspan="6" style="height:20px;"></td>
</tr>
<tr>
<td class="ar" width="13.3%">采集时间：</td>
<td class="ar" width="13.3%">抽查时间：</td>
<td width="20%">
<span class="textbox" th:text="${ccrw.ccsjQssjStr}">
</span>
......@@ -60,14 +60,19 @@
<span class="textbox" th:text="${ccrw.ccsjJzsjStr}">
</span>
</td>
<td class="ar" width="13.3%">采集单位：</td>
<td class="ar" width="13.3%">抽查单位：</td>
<td width="20%">
<span class="textbox" th:text="${ccrw.ccdw}">
<span class="textbox" id = "ccdwstr" th:text="${ccrw.ccdw}">
</span>
</td>
</tr>
<tr>
<td colspan="6" style="height:20px;"></td>
<td colspan="6">
<div style="width: 100%; float: left; text-align: center;height: 44px;line-height: 44px;">
<a class="btn_a btn_search" onclick="doExportExcel()">导出</a>
</div>
</td>
</tr>
</tbody>
</table>
......@@ -336,6 +341,52 @@
$("form[name='zlccForm']") .find("input").val('');
}
$(function(){
var ccdw = $("#ccdw").val();
var rstStr="";
if(ccdw.indexOf('4301') >= 0){
rstStr += ",长沙市公安局";
}
if(ccdw.indexOf('4302') >= 0){
rstStr += ",株洲市公安局";
}
if(ccdw.indexOf('4303') >= 0){
rstStr += ",湘潭市公安局";
}
if(ccdw.indexOf('4304') >= 0){
rstStr += ",衡阳市公安局";
}
if(ccdw.indexOf('4305') >= 0){
rstStr += ",邵阳市公安局";
}
if(ccdw.indexOf('4306') >= 0){
rstStr += ",岳阳市公安局";
}
if(ccdw.indexOf('4307') >= 0){
rstStr += ",常德市公安局";
}
if(ccdw.indexOf('4308') >= 0){
rstStr += ",张家界市公安局";
}
if(ccdw.indexOf('4309') >= 0){
rstStr += ",益阳市公安局";
}
if(ccdw.indexOf('4310') >= 0){
rstStr += ",郴州市公安局";
}
if(ccdw.indexOf('4311') >= 0){
rstStr += ",永州市公安局";
}
if(ccdw.indexOf('4312') >= 0){
rstStr += ",怀化市公安局";
}
if(ccdw.indexOf('4313') >= 0){
rstStr += ",娄底市公安局";
}
if(ccdw.indexOf('4331') >= 0){
rstStr += ",湘西自治州公安局";
}
$("#ccdwstr").text(rstStr.substring(1));
doQuery();
});
function openNew(rybh,szzwbh,cjsj){
......@@ -547,6 +598,11 @@
}
});
}
function doExportExcel(){
var ccbh = $("#ccbh").val();
window.location.href="/exportExcelToZlcc?ccbh="+ccbh;
}
</script>
</body>
......
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