Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-lushangqing
Showing
4 changed files
with
70 additions
and
14 deletions
| @@ -132,8 +132,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -132,8 +132,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
| 132 | }) | 132 | }) |
| 133 | return false | 133 | return false |
| 134 | }; | 134 | }; |
| 135 | - | 135 | + var deviceSaveCount = 0; |
| 136 | $("#device_card :button#device_create").on("click", function () { | 136 | $("#device_card :button#device_create").on("click", function () { |
| 137 | + if(deviceSaveCount>0){ | ||
| 138 | + layer.msg('请先保存一条再新增', { | ||
| 139 | + icon: 7, time: 3000 | ||
| 140 | + }); | ||
| 141 | + return | ||
| 142 | + } | ||
| 143 | + deviceSaveCount+=1; | ||
| 137 | 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>" | 144 | 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>" |
| 138 | $("#device-table").append(html); | 145 | $("#device-table").append(html); |
| 139 | 146 | ||
| @@ -150,6 +157,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -150,6 +157,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
| 150 | icon: 7, time: 3000 | 157 | icon: 7, time: 3000 |
| 151 | }); | 158 | }); |
| 152 | tdArr = []; | 159 | tdArr = []; |
| 160 | + deviceSaveCount-=1; | ||
| 153 | $(this).closest('tr').remove(); | 161 | $(this).closest('tr').remove(); |
| 154 | return; | 162 | return; |
| 155 | } | 163 | } |
| @@ -182,12 +190,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -182,12 +190,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
| 182 | 'deviceModel': tdArr[2], | 190 | 'deviceModel': tdArr[2], |
| 183 | 'brand': tdArr[3] | 191 | 'brand': tdArr[3] |
| 184 | } | 192 | } |
| 193 | + deviceSaveCount-=1; | ||
| 185 | devicesBak.push(deviceObj) | 194 | devicesBak.push(deviceObj) |
| 186 | } | 195 | } |
| 187 | } | 196 | } |
| 188 | }); | 197 | }); |
| 189 | }); | 198 | }); |
| 199 | + var fittingSaveCount =0; | ||
| 190 | $("#fiting_card :button#fiting_create").on("click", function () { | 200 | $("#fiting_card :button#fiting_create").on("click", function () { |
| 201 | + if(fittingSaveCount>0){ | ||
| 202 | + layer.msg('请先保存一条再新增', { | ||
| 203 | + icon: 7, time: 3000 | ||
| 204 | + }); | ||
| 205 | + return | ||
| 206 | + } | ||
| 207 | + fittingSaveCount+=1; | ||
| 191 | 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>" | 208 | 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>" |
| 192 | $("#fiting-table").append(html); | 209 | $("#fiting-table").append(html); |
| 193 | 210 | ||
| @@ -203,6 +220,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -203,6 +220,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
| 203 | icon: 7, time: 3000 | 220 | icon: 7, time: 3000 |
| 204 | }); | 221 | }); |
| 205 | tdArr = []; | 222 | tdArr = []; |
| 223 | + fittingSaveCount-=1; | ||
| 206 | $(this).closest('tr').remove(); | 224 | $(this).closest('tr').remove(); |
| 207 | return; | 225 | return; |
| 208 | } | 226 | } |
| @@ -228,6 +246,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -228,6 +246,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
| 228 | 'fittingName': tdArr[2], | 246 | 'fittingName': tdArr[2], |
| 229 | 'deviceModel': tdArr[3] | 247 | 'deviceModel': tdArr[3] |
| 230 | } | 248 | } |
| 249 | + fittingSaveCount-=1; | ||
| 231 | fittingsBak.push(fittingObj) | 250 | fittingsBak.push(fittingObj) |
| 232 | } | 251 | } |
| 233 | } | 252 | } |
| @@ -94,9 +94,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | @@ -94,9 +94,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | ||
| 94 | }) | 94 | }) |
| 95 | return false; | 95 | return false; |
| 96 | } | 96 | } |
| 97 | - | 97 | + var saveCount =0; |
| 98 | $("#routeAdjustDetail_create").on("click", function () { | 98 | $("#routeAdjustDetail_create").on("click", function () { |
| 99 | routeAdjustDetailId += 1; | 99 | routeAdjustDetailId += 1; |
| 100 | + if(saveCount>0){ | ||
| 101 | + layer.msg('请先保存一条再新增', { | ||
| 102 | + icon: 7, time: 3000 | ||
| 103 | + }); | ||
| 104 | + return | ||
| 105 | + } | ||
| 106 | + saveCount+=1; | ||
| 100 | 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>" | 107 | 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>" |
| 101 | $("#routeAdjustDetail-table").append(html); | 108 | $("#routeAdjustDetail-table").append(html); |
| 102 | 109 | ||
| @@ -114,6 +121,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | @@ -114,6 +121,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | ||
| 114 | icon: 7, time: 3000 | 121 | icon: 7, time: 3000 |
| 115 | }); | 122 | }); |
| 116 | tdArr = []; | 123 | tdArr = []; |
| 124 | + saveCount-=1; | ||
| 117 | $(this).closest('tr').remove(); | 125 | $(this).closest('tr').remove(); |
| 118 | return; | 126 | return; |
| 119 | } | 127 | } |
| @@ -154,12 +162,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | @@ -154,12 +162,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | ||
| 154 | if (tdArr[4] != '' && tdArr[4] != undefined) { | 162 | if (tdArr[4] != '' && tdArr[4] != undefined) { |
| 155 | var resdata = commonDetail.validatorPhone(tdArr[4]); | 163 | var resdata = commonDetail.validatorPhone(tdArr[4]); |
| 156 | if (resdata.code == -1) { | 164 | if (resdata.code == -1) { |
| 157 | - layer.msg(resdata.msg, { | ||
| 158 | - icon: 7, time: 3000 | ||
| 159 | - }); | 165 | + layer.confirm(resdata.msg+'确认要删除吗？', { |
| 166 | + icon: 3, yes: function (index, layero) { | ||
| 167 | + layer.load(2); | ||
| 160 | tdArr = []; | 168 | tdArr = []; |
| 161 | - $(this).closest('tr').remove(); | ||
| 162 | - return; | 169 | + adjustObj ={}; |
| 170 | + tr.remove(); | ||
| 171 | + layer.closeAll('loading'); | ||
| 172 | + layer.close(index) | ||
| 173 | + return | ||
| 174 | + }, cancel: function (index, layero) { | ||
| 175 | + adjustObj.localPhone = tdArr[4] | ||
| 176 | + layer.close(index); | ||
| 177 | + } | ||
| 178 | + }); | ||
| 163 | } else { | 179 | } else { |
| 164 | adjustObj.localPhone = tdArr[4] | 180 | adjustObj.localPhone = tdArr[4] |
| 165 | } | 181 | } |
| @@ -167,17 +183,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | @@ -167,17 +183,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | ||
| 167 | if (tdArr[8] != '' && tdArr[8] != undefined) { | 183 | if (tdArr[8] != '' && tdArr[8] != undefined) { |
| 168 | var resdata = commonDetail.validatorPhone(tdArr[8]); | 184 | var resdata = commonDetail.validatorPhone(tdArr[8]); |
| 169 | if (resdata.code == -1) { | 185 | if (resdata.code == -1) { |
| 186 | + layer.confirm(resdata.msg+'确认要删除吗？', { | ||
| 187 | + icon: 3, yes: function (index, layero) { | ||
| 188 | + layer.load(2); | ||
| 189 | + tdArr = []; | ||
| 190 | + adjustObj ={}; | ||
| 191 | + tr.remove(); | ||
| 192 | + layer.closeAll('loading'); | ||
| 193 | + layer.close(index) | ||
| 170 | 194 | ||
| 171 | - layer.msg(resdata.msg, { | ||
| 172 | - icon: 7, time: 3000 | 195 | + return |
| 196 | + }, cancel: function (index, layero) { | ||
| 197 | + adjustObj.targetPhone = tdArr[8] | ||
| 198 | + layer.close(index); | ||
| 199 | + } | ||
| 173 | }); | 200 | }); |
| 174 | - tdArr = []; | ||
| 175 | - $(this).closest('tr').remove(); | ||
| 176 | - return; | ||
| 177 | } else { | 201 | } else { |
| 178 | adjustObj.targetPhone = tdArr[8] | 202 | adjustObj.targetPhone = tdArr[8] |
| 179 | } | 203 | } |
| 180 | } | 204 | } |
| 205 | + saveCount-=1; | ||
| 181 | adjustBak.push(adjustObj) | 206 | adjustBak.push(adjustObj) |
| 182 | } | 207 | } |
| 183 | } | 208 | } |
| @@ -77,7 +77,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -77,7 +77,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 77 | }) | 77 | }) |
| 78 | return false | 78 | return false |
| 79 | } | 79 | } |
| 80 | + var saveCount =0; | ||
| 80 | $("#identifying_create").on("click",function () { | 81 | $("#identifying_create").on("click",function () { |
| 82 | + if(saveCount>0){ | ||
| 83 | + layer.msg('请先保存一条再新增', { | ||
| 84 | + icon: 7, time: 3000 | ||
| 85 | + }); | ||
| 86 | + return | ||
| 87 | + } | ||
| 88 | + saveCount+=1; | ||
| 81 | var html = "<tr><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|identify'></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 16px'/></td></tr>" | 89 | var html = "<tr><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|identify'></td><td><input type='button' value='保存' class='edit' style='background-color: #b71010;line-height: 16px'/></td></tr>" |
| 82 | $("#identifying-table").append(html); | 90 | $("#identifying-table").append(html); |
| 83 | 91 | ||
| @@ -94,6 +102,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -94,6 +102,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 94 | icon: 7, time: 3000 | 102 | icon: 7, time: 3000 |
| 95 | }); | 103 | }); |
| 96 | tdArr = []; | 104 | tdArr = []; |
| 105 | + saveCount-=1; | ||
| 97 | $(this).closest('tr').remove(); | 106 | $(this).closest('tr').remove(); |
| 98 | return; | 107 | return; |
| 99 | } | 108 | } |
| @@ -106,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -106,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 106 | console.log(name); | 115 | console.log(name); |
| 107 | if (name != '' && name != undefined) { | 116 | if (name != '' && name != undefined) { |
| 108 | for (let i = 0; i < staffsBak.length; i++) { | 117 | for (let i = 0; i < staffsBak.length; i++) { |
| 109 | - if (staffsBak[i].name == name) { | 118 | + if (staffsBak[i].userName == name) { |
| 110 | staffsBak.pop(staffsBak[i]); | 119 | staffsBak.pop(staffsBak[i]); |
| 111 | } | 120 | } |
| 112 | } | 121 | } |
| @@ -133,6 +142,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -133,6 +142,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 133 | tr.remove(); | 142 | tr.remove(); |
| 134 | layer.closeAll('loading'); | 143 | layer.closeAll('loading'); |
| 135 | layer.close(index) | 144 | layer.close(index) |
| 145 | + | ||
| 136 | return | 146 | return |
| 137 | }, cancel: function (index, layero) { | 147 | }, cancel: function (index, layero) { |
| 138 | staffObj.phone = tdArr[1] | 148 | staffObj.phone = tdArr[1] |
| @@ -153,6 +163,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -153,6 +163,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 153 | tr.remove(); | 163 | tr.remove(); |
| 154 | layer.closeAll('loading'); | 164 | layer.closeAll('loading'); |
| 155 | layer.close(index); | 165 | layer.close(index); |
| 166 | + | ||
| 156 | return | 167 | return |
| 157 | },cancel: function (index, layero) { | 168 | },cancel: function (index, layero) { |
| 158 | staffObj.idCard = tdArr[2] | 169 | staffObj.idCard = tdArr[2] |
| @@ -163,6 +174,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | @@ -163,6 +174,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi | ||
| 163 | staffObj.idCard = tdArr[2] | 174 | staffObj.idCard = tdArr[2] |
| 164 | } | 175 | } |
| 165 | } | 176 | } |
| 177 | + saveCount-=1; | ||
| 166 | if(staffObj.phone && staffObj.idCard) { | 178 | if(staffObj.phone && staffObj.idCard) { |
| 167 | staffsBak.push(staffObj) | 179 | staffsBak.push(staffObj) |
| 168 | } | 180 | } |
| @@ -113,7 +113,7 @@ layui.extend({ | @@ -113,7 +113,7 @@ layui.extend({ | ||
| 113 | try { | 113 | try { |
| 114 | let el = admin.tabsPage.elem; | 114 | let el = admin.tabsPage.elem; |
| 115 | if(el && el.attr('lay-href-type')){ | 115 | if(el && el.attr('lay-href-type')){ |
| 116 | - if(el.attr('lay-href-type') == 'menu'){ | 116 | + if(el.attr('lay-href-type') == 'menu' && !matchTo){ |
| 117 | tabName= admin.tabsPage.elem.text() | 117 | tabName= admin.tabsPage.elem.text() |
| 118 | } | 118 | } |
| 119 | } | 119 | } |
-
Please register or login to post a comment