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 141 additions and 88 deletions
@@ -21,21 +21,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -21,21 +21,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
21 form.render(null, 'add-device-form') 21 form.render(null, 'add-device-form')
22 searchEvent();//检索条件事件 22 searchEvent();//检索条件事件
23 init() 23 init()
  24 +
24 //检索事件 25 //检索事件
25 function searchEvent() { 26 function searchEvent() {
26 //发送状态 27 //发送状态
27 form.on('select(slt-docType)', function (data) { 28 form.on('select(slt-docType)', function (data) {
28 - var html ="";  
29 - if(data.value==1){  
30 - html+= "<option value='1'>迁入</option><option value='2'>迁出</option><option value='3'>转移</option>"  
31 - $("#device_card").css("display","block");  
32 - $("#fiting_card").css("display","none"); 29 + var html = "";
  30 + if (data.value == 1) {
  31 + html += "<option value='1'>迁入</option><option value='2'>迁出</option><option value='3'>转移</option>"
  32 + $("#device_card").css("display", "block");
  33 + $("#fiting_card").css("display", "none");
33 devicesBak = []; 34 devicesBak = [];
34 fittingsBak = []; 35 fittingsBak = [];
35 - }else{  
36 - html+= "<option value='4'>更换</option><option value='5'>新增</option><option value='6'>带走维修</option>"  
37 - $("#device_card").css("display","none");  
38 - $("#fiting_card").css("display","block"); 36 + } else {
  37 + html += "<option value='4'>更换</option><option value='5'>新增</option><option value='6'>带走维修</option>"
  38 + $("#device_card").css("display", "none");
  39 + $("#fiting_card").css("display", "block");
39 devicesBak = []; 40 devicesBak = [];
40 fittingsBak = []; 41 fittingsBak = [];
41 } 42 }
@@ -43,27 +44,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -43,27 +44,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
43 form.render(); 44 form.render();
44 }); 45 });
45 } 46 }
  47 +
