Skip to content

H
hnxtbaboot
Commit 7c9906c8 by 焦荣
Options

添加采集设备档案功能和获取设备重量名称bug

parent 9ccfad6d
Showing with 92 additions and 59 deletions
src/main/java/com/founder/cjqx/controller/SysClientVpController.java
......@@ -100,13 +100,18 @@ public class SysClientVpController {
return sysClientVpService.deleteClientVp(id);
}
/*
审批设备
*/
//设备审批
@GetMapping("/spClientVp/{id}")
@ResponseBody
public XzxtRestResult spClientVp(@PathVariable("id") String id, @RequestParam(name = "spzt") String spzt,HttpServletRequest request){
User user =(User)request.getSession().getAttribute("User");
return sysClientVpService.spClientVp(id,spzt,user);
}
//查看详情
@GetMapping("/DetailVp/{id}")
public String getDetailVp(@PathVariable("id") String id, Model model){
model.addAttribute("ClientVp",sysClientVpService.SelectClientVp(id).getData());
return "cjqx/files";
}
}
src/main/resources/mapper/SysClientVpMapper.xml
......@@ -61,7 +61,7 @@
<sql id="Base_Column_List2" >
ID, VID, PID, SCBZ, LRSJ,IP,MAC,IFYTHCJY,
ZWCJY_NAME as ZWCJYNAME,ZWCJY_CODE as ZWCJYCODE,
EDZYDQ_NAME as EDZYDQNAME,EDZYDQ_CODE as EDZYDQCODE,SGTZZCCJY_NAME as SGTZZCCJYNAME,SGTZZCCJY_CODE as SGTZZCCJYCODE,
EDZYDQ_NAME as EDZYDQNAME,EDZYDQ_CODE as EDZYDQCODE,SGTZZCCJY_NAME as sftzzzcjyname,SGTZZCCJY_CODE as sftzzzcjycode,
SJCJY_NAME as SJCJYNAME,SJCJY_CODE as SJCJYCODE,ZJCJY_NAME as ZJCJYNAME,ZJCJY_CODE as ZJCJYCODE,
HMCJY_NAME as HMCJYNAME,HMCJY_CODE as HMCJYCODE,SWCJY_NAME as SWCJYNAME,SWCJY_CODE as SWCJYCODE,
BJCJY_NAME as BJCJYNAME,BJCJY_CODE as BJCJYCODE,GPY_NAME as GPYNAME,GPY_CODE as GPYCODE,
......
src/main/resources/templates/cjqx/files.html
......@@ -31,134 +31,130 @@
<table style="width:100%;border-collapse: collapse;table-layout: fixed;background-color: rgba(255,255,255,0.75);text-align:left;" class="cx_table_tj common_t">
<tr>
<td class="td_r" style="width:10%;">IP：</td>
<td style="width:15%;">
<span class="eclipse">192.196.2.115</span>
<td style="width:15%;" th:text="${ClientVp.ip}">
</td>
<td class="td_r" style="width:10%;">MAC：</td>
<td style="width:15%;">
<td style="width:15%;" th:text="${ClientVp.mac}">
<span class="eclipse">192.196.2.115</span>
</td>
<td class="td_r" style="width:10%;">是否一体化采集机：</td>
<td style="width:15%;">
<td style="width:15%;" th:text="${ClientVp.ifythcjy}">
<span class="eclipse">是</span>
</td>
<td class="td_r" style="width:10%;">采集设备类型：</td>
<td style="width:15%;">
<td class="td_r" >隶属单位：</td>
<td th:text="${ClientVp.ssdwname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否指纹采集仪：</td>
<td>
<td th:text="${ClientVp.ifzwcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">指纹采集仪品牌商：</td>
<td>
<td th:text="${ClientVp.zwcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否二代证阅读器：</td>
<td>
<td th:text="${ClientVp.ifedzydq}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">二代证阅读器型号：</td>
<td>
<td th:text="${ClientVp.edzydqname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否身高体重足长采集仪：</td>
<td>
<td th:text="${ClientVp.ifsftzzzcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">身高体重足长采集仪型号：</td>
<td>
<td th:text="${ClientVp.sftzzzcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否手机采集仪：</td>
<td>
<td th:text="${ClientVp.ifsjcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">手机采集仪品牌商：</td>
<td>
<td th:text="${ClientVp.sjcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否足迹采集仪：</td>
<td>
<td th:text="${ClientVp.ifzjcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">足迹采集仪品牌商：</td>
<td>
<td th:text="${ClientVp.zjcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否虹膜采集仪：</td>
<td>
<td th:text="${ClientVp.ifhmcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">虹膜采集仪：</td>
<td>
<td th:text="${ClientVp.hmcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否声纹采集：</td>
<td>
<td class="td_r" >是否声纹采集仪：</td>
<td th:text="${ClientVp.ifswcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">声纹采集仪：</td>
<td>
<td th:text="${ClientVp.swcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否笔迹采集仪：</td>
<td>
<td th:text="${ClientVp.ifbjcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
</td >
<td class="td_r">笔迹采集仪：</td>
<td>
<td th:text="${ClientVp.bjcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否高拍仪：</td>
<td>
<td th:text="${ClientVp.ifgpy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">高拍仪：</td>
<td>
<td th:text="${ClientVp.gpyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否银行卡采集仪：</td>
<td>
<td th:text="${ClientVp.ifyhkcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">银行卡采集仪：</td>
<td>
<td th:text="${ClientVp.yhkcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否DNA标签打印机：</td>
<td>
<td th:text="${ClientVp.ifdnabqdyj}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">DNA标签打印机：</td>
<td>
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >隶属单位：</td>
<td>
<td th:text="${ClientVp.dnabqdyjname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">责任民警：</td>
<td>
<td th:text="${ClientVp.zrmjname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >联系电话：</td>
<td>
<td th:text="${ClientVp.zrmjlxdh}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
......
src/main/resources/templates/cjqx/sbspglform.html
......@@ -222,7 +222,9 @@
json = JSON.stringify(data );
switch(obj.event) {
case 'detail':
layer.msg("查看详情");
//layer.msg("查看详情");
window.open("/DetailVp/" + data.id )
// window.location.href="/files";
break;
case 'edit':
var delIndex = layer.confirm('是否要审批通过该设备?', function(delIndex) {
......
src/main/resources/templates/cjqx/shebform.html
......@@ -29,6 +29,8 @@
<body>
<div class="xztitle">新增设备</div>
<form class="layui-form" action="" method="post" style="overflow: hidden;padding-top:10px;">
<input type="hidden" id="userunitname" name="userunitname" th:value="${session.User.getUnitname()}" />
<input type="hidden" id="userunitcode" name="userunitcode" th:value="${session.User.getUnitcode()}" />
<div class="layui-form-item">
<label class="layui-form-label"><font class="red">*</font>IP：</label>
......@@ -43,9 +45,9 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">是否一体化采集机：</label>
<label class="layui-form-label"><font class="red">*</font>是否一体化采集机：</label>
<div class="layui-input-block">
<select name="ifythcjy" lay-filter="ifythcjy" id="ifythcjy">
<select name="ifythcjy" lay-filter="ifythcjy" id="ifythcjy" lay-verify="required" >
<option value="">请选择</option>
<option value="是">是</option>
<option value="否">否</option>
......@@ -57,7 +59,7 @@
<div class="layui-form-item">
<label class="layui-form-label">所属单位：</label>
<div class="layui-input-block">
<input id="ssdwcode" name="ssdwcode" type="text" lay-verify="scode" style="width:66%; height:32px;" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
<input id="ssdwcode" name="ssdwcode" type="text" lay-verify="scode" style="width:66%; height:32px;" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
<input type="hidden" id="ssdwname" name="ssdwname" th:value="${session.User.getUnitname()}" />
</div>
</div>
......@@ -468,6 +470,17 @@
// alert("text==" + $("#" + id + " option:selected").text());
})
//layui.form.render()
form.on('select(pps1)', function(data) {
var id = data.elem.getAttribute("id");
var name;
if(id.length>4){
name = id.substr(0,id.length-4) + "name";
}
$("#"+name).val($("#" + id + " option:selected").text());
// alert("text==" + $("#" + id + " option:selected").text());
})
//监听提交
form.on('submit(formDemo)', function(data){
$("#ssdwname").val(codeFormatters($("input[name='ssdwcode']").val(),"CODE_UNIT"));
......@@ -505,6 +518,7 @@
$(function() {
openCombotree('ssdwcode');
$("#ssdwcode").combotree("setValue",$("#ssdwname").val());
$("input[name='ssdwcode']").val($("#userunitcode").val());
})
//格式化字典
......
src/main/resources/templates/cjqx/shebupdate.html
......@@ -31,6 +31,9 @@
<form class="layui-form" action="" method="post" style="overflow: hidden;padding-top:10px;">
<input type="hidden" name="id" th:value="${ClientVp.id}" >
<input type="hidden" id="userunitname" name="userunitname" th:value="${ClientVp.ssdwname}" />
<input type="hidden" id="userunitcode" name="userunitcode" th:value="${ClientVp.ssdwcode}" />
<div class="layui-form-item">
<label class="layui-form-label"><font class="red">*</font>IP：</label>
<div class="layui-input-block">
......@@ -44,9 +47,9 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">是否一体化采集机：</label>
<label class="layui-form-label"><font class="red">*</font>是否一体化采集机：</label>
<div class="layui-input-block">
<select name="ifythcjy" lay-filter="ifythcjy" id="ifythcjy">
<select name="ifythcjy" lay-filter="ifythcjy" id="ifythcjy" lay-verify="required">
<option value="">请选择</option>
<option value="是" th:selected="${ClientVp.ifythcjy == '是'}">是</option>
<option value="否" th:selected="${ClientVp.ifythcjy == '否'}">否</option>
......@@ -84,7 +87,7 @@
<option value="3" th:selected="${ClientVp.zwcjycode == '3'}">新德汇</option>
<option value="4" th:selected="${ClientVp.zwcjycode == '4'}">连腾</option>
</select>
<input type="hidden" id="zwcjyname" name="zwcjyname"/>
<input type="hidden" id="zwcjyname" name="zwcjyname" th:value="${ClientVp.zwcjyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -107,7 +110,7 @@
<option value="2" th:selected="${ClientVp.edzydqcode == '2'}">海鑫</option>
<option value="3" th:selected="${ClientVp.edzydqcode == '3'}">新德汇</option>
<option value="4" th:selected="${ClientVp.edzydqcode == '4'}">连腾</option>
<input type="hidden" id="edzydqname" name="edzydqname"/>
<input type="hidden" id="edzydqname" name="edzydqname" th:value="${ClientVp.edzydqname}"/>
</select>
</div>
</div>
......@@ -132,7 +135,7 @@
<option value="3" th:selected="${ClientVp.sftzzzcjycode == '3'}">新德汇</option>
<option value="4" th:selected="${ClientVp.sftzzzcjycode == '4'}">连腾</option>
</select>
<input type="hidden" id="sftzzzcjyname" name="sftzzzcjyname"/>
<input type="hidden" id="sftzzzcjyname" name="sftzzzcjyname" th:value="${ClientVp.sftzzzcjyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -154,7 +157,7 @@
<option value="2" th:selected="${ClientVp.sjcjycode == '2'}">新德汇</option>
<option value="3" th:selected="${ClientVp.sjcjycode == '3'}">金诺</option>
</select>
<input type="hidden" id="sjcjyname" name="sjcjyname"/>
<input type="hidden" id="sjcjyname" name="sjcjyname" th:value="${ClientVp.sjcjyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -176,7 +179,7 @@
<option value="1" th:selected="${ClientVp.zjcjycode == '1'}">创恒</option>
<option value="2" th:selected="${ClientVp.zjcjycode == '2'}">恒锐</option>
</select>
<input type="hidden" id="zjcjyname" name="zjcjyname"/>
<input type="hidden" id="zjcjyname" name="zjcjyname" th:value="${ClientVp.zjcjyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -201,7 +204,7 @@
<option value="4" th:selected="${ClientVp.hmcjycode == '4'}">释码大华</option>
<option value="5" th:selected="${ClientVp.hmcjycode == '5'}">聚虹</option>
</select>
<input type="hidden" id="hmcjyname" name="hmcjyname"/>
<input type="hidden" id="hmcjyname" name="hmcjyname" th:value="${ClientVp.hmcjyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -223,7 +226,7 @@
<option value="1" th:selected="${ClientVp.swcjycode == '1'}">科大讯飞</option>
<option value="2" th:selected="${ClientVp.swcjycode == '2'}">国音</option>
</select>
<input type="hidden" id="swcjyname" name="swcjyname"/>
<input type="hidden" id="swcjyname" name="swcjyname" th:value="${ClientVp.swcjyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -247,7 +250,7 @@
<option value="3" th:selected="${ClientVp.bjcjycode == '3'}">新德汇</option>
<option value="4" th:selected="${ClientVp.bjcjycode == '4'}">连腾</option>
</select>
<input type="hidden" id="bjcjyname" name="bjcjyname"/>
<input type="hidden" id="bjcjyname" name="bjcjyname" th:value="${ClientVp.bjcjyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -271,7 +274,7 @@
<option value="3" th:selected="${ClientVp.gpycode == '3'}">新德汇</option>
<option value="4" th:selected="${ClientVp.gpycode == '4'}">连腾</option>
</select>
<input type="hidden" id="gpyname" name="gpyname"/>
<input type="hidden" id="gpyname" name="gpyname" th:value="${ClientVp.gpyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -295,7 +298,7 @@
<option value="3" th:selected="${ClientVp.yhkcjycode == '3'}">新德汇</option>
<option value="4" th:selected="${ClientVp.yhkcjycode == '4'}">连腾</option>
</select>
<input type="hidden" id="yhkcjyname" name="yhkcjyname"/>
<input type="hidden" id="yhkcjyname" name="yhkcjyname" th:value="${ClientVp.yhkcjyname}"/>
</div>
</div>
<div class="layui-form-item">
......@@ -318,7 +321,7 @@
<option value="3" th:selected="${ClientVp.dnabqdyjcode == '3'}">新德汇</option>
<option value="4" th:selected="${ClientVp.dnabqdyjcode == '4'}">连腾</option>
</select>
<input type="hidden" id="dnabqdyjname" name="dnabqdyjname"/>
<input type="hidden" id="dnabqdyjname" name="dnabqdyjname" th:value="${ClientVp.dnabqdyjname}"/>
</div>
</div>
......@@ -470,10 +473,22 @@
$("#"+name).val($("#" + id + " option:selected").text());
// alert("text==" + $("#" + id + " option:selected").text());
})
//layui.form.render()
form.on('select(pps1)', function(data) {
var id = data.elem.getAttribute("id");
var name;
if(id.length>4){
name = id.substr(0,id.length-4) + "name";
}
$("#"+name).val($("#" + id + " option:selected").text());
// alert("text==" + $("#" + id + " option:selected").text());
})
//监听提交
form.on('submit(formDemo)', function(data){
$("#ssdwname").val(codeFormatters($("input[name='ssdwcode']").val(),"CODE_UNIT"));
var services=JSON.stringify(data.field);
$.ajax({
type: "POST",
......@@ -514,6 +529,7 @@
$(function() {
openCombotree('ssdwcode');
$("#ssdwcode").combotree("setValue",$("#ssdwname").val());
$("input[name='ssdwcode']").val($("#userunitcode").val());
})
//格式化字典
......
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