Commit 0faeeaed by 焦荣

新增厂商附件和修改详情页面

parent aa446cba
......@@ -41,112 +41,82 @@
<td style="width:15%;" th:text="${ClientVp.ifythcjy}">
<span class="eclipse"></span>
</td>
<td class="td_r" >隶属单位:</td>
<td th:text="${ClientVp.ssdwname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否指纹采集仪:</td>
<td th:text="${ClientVp.ifzwcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">指纹采集仪品牌:</td>
<td th:text="${ClientVp.zwcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否二代证阅读器:</td>
<td th:text="${ClientVp.ifedzydq}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">二代证阅读器品牌:</td>
<td th:text="${ClientVp.edzydqname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否身高体重足长采集仪:</td>
<td th:text="${ClientVp.ifsftzzzcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">身高体重足长采集仪品牌:</td>
<td th:text="${ClientVp.sftzzzcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否手机采集仪:</td>
<td th:text="${ClientVp.ifsjcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r">手机采集仪品牌:</td>
<td th:text="${ClientVp.sjcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否足迹采集仪:</td>
<td th:text="${ClientVp.ifzjcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">足迹采集仪品牌:</td>
<td th:text="${ClientVp.zjcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否虹膜采集仪:</td>
<td th:text="${ClientVp.ifhmcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">虹膜采集仪品牌:</td>
<td th:text="${ClientVp.hmcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否声纹采集仪:</td>
<td th:text="${ClientVp.ifswcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">声纹采集仪品牌:</td>
<td th:text="${ClientVp.swcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否笔迹采集仪:</td>
<td th:text="${ClientVp.ifbjcjy}">
<span class="eclipse">指纹采集仪</span>
</td >
<td class="td_r">笔迹采集仪品牌:</td>
<td th:text="${ClientVp.bjcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否高拍仪:</td>
<td th:text="${ClientVp.ifgpy}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">高拍仪品牌:</td>
<td th:text="${ClientVp.gpyname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r" >是否银行卡采集仪:</td>
<td th:text="${ClientVp.ifyhkcjy}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r">银行卡采集仪品牌:</td>
<td th:text="${ClientVp.yhkcjyname}">
<span class="eclipse">指纹采集仪</span>
</td>
</tr>
<tr>
<td class="td_r" >是否DNA标签打印机:</td>
<td th:text="${ClientVp.ifdnabqdyj}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">DNA标签打印机品牌:</td>
<td th:text="${ClientVp.dnabqdyjname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r"></td>
<td >
</td>
</tr>
<tr>
<td class="td_r" >隶属单位:</td>
<td th:text="${ClientVp.ssdwname}">
<span class="eclipse">指纹采集仪</span>
</td>
<td class="td_r">责任民警:</td>
<td th:text="${ClientVp.zrmjname}">
......@@ -171,17 +141,16 @@
<td style="width:15%;" th:text="${ClientVp.spsjstr}">
</td>
<td class="td_r" style="width:10%;"></td>
<td style="width:15%;">
<td class="td_r" style="width:10%;">最近采集日期:</td>
<td style="width:15%;" th:text="${getMCjsj}">
</td>
<td class="td_r" style="width:10%;"></td>
<td style="width:15%;">
</td>
</tr>
</table>
<h6 class="cx_t">曲线图</h6>
<input type="hidden" name="lyycsstr" id="lyycsstr" th:value="${lyycsstr}" >
<input type="hidden" name="lyysjstr" id="lyysjstr" th:value="${lyysjstr}" >
<div id="main" class="main" style="height:400px;"></div>
</div>
</div>
......@@ -207,6 +176,37 @@
i.removeClass("fa-angle-double-down").addClass("fa-angle-double-up").next("span").text("收起");
}
}
var last_year_month = function() {
var d = new Date();
var result = [];
for(var i = 0; i < 12; i++) {
d.setMonth(d.getMonth() - 1);
var m = d.getMonth() + 1;
m = m < 10 ? "0" + m : m;
//在这里可以自定义输出的日期格式
//result.push(d.getFullYear() + "-" + m);
// result.push(d.getFullYear() + "年" + m + '月');
result[11-i] = d.getFullYear() + "-" + m;
}
return result;
}
var yymonth = function() {
var d = $("#lyysjstr").val();
d = d.substr(1,d.length-2);
var result = d.split(",");
return result;
}
var yycs = function() {
var d = $("#lyycsstr").val();
d = d.substr(1,d.length-2);
var result = d.split(",");
return result;
}
function init(){
option = {
xAxis: {
......@@ -270,8 +270,11 @@
}
]
};
option.xAxis.data = ['2020.1.1','2020.1.2','2020.1.3','2020.1.4','2020.1.5','2020.1.6','2020.1.7','2020.1.8','2020.1.9','2020.1.10','2020.1.11','2020.1.12'];
option.series[0].data = [21,25,27,12,22,21,25,27,12,22,42,32];
//option.xAxis.data = ['2020.1.1','2020.1.2','2020.1.3','2020.1.4','2020.1.5','2020.1.6','2020.1.7','2020.1.8','2020.1.9','2020.1.10','2020.1.11','2020.1.12'];
// option.xAxis.data = last_year_month();
// option.series[0].data = [0,0,0,20,0];
option.xAxis.data = yymonth();
option.series[0].data = yycs();
var chart3 = echarts.init(document.getElementById('main'));
chart3.setOption(option);
}
......
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Type" content="multipart/form-data; charset=utf-8" />
<title>新增设备信息</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
......@@ -28,7 +28,7 @@
</head>
<body>
<div class="xztitle">新增设备</div>
<form class="layui-form" action="" method="post" style="overflow: hidden;padding-top:10px;">
<form class="layui-form" action="" method="post" style="overflow: hidden;padding-top:10px;" enctype="multipart/form-data">
<input type="hidden" id="lrr" name="lrr" th:value="${session.User.getUsername()}" />
<input type="hidden" id="lrdwdm" name="lrdwdm" th:value="${session.User.getUnitcode()}" />
......@@ -73,15 +73,15 @@
<div class="layui-form-item" id="cjsb2" style="display: none;">
<div id="stredzydq"> <label class="layui-form-label">二代证阅读器品牌商:</label></div>
<div class="layui-input-block">
<select name="edzydqcode" lay-filter="pps" id="edzydqcode" lay-verify="pps">
<option value="">请选择</option>
<option value="1">汉林信通</option>
<option value="2">海鑫</option>
<option value="3">新德汇</option>
<option value="4">连腾</option>
<input type="hidden" id="edzydqname" name="edzydqname"/>
</select>
</div>
<select name="edzydqcode" lay-filter="pps" id="edzydqcode" lay-verify="pps">
<option value="">请选择</option>
<option value="1">汉林信通</option>
<option value="2">海鑫</option>
<option value="3">新德汇</option>
<option value="4">连腾</option>
<input type="hidden" id="edzydqname" name="edzydqname"/>
</select>
</div>
</div>
<div class="layui-form-item" id="cjsb3" style="display: none;">
......@@ -262,14 +262,16 @@
</div>
<div class="layui-form-item">
<input type="hidden" id="sbztstr" name="sbztstr" value="禁用"/>
<input type="hidden" id="spzt" name="spzt" value="0"/>
<label class="layui-form-label">联系电话:</label>
<div class="layui-input-block">
<input type="text" name="sbwhr2lxdh7" id="sbwhr2lxdh7" lay-verify="sjhm2" placeholder="请输入联系电话" autocomplete="off"
class="layui-input">
</div>
</div>
<div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
<div class="layui-input-block" style="margin-left:0px !important;">
<button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
<button class="layui-btn" lay-submit lay-filter="formDemo" id="formAction">立即提交</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div>
</div>
......@@ -353,8 +355,6 @@
// alert("text==" + $("#" + id + " option:selected").text());
})
//监听提交
form.on('submit(formDemo)', function(data){
var services=JSON.stringify(data.field);
......@@ -370,7 +370,7 @@
icon: 1,//提示的样式
time: 3000, //2秒关闭(如果不配置,默认是3秒)//设置后不需要自己写定时关闭了,单位是毫秒
end:function(){
location.href='/sbcsglform';
location.href='/ClientCs/' + data.data;
}
});
parent.layer.close(index);//关闭当前页
......@@ -390,9 +390,6 @@
});
</script>
</body>
</html>
......@@ -27,7 +27,7 @@
<link rel="stylesheet" href="/static/fenye/fenye.css" media="all">
</head>
<body>
<div class="xztitle">新增设备</div>
<div class="xztitle">修改设备</div>
<form class="layui-form" action="" method="post" style="overflow: hidden;padding-top:10px;">
<input type="hidden" name="id" th:value="${ClientCs.id}" >
......@@ -259,19 +259,56 @@
</div>
</div>
<div class="layui-upload">
<div class="layui-upload-list">
<input type="hidden" id="csid" name="csid" th:value="${ClientCs.id}"/>
<table class="layui-table" id="filetest" lay-filter="filetest">
</table>
</div>
</div>
<div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
<div class="layui-input-block" style="margin-left:0px !important;">
<button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
<div class="layui-upload">
<div style="text-align: left;">
<button type="button" class="layui-btn layui-btn-normal" id="testList"><i class="layui-icon">&#xe655;</i>新增附件</button>
<button type="button" class="layui-btn" id="testListAction"><i class="layui-icon">&#xe67c;</i>开始上传</button>
</div>
<div class="layui-upload-list">
<table class="layui-table" >
<thead>
<tr>
<th>文件名</th>
<th>大小</th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody id="demoList"></tbody>
</table>
</div>
</div>
<div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
<div class="layui-input-block" style="margin-left:0px !important;">
<button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div>
</div>
</form>
<script src="/static/layui/layui.js" charset="utf-8"></script>
<!-- 注意:如果你直接复制所有代码到本地,上述js路径需要改成你本地的 -->
<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-xs" lay-event="download" style="width:55px;"> </a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del" style="width:55px;"> </a>
</script>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<i class="layui-icon">&#xe655;设备维护附件</i>
</div>
</script>
<script>
//Demo
layui.use('form', function(){
var form = layui.form;
......@@ -346,8 +383,6 @@
// alert("text==" + $("#" + id + " option:selected").text());
})
//监听提交
form.on('submit(formDemo)', function(data){
var services=JSON.stringify(data.field);
......@@ -393,7 +428,137 @@
})
var demoListView = $('#demoList');
var files;
layui.use('upload',function(){
var $ = layui.jquery,upload = layui.upload;
var array = new Array()
,uploadListIns = upload.render({
elem: '#testList'
,url:'/dupload'
,data:{csid: function(){
return $('#csid').val();
}}
,accept: 'file'
,multiple: true
,auto: false
,bindAction: '#testListAction'
,choose:function(obj){
files= this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
//读取本地文件
obj.preview(function(index, file, result){
var tr = $(['<tr id="upload-'+ index +'">'
,'<td>'+ file.name +'</td>'
,'<td>'+ (file.size/1024).toFixed(1) +'kb</td>'
,'<td>等待上传</td>'
,'<td>'
,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">重传</button>'
,'<button class="layui-btn layui-btn-xs layui-btn-danger notUpload-delete">删除</button>'
,'</td>'
,'</tr>'].join(''));
//单个重传
tr.find('.demo-reload').on('click', function(){
obj.upload(index, file);
});
//删除
tr.find('.notUpload-delete').on('click', function(){
delete files[index]; //删除对应的文件
tr.remove();
uploadListIns.config.elem.next()[0].value = ''; //清空 input file 值,以免删除后出现同名文件不可选
});
demoListView.append(tr);
});}
,allDone: function(obj){ //当文件全部被提交后,才触发
layer.msg('附件上传成功', {
icon: 1,//提示的样式
time: 2000, //2秒关闭(如果不配置,默认是3秒)//设置后不需要自己写定时关闭了,单位是毫秒
end:function(){
//$('.layui-laypage-btn').click();//模拟点击
location.reload();
}
});
}
,done: function(res, index, upload){
if(res.code == 0){ //上传成功
var tr = demoListView.find('tr#upload-'+ index)
,tds = tr.children();
tds.eq(2).html('<span style="color: #5FB878;">上传成功</span>');
tds.eq(5).html(''); //清空操作
return delete this.files[index]; //删除文件队列已经上传成功的文件
}
this.error(index, upload);
}
,error: function(index, upload){
var tr = demoListView.find('tr#upload-'+ index)
,tds = tr.children();
tds.eq(2).html('<span style="color: #FF5722;">上传失败</span>');
tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示重传
}
})
});
layui.use('table', function(){
var date = new Date();
var table = layui.table;
table.render({
elem: '#filetest'
,url:'/sysClientCsfjlist'
,title: '附件信息列表'
,toolbar:'#toolbarDemo'
,method:'get'
,page: true
,limit: 10
,where : {
csid:$("#csid").val() //添加默认查询条件 待审批列表
}
,cols: [
[
// { field:'spzt',fixed: 'left',title:'操作',align:'center', width:'10%',toolbar: '#toolbarDemo'}
{type:'numbers', title:'序号',align:'center', width:'10%'}
,{field:'dzwjmc', title:'文件名称',align:'center', width:'18%'}
,{field:'dzwjdx', title:'文件大小',align:'center', width:'18%',templet:function(d){
return (d.dzwjdx/1024).toFixed(1)+'kb';
}}
,{field: "lrsj", title:'上传时间',align:'center', width:'18%',templet:"<div>{{layui.util.toDateString(d.lrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field: "", title:'状态',align:'center', width:'18%',templet:"<div>上传成功</div>"}
,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:'18%'}
/* ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:140}
,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo4', width:140}*/
]
]
});
table.on('tool(filetest)', function(obj) {
var data = obj.data;
json = JSON.stringify(data );
switch(obj.event) {
case 'download':
window.open("/fdownloadfile?id="+obj.data.id)
break;
case 'del':
var delIndex = layer.confirm('是否要删除该附件?', function(delIndex) {
$.ajax({
type: "DELETE",
url: '/ClientCsfj/'+data.id ,
success: function(suc) {
if(suc.status == '201') {
layer.msg("已删除", {
icon: 1
});
$('.layui-laypage-btn').click();//模拟点击
} else {
layer.msg("操作失败", {
icon: 5
});
}
}
});
layer.close(delIndex);
});
break;
}
});
});
</script>
......
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