monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit 73ef6deb7376e38944d235b3916646ca15e9148f 2 parents 742d19b0 8e19761d

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-XuHaoJie
Inline Side-by-side
Showing 8 changed files with 162 additions and 109 deletions
... ... @@ -21,49 +21,51 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
form.render(null, 'add-device-form')
searchEvent();//检索条件事件
init()
//检索事件
function searchEvent() {
//发送状态
form.on('select(slt-docType)', function (data) {
var html ="";
if(data.value==1){
html+= "<option value='1'>迁入</option><option value='2'>迁出</option><option value='3'>转移</option>"
$("#device_card").css("display","block");
$("#fiting_card").css("display","none");
devicesBak = [];
fittingsBak = [];
}else{
html+= "<option value='4'>更换</option><option value='5'>新增</option><option value='6'>带走维修</option>"
$("#device_card").css("display","none");
$("#fiting_card").css("display","block");
devicesBak = [];
fittingsBak = [];
}
$("#slt-actionType").html(html);
form.render();
var html = "";
if (data.value == 1) {
html += "<option value='1'>迁入</option><option value='2'>迁出</option><option value='3'>转移</option>"
$("#device_card").css("display", "block");
$("#fiting_card").css("display", "none");
devicesBak = [];
fittingsBak = [];
} else {
html += "<option value='4'>更换</option><option value='5'>新增</option><option value='6'>带走维修</option>"
$("#device_card").css("display", "none");
$("#fiting_card").css("display", "block");
devicesBak = [];
fittingsBak = [];
}
$("#slt-actionType").html(html);
form.render();
});
}
//发送状态
form.on('select(slt-docType)', function (data) {
var html ="";
if(data.value==1){
html+= "<option value='1'>迁入</option><option value='2'>迁出</option><option value='3'>转移</option>"
$("#device_card").css("display","block");
$("#fiting_card").css("display","none");
}else{
html+= "<option value='4'>更换</option><option value='5'>新增</option><option value='6'>带走维修</option>"
$("#device_card").css("display","none");
$("#fiting_card").css("display","block");
var html = "";
if (data.value == 1) {
html += "<option value='1'>迁入</option><option value='2'>迁出</option><option value='3'>转移</option>"
$("#device_card").css("display", "block");
$("#fiting_card").css("display", "none");
} else {
html += "<option value='4'>更换</option><option value='5'>新增</option><option value='6'>带走维修</option>"
$("#device_card").css("display", "none");
$("#fiting_card").css("display", "block");
}
$("#slt-actionType").html(html);
form.render();
});
form.on('select(slt-actionType)', function (data) {
if(data.value=="3"){
if (data.value == "3") {
$("#lastPlace").removeAttribute("readOnly");
}else {
$("#lastPlace").attr("readOnly","readOnly");
} else {
$("#lastPlace").attr("readOnly", "readOnly");
}
})
... ... @@ -113,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
return false
};
$("#device_card :button#device_create").on("click",function () {
$("#device_card :button#device_create").on("click", function () {
var html = "<tr><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'/></td><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'/></td><td><input type='text' class='layui-input' width='40px' lay-verify = 'required'/></td><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'/></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 18px'/></td></tr>"
$("#device-table").append(html);
... ... @@ -121,10 +123,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
var toEdit = this.value == '保存';
this.value = toEdit ? '删除' : '保存';
var tdArr = []
var tr = $(this).closest('tr');
$(this).closest('tr').find('td').not(':last').each(function (t, index) {
if (toEdit) {
this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
if(this.innerHTML=='' || this.innerHTML == undefined){
if (this.innerHTML == '' || this.innerHTML == undefined) {
layer.msg("请注意填写完整")
tdArr = [];
$(this).closest('tr').remove();
... ... @@ -133,18 +136,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
tdArr.push(this.innerHTML);
}
})
if(!toEdit){
var snCode = $(this).closest('tr').find('td')[0].innerHTML;
if(snCode!=''&& snCode!=undefined){
for (let i = 0; i < devicesBak.length; i++) {
if(devicesBak[i].snCode == snCode){
devicesBak.pop(devicesBak[i]);
if (!toEdit) {
layer.confirm('确认要删除吗？', {
icon: 3, yes: function (index, layero) {
var snCode = tr.find('td')[0].innerHTML;
if (snCode != '' && snCode != undefined) {
for (let i = 0; i < devicesBak.length; i++) {
if (devicesBak[i].snCode == snCode) {
devicesBak.pop(devicesBak[i]);
}
}
}
tr.remove();
layer.close(index);
}, cancel: function (index, layer) {
layer.close(index);
}
}
$(this).closest('tr').remove();
}else {
if(tdArr.length>0) {
});
} else {
if (tdArr.length > 0) {
var deviceObj = {
'id': '',
'snCode': tdArr[0],
... ... @@ -157,7 +167,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
}
});
});
$("#fiting_card :button#fiting_create").on("click",function () {
$("#fiting_card :button#fiting_create").on("click", function () {
var html = "<tr><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='40px' class='layui-input' lay-verify = 'required'></td><td><input type='text' class='layui-input' width='50px' lay-verify = 'required'></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 18px'/></td></tr>"
$("#fiting-table").append(html);
... ... @@ -168,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
$(this).closest('tr').find('td').not(':last').each(function (t, index) {
if (toEdit) {
this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
if(this.innerHTML=='' || this.innerHTML == undefined){
if (this.innerHTML == '' || this.innerHTML == undefined) {
layer.msg("请注意填写完整")
tdArr = [];
$(this).closest('tr').remove();
... ... @@ -177,18 +187,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
tdArr.push(this.innerHTML);
}
})
if(!toEdit){
if (!toEdit) {
var fittingSN = $(this).closest('tr').find('td')[0].innerHTML;
if(fittingSN!=''&& fittingSN!=undefined){
if (fittingSN != '' && fittingSN != undefined) {
for (let i = 0; i < fittingsBak.length; i++) {
if(fittingsBak[i].fittingSN == fittingSN){
if (fittingsBak[i].fittingSN == fittingSN) {
fittingsBak.pop(fittingsBak[i]);
}
}
}
$(this).closest('tr').remove();
}else {
if(tdArr.length>0) {
} else {
if (tdArr.length > 0) {
var fittingObj = {
'id': '',
'fittingSN': tdArr[0],
... ... @@ -201,6 +211,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
}
});
});
//页面初始化
function init() {
loadSelect()
... ... @@ -231,12 +242,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
form.render();
});
}
form.on('select(slt-staffadd-group)', function (data) {
if(data.value== '0'){
$("#slt-staffadd-group").css("display","none");
$("#manufacturerOther").css("display","block");
}else {
$("#manufacturerOther").css("display","none");
if (data.value == '0') {
$("#slt-staffadd-group").css("display", "none");
$("#manufacturerOther").css("display", "block");
} else {
$("#manufacturerOther").css("display", "none");
}
});
... ...
... ... @@ -83,11 +83,12 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
if (domainIps && domainIps.length > 0){
tips = '该域下所有IP段为:';
$.each(domainIps,function (i,e) {
tips += '<br/>'+e.ip;
tips +='&nbsp;,'+e.ip;
})
}
if (tips){
return '<div><span lay-tips="'+tips+'">'+d.addr+'</span></div>';
var html="<div style='width:230px;margin:auto;height:auto;overflow:visible;text-overflow:inherit;white-space:normal;word-break: break-all;'>"+tips+"</div>"
return '<div><span lay-tips="'+html+'">'+d.addr+'</span></div>';
}else{
return '<div><span>'+d.addr+'</span></div>';
}
... ...
... ... @@ -97,7 +97,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
}}
, {field: 'orgUsers', title: '部门用户', align: 'left',width: '30%', sort: true}
, {field: 'orgDesc', title: '描述', align: 'left',width: '10%', sort: true}
, {field: 'createTime', title: '创建时间', align: 'center', sort: true,templet:'<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>\''}
, {
field: 'createTime', title: '创建时间', align: 'center', sort: true,
templet: function (d) {
debugger
// return new Date(parseInt(d.createTime) * 1000).toLocaleString().replace(/:\d{1,2}$/,' ');
return layui.util.toDateString(d.createTime*1000, 'yyyy-MM-dd HH:mm:ss');
}
}
, {
title: '操作', align: 'center',width: '10%'
, templet: function (d) {
... ...
... ... @@ -29,7 +29,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','xmSelect','laydat
data : JSON.stringify(bean),
success : function(res) {
layer.close(loading);
layer.msg(res.resp_msg, {
layer.msg(res.resp_msg+"【功能点已全部授权】", {
offset: '15px'
, icon: res.resp_code == 0?1:7
, time: 2000
... ...
//工作汇报表单
layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessions', 'xmSelect', 'laydate', 'upload'], function (exports) {
layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sessions', 'xmSelect', 'laydate', 'upload'], function (exports) {
var $ = layui.$;
var form = layui.form;
var layer = layui.layer;
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
var upload = layui.upload;
var domainName = common.domainName;
var xmSelect = layui.xmSelect;
var commonDetail =layui.commonDetail;
var commonDetail = layui.commonDetail;
//对外暴露的接口
exports('routeAdjustAdd', function (data) {
... ... @@ -21,7 +21,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
var uploadInst = {}
var attachmentIds = []
var adjustBak = []
var adjustBak = []
var routeAdjustDetailId = 0;
... ... @@ -38,10 +38,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
$('#upload_btn').click();
}
console.log(adjustArr);
if(adjustArr.length == 0){
if (adjustArr.length == 0) {
layer.msg("请先添加线路详细信息");
return;
}else{
} else {
saveForm()
}
})
... ... @@ -81,20 +81,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
})
return false
}
$("#routeAdjustDetail_create").on("click",function () {
routeAdjustDetailId+=1;
var html = "<tr><td id='"+routeAdjustDetailId+"'><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' class='layui-input' width='50px' lay-verify = 'required|phone'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required|phone'></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 16px'/></td></tr>"
$("#routeAdjustDetail_create").on("click", function () {
routeAdjustDetailId += 1;
var html = "<tr><td id='" + routeAdjustDetailId + "'><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' class='layui-input' width='50px' lay-verify = 'required|phone'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required'></td><td><input type='text' width='50px' class='layui-input' lay-verify = 'required|phone'></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 16px'/></td></tr>"
$("#routeAdjustDetail-table").append(html);
$("#table-routeAdjustDetail :button.edit").click(function () {
var toEdit = this.value == '保存';
this.value = toEdit ? '删除' : '保存';
var tdArr = []
var tdArr = [];
var tr = $(this).closest('tr');
tdArr.push(routeAdjustDetailId);
$(this).closest('tr').find('td').not(':last').each(function (t, index) {
if (toEdit) {
this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
if(this.innerHTML=='' || this.innerHTML == undefined){
if (this.innerHTML == '' || this.innerHTML == undefined) {
layer.msg("请注意填写完整")
tdArr = [];
$(this).closest('tr').remove();
... ... @@ -104,22 +106,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
}
})
if(!toEdit){
// console.log($(this).closest('tr').find('td')[0])
var id = $(this).closest('tr').find('td')[0].getAttribute("id");
// console.log(id)
if(id>0&& id!=undefined){
for (let i = 0; i < adjustBak.length; i++) {
if(adjustBak[i].id == id){
adjustBak.pop(adjustBak[i]);
if (!toEdit) {
layer.confirm('确认要删除吗？', {
icon: 3, yes: function (index, layero) {
var id = tr.find('td')[0].getAttribute("id");
if (id > 0 && id != undefined) {
for (let i = 0; i < adjustBak.length; i++) {
if (adjustBak[i].id == id) {
adjustBak.pop(adjustBak[i]);
}
}
}
tr.remove();
layer.close(index);
}, cancel: function (index, layer) {
layer.close(index);
}
}else {
console.log(id)
}
$(this).closest('tr').remove();
}else {
if(tdArr.length>0) {
});
} else {
if (tdArr.length > 0) {
var adjustObj = {
'id': routeAdjustDetailId,
'localPort': tdArr[1],
... ... @@ -131,25 +136,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
'targetContact': tdArr[7],
// 'targetPhone': tdArr[8]
}
if(tdArr[4]!=''&& tdArr[4]!=undefined){
if (tdArr[4] != '' && tdArr[4] != undefined) {
var resdata = commonDetail.validatorPhone(tdArr[4]);
if(resdata.code==-1){
if (resdata.code == -1) {
layer.msg(resdata.msg)
tdArr = [];
$(this).closest('tr').remove();
return;
}else {
} else {
adjustObj.localPhone = tdArr[4]
}
}
if(tdArr[8]!=''&& tdArr[8]!=undefined){
if (tdArr[8] != '' && tdArr[8] != undefined) {
var resdata = commonDetail.validatorPhone(tdArr[8]);
if(resdata.code==-1){
if (resdata.code == -1) {
layer.msg(resdata.msg)
tdArr = [];
$(this).closest('tr').remove();
return;
}else {
} else {
adjustObj.targetPhone = tdArr[8]
}
}
... ... @@ -158,6 +163,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
}
});
});
//页面初始化
function init() {
loadSelect()
... ... @@ -165,6 +171,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
initUploadPlus()
}
// 初始化下拉框
function loadSelect() {
admin.req({
... ...
... ... @@ -42,7 +42,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
var params = {}
params.staffList = staffsBak
params.staffRecord = JSON.stringify(data)
console.log(params)
admin.req({
url: domainName + '/api-room/machineRoom/machineRoomEnterStaff/save?access_token=' + accessToken,
data: JSON.stringify(params),
... ... @@ -76,6 +75,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
var toEdit = this.value == '保存';
this.value = toEdit ? '删除' : '保存';
var tdArr = []
var tr = $(this).closest('tr');
$(this).closest('tr').find('td').not(':last').each(function (t, index) {
if (toEdit) {
this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
... ... @@ -89,15 +89,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
}
})
if(!toEdit){
var name = $(this).closest('tr').find('td')[0].innerHTML;
if(name!=''&& name!=undefined){
for (let i = 0; i < staffsBak.length; i++) {
if(staffsBak[i].name == name){
staffsBak.pop(staffsBak[i]);
layer.confirm('确认要删除吗？', {icon: 3,yes: function (index, layero) {
var name = tr.find('td')[0].innerHTML;
console.log(name);
if (name != '' && name != undefined) {
for (let i = 0; i < staffsBak.length; i++) {
if (staffsBak[i].name == name) {
staffsBak.pop(staffsBak[i]);
}
}
}
}
}
$(this).closest('tr').remove();
tr.remove();
layer.close(index);
},cancel:function (index,layer) {
layer.close(index);
}});
}else {
if(tdArr.length>0) {
var staffObj = {
... ... @@ -107,10 +113,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
if(tdArr[1]!=''&& tdArr[1]!=undefined){
var resdata = commonDetail.validatorPhone(tdArr[1]);
if(resdata.code==-1){
layer.msg(resdata.msg)
tdArr = [];
$(this).closest('tr').remove();
return;
layer.confirm(resdata.msg+'确认要删除吗？', {
icon: 3, yes: function (index, layero) {
layer.load(2);
tdArr = [];
staffObj ={};
tr.remove();
layer.closeAll('loading');
layer.close(index)
return
}, cancel: function (index, layero) {
staffObj.phone = tdArr[1]
layer.close(index);
}
});
}else {
staffObj.phone = tdArr[1]
}
... ... @@ -118,16 +134,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
if(tdArr[2]!=''&& tdArr[2]!=undefined){
var res = commonDetail.validatorIDCard(tdArr[2]);
if(res.code==-1){
layer.msg(res.msg)
tdArr = [];
$(this).closest('tr').remove();
return;
layer.confirm(res.msg+'确认要删除吗？', {icon: 3,yes: function (index, layero) {
layer.load(2);
tdArr = [];
staffObj={};
tr.remove();
layer.closeAll('loading');
layer.close(index);
return
},cancel: function (index, layero) {
staffObj.idCard = tdArr[2]
layer.close(index);
}
});
}else {
staffObj.idCard = tdArr[2]
}
}
console.log(staffObj)
staffsBak.push(staffObj)
if(staffObj.phone && staffObj.idCard) {
staffsBak.push(staffObj)
}
}
}
... ...
... ... @@ -41,7 +41,7 @@
<label class="layui-form-label">机房</label>
<div class="layui-input-inline">
<select name="machineRoomId" id="slt-staffadd-machine"
lay-filter="slt-staffadd-machine">
lay-filter="slt-staffadd-machine" lay-verify="required">
<option value="">=选择机房=</option>
</select>
</div>
... ... @@ -50,7 +50,7 @@
<label class="layui-form-label">选择单位</label>
<div class="layui-input-inline">
<select name="manufacturerId" id="slt-staffadd-group"
lay-filter="slt-staffadd-group" >
lay-filter="slt-staffadd-group" lay-verify="required">
<option value="">=工作单位=</option>
</select>
<input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none">
... ...
... ... @@ -11,7 +11,7 @@
<div class="layui-inline inline-onethird">
<label class="layui-form-label">机房</label>
<div class="layui-input-inline">
<select name="machineRoomId" id="slt-staffadd-machine"
<select name="machineRoomId" id="slt-staffadd-machine" lay-verify="required"
lay-filter="slt-staffadd-machine">
<option value="">=选择机房=</option>
</select>
... ... @@ -21,7 +21,7 @@
<label class="layui-form-label">选择单位</label>
<div class="layui-input-inline">
<select name="manufacturerId" id="slt-staffadd-group"
lay-filter="slt-staffadd-group" >
lay-filter="slt-staffadd-group" lay-verify="required">
<option value="">=工作单位=</option>
</select>
<input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none">
... ...