46 //发送状态 48 //发送状态
47 form.on('select(slt-docType)', function (data) { 49 form.on('select(slt-docType)', function (data) {
48 - var html ="";  
49 - if(data.value==1){  
50 - html+= "<option value='1'>迁入</option><option value='2'>迁出</option><option value='3'>转移</option>"  
51 - $("#device_card").css("display","block");  
52 - $("#fiting_card").css("display","none");  
53 - }else{  
54 - html+= "<option value='4'>更换</option><option value='5'>新增</option><option value='6'>带走维修</option>"  
55 - $("#device_card").css("display","none");  
56 - $("#fiting_card").css("display","block"); 50 + var html = "";
  51 + if (data.value == 1) {
  52 + html += "<option value='1'>迁入</option><option value='2'>迁出</option><option value='3'>转移</option>"
  53 + $("#device_card").css("display", "block");
  54 + $("#fiting_card").css("display", "none");
  55 + } else {
  56 + html += "<option value='4'>更换</option><option value='5'>新增</option><option value='6'>带走维修</option>"
  57 + $("#device_card").css("display", "none");
  58 + $("#fiting_card").css("display", "block");
57 } 59 }
58 $("#slt-actionType").html(html); 60 $("#slt-actionType").html(html);
59 form.render(); 61 form.render();
60 }); 62 });
61 63
62 form.on('select(slt-actionType)', function (data) { 64 form.on('select(slt-actionType)', function (data) {
63 - if(data.value=="3"){ 65 + if (data.value == "3") {
64 $("#lastPlace").removeAttribute("readOnly"); 66 $("#lastPlace").removeAttribute("readOnly");
65 - }else {  
66 - $("#lastPlace").attr("readOnly","readOnly"); 67 + } else {
  68 + $("#lastPlace").attr("readOnly", "readOnly");
67 } 69 }
68 }) 70 })
69 71
@@ -113,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -113,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
113 return false 115 return false
114 }; 116 };
115 117
116 - $("#device_card :button#device_create").on("click",function () { 118 + $("#device_card :button#device_create").on("click", function () {
117 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>" 119 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>"
118 $("#device-table").append(html); 120 $("#device-table").append(html);
119 121
@@ -121,10 +123,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -121,10 +123,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
121 var toEdit = this.value == '保存'; 123 var toEdit = this.value == '保存';
122 this.value = toEdit ? '删除' : '保存'; 124 this.value = toEdit ? '删除' : '保存';
123 var tdArr = [] 125 var tdArr = []
  126 + var tr = $(this).closest('tr');
124 $(this).closest('tr').find('td').not(':last').each(function (t, index) { 127 $(this).closest('tr').find('td').not(':last').each(function (t, index) {
125 if (toEdit) { 128 if (toEdit) {
126 this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;'); 129 this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
127 - if(this.innerHTML=='' || this.innerHTML == undefined){ 130 + if (this.innerHTML == '' || this.innerHTML == undefined) {
128 layer.msg("请注意填写完整") 131 layer.msg("请注意填写完整")
129 tdArr = []; 132 tdArr = [];
130 $(this).closest('tr').remove(); 133 $(this).closest('tr').remove();
@@ -133,18 +136,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -133,18 +136,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
133 tdArr.push(this.innerHTML); 136 tdArr.push(this.innerHTML);
134 } 137 }
135 }) 138 })
136 - if(!toEdit){  
137 - var snCode = $(this).closest('tr').find('td')[0].innerHTML;  
138 - if(snCode!=''&& snCode!=undefined){ 139 + if (!toEdit) {
  140 + layer.confirm('确认要删除吗？', {
  141 + icon: 3, yes: function (index, layero) {
  142 + var snCode = tr.find('td')[0].innerHTML;
  143 + if (snCode != '' && snCode != undefined) {
139 for (let i = 0; i < devicesBak.length; i++) { 144 for (let i = 0; i < devicesBak.length; i++) {
140 - if(devicesBak[i].snCode == snCode){ 145 + if (devicesBak[i].snCode == snCode) {
141 devicesBak.pop(devicesBak[i]); 146 devicesBak.pop(devicesBak[i]);
142 } 147 }
143 } 148 }
144 } 149 }
145 - $(this).closest('tr').remove();  
146 - }else {  
147 - if(tdArr.length>0) { 150 + tr.remove();
  151 + layer.close(index);
  152 + }, cancel: function (index, layer) {
  153 + layer.close(index);
  154 + }
  155 + });
  156 + } else {
  157 + if (tdArr.length > 0) {
148 var deviceObj = { 158 var deviceObj = {
149 'id': '', 159 'id': '',
150 'snCode': tdArr[0], 160 'snCode': tdArr[0],
@@ -157,7 +167,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -157,7 +167,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
157 } 167 }
158 }); 168 });
159 }); 169 });
160 - $("#fiting_card :button#fiting_create").on("click",function () { 170 + $("#fiting_card :button#fiting_create").on("click", function () {
161 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>" 171 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>"
162 $("#fiting-table").append(html); 172 $("#fiting-table").append(html);
163 173
@@ -168,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -168,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
168 $(this).closest('tr').find('td').not(':last').each(function (t, index) { 178 $(this).closest('tr').find('td').not(':last').each(function (t, index) {
169 if (toEdit) { 179 if (toEdit) {
170 this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;'); 180 this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
171 - if(this.innerHTML=='' || this.innerHTML == undefined){ 181 + if (this.innerHTML == '' || this.innerHTML == undefined) {
172 layer.msg("请注意填写完整") 182 layer.msg("请注意填写完整")
173 tdArr = []; 183 tdArr = [];
174 $(this).closest('tr').remove(); 184 $(this).closest('tr').remove();
@@ -177,18 +187,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -177,18 +187,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
177 tdArr.push(this.innerHTML); 187 tdArr.push(this.innerHTML);
178 } 188 }
179 }) 189 })
180 - if(!toEdit){ 190 + if (!toEdit) {
181 var fittingSN = $(this).closest('tr').find('td')[0].innerHTML; 191 var fittingSN = $(this).closest('tr').find('td')[0].innerHTML;
182 - if(fittingSN!=''&& fittingSN!=undefined){ 192 + if (fittingSN != '' && fittingSN != undefined) {
183 for (let i = 0; i < fittingsBak.length; i++) { 193 for (let i = 0; i < fittingsBak.length; i++) {
184 - if(fittingsBak[i].fittingSN == fittingSN){ 194 + if (fittingsBak[i].fittingSN == fittingSN) {
185 fittingsBak.pop(fittingsBak[i]); 195 fittingsBak.pop(fittingsBak[i]);
186 } 196 }
187 } 197 }
188 } 198 }
189 $(this).closest('tr').remove(); 199 $(this).closest('tr').remove();
190 - }else {  
191 - if(tdArr.length>0) { 200 + } else {
  201 + if (tdArr.length > 0) {
192 var fittingObj = { 202 var fittingObj = {
193 'id': '', 203 'id': '',
194 'fittingSN': tdArr[0], 204 'fittingSN': tdArr[0],
@@ -201,6 +211,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -201,6 +211,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
201 } 211 }
202 }); 212 });
203 }); 213 });
  214 +
204 //页面初始化 215 //页面初始化
205 function init() { 216 function init() {
206 loadSelect() 217 loadSelect()
@@ -231,12 +242,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -231,12 +242,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
231 form.render(); 242 form.render();
232 }); 243 });
233 } 244 }
  245 +
