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

…eb into master-500-dev-lushangqing

@@ -132,8 +132,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
             })
             return false
         };
-
+        var deviceSaveCount = 0;
         $("#device_card :button#device_create").on("click", function () {
+            if(deviceSaveCount>0){
+                layer.msg('请先保存一条再新增', {
+                    icon: 7, time: 3000
+                });
+                return
+            }
+            deviceSaveCount+=1;
             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);
 
@@ -150,6 +157,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                                 icon: 7, time: 3000
                             });
                             tdArr = [];
+                            deviceSaveCount-=1;
                             $(this).closest('tr').remove();
                             return;
                         }
@@ -182,12 +190,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                             'deviceModel': tdArr[2],
                             'brand': tdArr[3]
                         }
+                        deviceSaveCount-=1;
                         devicesBak.push(deviceObj)
                     }
                 }
             });
         });
+        var fittingSaveCount =0;
         $("#fiting_card :button#fiting_create").on("click", function () {
+            if(fittingSaveCount>0){
+                layer.msg('请先保存一条再新增', {
+                    icon: 7, time: 3000
+                });
+                return
+            }
+            fittingSaveCount+=1;
             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);
 
@@ -203,6 +220,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                                 icon: 7, time: 3000
                             });
                             tdArr = [];
+                            fittingSaveCount-=1;
                             $(this).closest('tr').remove();
                             return;
                         }
@@ -228,6 +246,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                             'fittingName': tdArr[2],
                             'deviceModel': tdArr[3]
                         }
+                        fittingSaveCount-=1;
                         fittingsBak.push(fittingObj)
                     }
                 }

@@ -94,9 +94,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
             })
             return false;
         }
-
+        var saveCount =0;
         $("#routeAdjustDetail_create").on("click", function () {
             routeAdjustDetailId += 1;
+            if(saveCount>0){
+                layer.msg('请先保存一条再新增', {
+                    icon: 7, time: 3000
+                });
+                return
+            }
+            saveCount+=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);
 
@@ -114,6 +121,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                                 icon: 7, time: 3000
                             });
                             tdArr = [];
+                            saveCount-=1;
                             $(this).closest('tr').remove();
                             return;
                         }
@@ -154,12 +162,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                         if (tdArr[4] != '' && tdArr[4] != undefined) {
                             var resdata = commonDetail.validatorPhone(tdArr[4]);
                             if (resdata.code == -1) {
-                                layer.msg(resdata.msg, {
-                                    icon: 7, time: 3000
+                                layer.confirm(resdata.msg+'确认要删除吗？', {
+                                    icon: 3, yes: function (index, layero) {
+                                        layer.load(2);
+                                        tdArr = [];
+                                        adjustObj ={};
+                                        tr.remove();
+                                        layer.closeAll('loading');
+                                        layer.close(index)
+                                        return
+                                    }, cancel: function (index, layero) {
+                                        adjustObj.localPhone = tdArr[4]
+                                        layer.close(index);
+                                    }
                                 });
-                                tdArr = [];
-                                $(this).closest('tr').remove();
-                                return;
                             } else {
                                 adjustObj.localPhone = tdArr[4]
                             }
@@ -167,17 +183,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                         if (tdArr[8] != '' && tdArr[8] != undefined) {
                             var resdata = commonDetail.validatorPhone(tdArr[8]);
                             if (resdata.code == -1) {
+                                layer.confirm(resdata.msg+'确认要删除吗？', {
+                                    icon: 3, yes: function (index, layero) {
+                                        layer.load(2);
+                                        tdArr = [];
+                                        adjustObj ={};
+                                        tr.remove();
+                                        layer.closeAll('loading');
+                                        layer.close(index)
 
-                                layer.msg(resdata.msg, {
-                                    icon: 7, time: 3000
+                                        return
+                                    }, cancel: function (index, layero) {
+                                        adjustObj.targetPhone = tdArr[8]
+                                        layer.close(index);
+                                    }
                                 });
-                                tdArr = [];
-                                $(this).closest('tr').remove();
-                                return;
                             } else {
                                 adjustObj.targetPhone = tdArr[8]
                             }
                         }
+                        saveCount-=1;
                         adjustBak.push(adjustObj)
                     }
                 }

@@ -77,7 +77,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
             })
             return false
         }
+        var saveCount =0;
         $("#identifying_create").on("click",function () {
+            if(saveCount>0){
+                layer.msg('请先保存一条再新增', {
+                    icon: 7, time: 3000
+                });
+                return
+            }
+            saveCount+=1;
             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>"
             $("#identifying-table").append(html);
 
@@ -94,6 +102,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                                 icon: 7, time: 3000
                             });
                             tdArr = [];
+                            saveCount-=1;
                             $(this).closest('tr').remove();
                             return;
                         }
@@ -106,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                             console.log(name);
                             if (name != '' && name != undefined) {
                                 for (let i = 0; i < staffsBak.length; i++) {
-                                    if (staffsBak[i].name == name) {
+                                    if (staffsBak[i].userName == name) {
                                         staffsBak.pop(staffsBak[i]);
                                     }
                                 }
@@ -133,6 +142,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                                             tr.remove();
                                             layer.closeAll('loading');
                                             layer.close(index)
+
                                             return
                                         }, cancel: function (index, layero) {
                                             staffObj.phone = tdArr[1]
@@ -153,6 +163,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                                     tr.remove();
                                     layer.closeAll('loading');
                                     layer.close(index);
+
                                     return
                                 },cancel: function (index, layero) {
                                     staffObj.idCard = tdArr[2]
@@ -163,6 +174,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                                 staffObj.idCard = tdArr[2]
                             }
                         }
+                        saveCount-=1;
                         if(staffObj.phone && staffObj.idCard) {
                             staffsBak.push(staffObj)
                         }

@@ -113,7 +113,7 @@ layui.extend({
         try {
             let el = admin.tabsPage.elem;
             if(el && el.attr('lay-href-type')){
-                if(el.attr('lay-href-type') == 'menu'){
+                if(el.attr('lay-href-type') == 'menu' && !matchTo){
                     tabName=  admin.tabsPage.elem.text()
                 }
             }