234 form.on('select(slt-staffadd-group)', function (data) { 246 form.on('select(slt-staffadd-group)', function (data) {
235 - if(data.value== '0'){  
236 - $("#slt-staffadd-group").css("display","none");  
237 - $("#manufacturerOther").css("display","block");  
238 - }else {  
239 - $("#manufacturerOther").css("display","none"); 247 + if (data.value == '0') {
  248 + $("#slt-staffadd-group").css("display", "none");
  249 + $("#manufacturerOther").css("display", "block");
  250 + } else {
  251 + $("#manufacturerOther").css("display", "none");
240 } 252 }
241 }); 253 });
242 254
@@ -83,11 +83,12 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -83,11 +83,12 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
83 if (domainIps && domainIps.length > 0){ 83 if (domainIps && domainIps.length > 0){
84 tips = '该域下所有IP段为:'; 84 tips = '该域下所有IP段为:';
85 $.each(domainIps,function (i,e) { 85 $.each(domainIps,function (i,e) {
86 - tips += '<br/>'+e.ip; 86 + tips +='&nbsp;,'+e.ip;
87 }) 87 })
88 } 88 }
89 if (tips){ 89 if (tips){
90 - return '<div><span lay-tips="'+tips+'">'+d.addr+'</span></div>'; 90 + var html="<div style='width:230px;margin:auto;height:auto;overflow:visible;text-overflow:inherit;white-space:normal;word-break: break-all;'>"+tips+"</div>"
  91 + return '<div><span lay-tips="'+html+'">'+d.addr+'</span></div>';
91 }else{ 92 }else{
92 return '<div><span>'+d.addr+'</span></div>'; 93 return '<div><span>'+d.addr+'</span></div>';
93 } 94 }
@@ -97,7 +97,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -97,7 +97,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
97 }} 97 }}
98 , {field: 'orgUsers', title: '部门用户', align: 'left',width: '30%', sort: true} 98 , {field: 'orgUsers', title: '部门用户', align: 'left',width: '30%', sort: true}
99 , {field: 'orgDesc', title: '描述', align: 'left',width: '10%', sort: true} 99 , {field: 'orgDesc', title: '描述', align: 'left',width: '10%', sort: true}
100 - , {field: 'createTime', title: '创建时间', align: 'center', sort: true,templet:'<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>\''} 100 + , {
  101 + field: 'createTime', title: '创建时间', align: 'center', sort: true,
  102 + templet: function (d) {
  103 + debugger
  104 + // return new Date(parseInt(d.createTime) * 1000).toLocaleString().replace(/:\d{1,2}$/,' ');
  105 + return layui.util.toDateString(d.createTime*1000, 'yyyy-MM-dd HH:mm:ss');
  106 + }
  107 + }
101 , { 108 , {
102 title: '操作', align: 'center',width: '10%' 109 title: '操作', align: 'center',width: '10%'
103 , templet: function (d) { 110 , templet: function (d) {
@@ -29,7 +29,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','xmSelect','laydat @@ -29,7 +29,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','xmSelect','laydat
29 data : JSON.stringify(bean), 29 data : JSON.stringify(bean),
30 success : function(res) { 30 success : function(res) {
31 layer.close(loading); 31 layer.close(loading);
32 - layer.msg(res.resp_msg, { 32 + layer.msg(res.resp_msg+"【功能点已全部授权】", {
33 offset: '15px' 33 offset: '15px'
34 , icon: res.resp_code == 0?1:7 34 , icon: res.resp_code == 0?1:7
35 , time: 2000 35 , time: 2000
1 //工作汇报表单 1 //工作汇报表单
2 -layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessions', 'xmSelect', 'laydate', 'upload'], function (exports) { 2 +layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sessions', 'xmSelect', 'laydate', 'upload'], function (exports) {
3 var $ = layui.$; 3 var $ = layui.$;
4 var form = layui.form; 4 var form = layui.form;
5 var layer = layui.layer; 5 var layer = layui.layer;
@@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
11 var upload = layui.upload; 11 var upload = layui.upload;
12 var domainName = common.domainName; 12 var domainName = common.domainName;
13 var xmSelect = layui.xmSelect; 13 var xmSelect = layui.xmSelect;
14 - var commonDetail =layui.commonDetail; 14 + var commonDetail = layui.commonDetail;
15 15
16 //对外暴露的接口 16 //对外暴露的接口
17 exports('routeAdjustAdd', function (data) { 17 exports('routeAdjustAdd', function (data) {
@@ -38,10 +38,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi @@ -38,10 +38,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
38 $('#upload_btn').click(); 38 $('#upload_btn').click();
39 } 39 }
40 console.log(adjustArr); 40 console.log(adjustArr);
41 - if(adjustArr.length == 0){ 41 + if (adjustArr.length == 0) {
42 layer.msg("请先添加线路详细信息"); 42 layer.msg("请先添加线路详细信息");
43 return; 43 return;
44 - }else{ 44 + } else {
45 saveForm() 45 saveForm()
46 } 46 }
47 }) 47 })
@@ -81,20 +81,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi @@ -81,20 +81,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
81 }) 81 })
82 return false 82 return false
83 } 83 }
84 - $("#routeAdjustDetail_create").on("click",function () {  
85 - routeAdjustDetailId+=1;  
86 - 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>" 84 +
  85 + $("#routeAdjustDetail_create").on("click", function () {
  86 + routeAdjustDetailId += 1;
  87 + 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>"
87 $("#routeAdjustDetail-table").append(html); 88 $("#routeAdjustDetail-table").append(html);
88 89
89 $("#table-routeAdjustDetail :button.edit").click(function () { 90 $("#table-routeAdjustDetail :button.edit").click(function () {
90 var toEdit = this.value == '保存'; 91 var toEdit = this.value == '保存';
91 this.value = toEdit ? '删除' : '保存'; 92 this.value = toEdit ? '删除' : '保存';
92 - var tdArr = [] 93 + var tdArr = [];
  94 + var tr = $(this).closest('tr');
93 tdArr.push(routeAdjustDetailId); 95 tdArr.push(routeAdjustDetailId);
94 $(this).closest('tr').find('td').not(':last').each(function (t, index) { 96 $(this).closest('tr').find('td').not(':last').each(function (t, index) {
95 if (toEdit) { 97 if (toEdit) {
96 this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;'); 98 this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
97 - if(this.innerHTML=='' || this.innerHTML == undefined){ 99 + if (this.innerHTML == '' || this.innerHTML == undefined) {
98 layer.msg("请注意填写完整") 100 layer.msg("请注意填写完整")
99 tdArr = []; 101 tdArr = [];
100 $(this).closest('tr').remove(); 102 $(this).closest('tr').remove();
@@ -104,22 +106,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi @@ -104,22 +106,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
104 } 106 }
105 }) 107 })
106 108
107 - if(!toEdit){  
108 - // console.log($(this).closest('tr').find('td')[0])  
109 - var id = $(this).closest('tr').find('td')[0].getAttribute("id");  
110 - // console.log(id)  
111 - if(id>0&& id!=undefined){ 109 + if (!toEdit) {
  110 + layer.confirm('确认要删除吗？', {
  111 + icon: 3, yes: function (index, layero) {
  112 + var id = tr.find('td')[0].getAttribute("id");
  113 + if (id > 0 && id != undefined) {
112 for (let i = 0; i < adjustBak.length; i++) { 114 for (let i = 0; i < adjustBak.length; i++) {
113 - if(adjustBak[i].id == id){ 115 + if (adjustBak[i].id == id) {
114 adjustBak.pop(adjustBak[i]); 116 adjustBak.pop(adjustBak[i]);
115 } 117 }
116 } 118 }
117 - }else {  
118 - console.log(id)  
119 } 119 }
120 - $(this).closest('tr').remove();  
121 - }else {  
122 - if(tdArr.length>0) { 120 + tr.remove();
  121 + layer.close(index);
  122 + }, cancel: function (index, layer) {
  123 + layer.close(index);
  124 + }
  125 + });
  126 + } else {
  127 + if (tdArr.length > 0) {
123 var adjustObj = { 128 var adjustObj = {
124 'id': routeAdjustDetailId, 129 'id': routeAdjustDetailId,
125 'localPort': tdArr[1], 130 'localPort': tdArr[1],
@@ -131,25 +136,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi @@ -131,25 +136,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
131 'targetContact': tdArr[7], 136 'targetContact': tdArr[7],
132 // 'targetPhone': tdArr[8] 137 // 'targetPhone': tdArr[8]
133 } 138 }
134 - if(tdArr[4]!=''&& tdArr[4]!=undefined){ 139 + if (tdArr[4] != '' && tdArr[4] != undefined) {
135 var resdata = commonDetail.validatorPhone(tdArr[4]); 140 var resdata = commonDetail.validatorPhone(tdArr[4]);
136 - if(resdata.code==-1){ 141 + if (resdata.code == -1) {
137 layer.msg(resdata.msg) 142 layer.msg(resdata.msg)
138 tdArr = []; 143 tdArr = [];
139 $(this).closest('tr').remove(); 144 $(this).closest('tr').remove();
140 return; 145 return;
141 - }else { 146 + } else {
142 adjustObj.localPhone = tdArr[4] 147 adjustObj.localPhone = tdArr[4]
143 } 148 }
144 } 149 }
145 - if(tdArr[8]!=''&& tdArr[8]!=undefined){ 150 + if (tdArr[8] != '' && tdArr[8] != undefined) {
146 var resdata = commonDetail.validatorPhone(tdArr[8]); 151 var resdata = commonDetail.validatorPhone(tdArr[8]);
147 - if(resdata.code==-1){ 152 + if (resdata.code == -1) {
148 layer.msg(resdata.msg) 153 layer.msg(resdata.msg)
149 tdArr = []; 154 tdArr = [];
150 $(this).closest('tr').remove(); 155 $(this).closest('tr').remove();
151 return; 156 return;
152 - }else { 157 + } else {
153 adjustObj.targetPhone = tdArr[8] 158 adjustObj.targetPhone = tdArr[8]
154 } 159 }
155 } 160 }
@@ -158,6 +163,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi @@ -158,6 +163,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
158 } 163 }
159 }); 164 });
160 }); 165 });
  166 +
161 //页面初始化 167 //页面初始化
162 function init() { 168 function init() {
163 loadSelect() 169 loadSelect()
@@ -165,6 +171,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi @@ -165,6 +171,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','commonDetail', 'sessi
165 initUploadPlus() 171 initUploadPlus()
166 172
167 } 173 }
  174 +
168 // 初始化下拉框 175 // 初始化下拉框
169 function loadSelect() { 176 function loadSelect() {
170 admin.req({ 177 admin.req({
@@ -42,7 +42,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -42,7 +42,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
42 var params = {} 42 var params = {}
43 params.staffList = staffsBak 43 params.staffList = staffsBak
44 params.staffRecord = JSON.stringify(data) 44 params.staffRecord = JSON.stringify(data)
45 - console.log(params)  
46 admin.req({ 45 admin.req({
47 url: domainName + '/api-room/machineRoom/machineRoomEnterStaff/save?access_token=' + accessToken, 46 url: domainName + '/api-room/machineRoom/machineRoomEnterStaff/save?access_token=' + accessToken,
48 data: JSON.stringify(params), 47 data: JSON.stringify(params),
@@ -76,6 +75,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -76,6 +75,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
76 var toEdit = this.value == '保存'; 75 var toEdit = this.value == '保存';
77 this.value = toEdit ? '删除' : '保存'; 76 this.value = toEdit ? '删除' : '保存';
78 var tdArr = [] 77 var tdArr = []
  78 + var tr = $(this).closest('tr');
79 $(this).closest('tr').find('td').not(':last').each(function (t, index) { 79 $(this).closest('tr').find('td').not(':last').each(function (t, index) {
80 if (toEdit) { 80 if (toEdit) {
81 this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;'); 81 this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
@@ -89,15 +89,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -89,15 +89,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
89 } 89 }
90 }) 90 })
91 if(!toEdit){ 91 if(!toEdit){
92 - var name = $(this).closest('tr').find('td')[0].innerHTML;  
93 - if(name!=''&& name!=undefined){ 92 + layer.confirm('确认要删除吗？', {icon: 3,yes: function (index, layero) {
  93 + var name = tr.find('td')[0].innerHTML;
  94 + console.log(name);
  95 + if (name != '' && name != undefined) {
94 for (let i = 0; i < staffsBak.length; i++) { 96 for (let i = 0; i < staffsBak.length; i++) {
95 - if(staffsBak[i].name == name){ 97 + if (staffsBak[i].name == name) {
96 staffsBak.pop(staffsBak[i]); 98 staffsBak.pop(staffsBak[i]);
97 } 99 }
98 } 100 }
99 } 101 }
100 - $(this).closest('tr').remove(); 102 + tr.remove();
  103 + layer.close(index);
  104 + },cancel:function (index,layer) {
  105 + layer.close(index);
  106 + }});
101 }else { 107 }else {
102 if(tdArr.length>0) { 108 if(tdArr.length>0) {
103 var staffObj = { 109 var staffObj = {
@@ -107,10 +113,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -107,10 +113,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
107 if(tdArr[1]!=''&& tdArr[1]!=undefined){ 113 if(tdArr[1]!=''&& tdArr[1]!=undefined){
108 var resdata = commonDetail.validatorPhone(tdArr[1]); 114 var resdata = commonDetail.validatorPhone(tdArr[1]);
109 if(resdata.code==-1){ 115 if(resdata.code==-1){
110 - layer.msg(resdata.msg) 116 + layer.confirm(resdata.msg+'确认要删除吗？', {
  117 + icon: 3, yes: function (index, layero) {
  118 + layer.load(2);
111 tdArr = []; 119 tdArr = [];
112 - $(this).closest('tr').remove();  
113 - return; 120 + staffObj ={};
  121 + tr.remove();
  122 + layer.closeAll('loading');
  123 + layer.close(index)
  124 + return
  125 + }, cancel: function (index, layero) {
  126 + staffObj.phone = tdArr[1]
  127 + layer.close(index);
  128 + }
  129 + });
114 }else { 130 }else {
115 staffObj.phone = tdArr[1] 131 staffObj.phone = tdArr[1]
116 } 132 }
@@ -118,16 +134,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi @@ -118,16 +134,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
118 if(tdArr[2]!=''&& tdArr[2]!=undefined){ 134 if(tdArr[2]!=''&& tdArr[2]!=undefined){
119 var res = commonDetail.validatorIDCard(tdArr[2]); 135 var res = commonDetail.validatorIDCard(tdArr[2]);
120 if(res.code==-1){ 136 if(res.code==-1){
121 - layer.msg(res.msg) 137 + layer.confirm(res.msg+'确认要删除吗？', {icon: 3,yes: function (index, layero) {
  138 + layer.load(2);
122 tdArr = []; 139 tdArr = [];
123 - $(this).closest('tr').remove();  
124 - return; 140 + staffObj={};
  141 + tr.remove();
  142 + layer.closeAll('loading');
  143 + layer.close(index);
  144 + return
  145 + },cancel: function (index, layero) {
  146 + staffObj.idCard = tdArr[2]
  147 + layer.close(index);
  148 + }
  149 + });
125 }else { 150 }else {
126 staffObj.idCard = tdArr[2] 151 staffObj.idCard = tdArr[2]
127 } 152 }
128 } 153 }
129 - console.log(staffObj) 154 + if(staffObj.phone && staffObj.idCard) {
130 staffsBak.push(staffObj) 155 staffsBak.push(staffObj)
  156 + }
131 157
132 } 158 }
133 } 159 }
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <label class="layui-form-label">机房</label> 41 <label class="layui-form-label">机房</label>
42 <div class="layui-input-inline"> 42 <div class="layui-input-inline">
43 <select name="machineRoomId" id="slt-staffadd-machine" 43 <select name="machineRoomId" id="slt-staffadd-machine"
44 - lay-filter="slt-staffadd-machine"> 44 + lay-filter="slt-staffadd-machine" lay-verify="required">
45 <option value="">=选择机房=</option> 45 <option value="">=选择机房=</option>
46 </select> 46 </select>
47 </div> 47 </div>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 <label class="layui-form-label">选择单位</label> 50 <label class="layui-form-label">选择单位</label>
51 <div class="layui-input-inline"> 51 <div class="layui-input-inline">
52 <select name="manufacturerId" id="slt-staffadd-group" 52 <select name="manufacturerId" id="slt-staffadd-group"
53 - lay-filter="slt-staffadd-group" > 53 + lay-filter="slt-staffadd-group" lay-verify="required">
54 <option value="">=工作单位=</option> 54 <option value="">=工作单位=</option>
55 </select> 55 </select>
56 <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none"> 56 <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none">
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <div class="layui-inline inline-onethird"> 11 <div class="layui-inline inline-onethird">
12 <label class="layui-form-label">机房</label> 12 <label class="layui-form-label">机房</label>
13 <div class="layui-input-inline"> 13 <div class="layui-input-inline">
14 - <select name="machineRoomId" id="slt-staffadd-machine" 14 + <select name="machineRoomId" id="slt-staffadd-machine" lay-verify="required"
15 lay-filter="slt-staffadd-machine"> 15 lay-filter="slt-staffadd-machine">
16 <option value="">=选择机房=</option> 16 <option value="">=选择机房=</option>
17 </select> 17 </select>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <label class="layui-form-label">选择单位</label> 21 <label class="layui-form-label">选择单位</label>
22 <div class="layui-input-inline"> 22 <div class="layui-input-inline">
23 <select name="manufacturerId" id="slt-staffadd-group" 23 <select name="manufacturerId" id="slt-staffadd-group"
24 - lay-filter="slt-staffadd-group" > 24 + lay-filter="slt-staffadd-group" lay-verify="required">
25 <option value="">=工作单位=</option> 25 <option value="">=工作单位=</option>
26 </select> 26 </select>
27 <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none"> 27 <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none">