运维管理板块

js/main.js

@@ -39,41 +39,43 @@ $(document).on('click', '.pure-table tbody.multipleChoice  tr', function() {
         $(this).find("td:eq(0)").removeClass('checked');
         filterAll();
 
-        // 取消选中，del数组里push id
+        console.log('监控是否有pd=====' + $(this).find("td:eq(0)").data('pd'))
+            // 取消选中，del数组里push id
         if ($(this).find("td:eq(0)").data('pd')) {
             arrDelPd.push($(this).find("td:eq(0)").data('id'))
             arrDelPd = unique(arrDelPd);
-            console.log('arrDelPd');
+            console.log('有pd的取消  arrDelPd');
             console.log(arrDelPd)
 
         } else {
 
             removeByValue(arr99, $(this).find("td:eq(0)").data('id'));
 
-            console.log('数组变量')
+            console.log('没有pd的取消  arr99')
             console.log(arr99)
 
         }
 
-
     } else {
         $(this).addClass("selected");
         $(this).find("td:eq(0)").addClass('checked');
 
         filterAll()
 
-        arr99.push($(this).find("td:eq(0)").data('id'))
-        arr99 = unique(arr99);
-        console.log('数组变量')
-        console.log(arr99)
 
 
         // pd的 取消选中再选中，del数组里去除 id
         if ($(this).find("td:eq(0)").data('pd')) {
             removeByValue(arrDelPd, $(this).find("td:eq(0)").data('id'));
             arrDelPd = unique(arrDelPd);
-            console.log('arrDelPd');
+            console.log('有pd的取消后重新选中  arrDelPd');
             console.log(arrDelPd)
+        } else {
+            arr99.push($(this).find("td:eq(0)").data('id'))
+            arr99 = unique(arr99);
+            console.log('没有pd的新增  arr99')
+            console.log(arr99)
+
         }
 
     }

js/plan-inner.js

@@ -24,21 +24,20 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
 
                 data.forEach(function(item, key) {
 
-
-                    if (arr99.indexOf(item.id) > -1) {
-                        items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.id + "' data-pd='" + item.pd + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
-                    } else {
-                        items += "<tr>" + "<td class='status' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
-                    }
-
-
-
                     if (item.pd) {
-                        items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.id + "' data-pd='" + item.pd + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
+                        if (arrDelPd.indexOf(item.id) > -1) {
+                            items += "<tr>" + "<td class='status ' data-id='" + item.id + "' data-pd='" + item.pd + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></ a></td>" + "</tr>"
+                        } else {
+                            items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.id + "' data-pd='" + item.pd + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></ a></td>" + "</tr>"
+                        }
+                    } else {
+                        if (arr99.indexOf(item.id) > -1) {
+                            items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></ a></td>" + "</tr>"
+                        } else {
+                            items += "<tr>" + "<td class='status' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></ a></td>" + "</tr>"
+                        }
                     }
 
-
-
                 });
                 $('#dataList2').html(items);
                 $('#dataList3').html(items);

js/plan.js

@@ -69,7 +69,6 @@ function getListDataAjax(queryParam = {}, page = 1) {
 getStaticAndSelectAjax({ "pd": "no" });
 
 function getStaticAndSelectAjax(queryParam = {}) {
-
     ajaxRequest(TEAM_PERSON, "POST", queryParam, function(result) {
         queryParam.pd = 'no';
         let data = result.RESULT;
@@ -181,7 +180,6 @@ layui.use('layer', function() {
     // 新增弹框
     $(document).on('click', '.add', function() {
         arr99 = [];
-
         layerCreateIndex = layer.open({
             type: 1,
             title: false,
@@ -203,6 +201,7 @@ layui.use('layer', function() {
     //修改弹框信息 
     $('.edit').click(function() {
         arr99 = [];
+        arrDelPd = [];
         filterAll();
 
         let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
@@ -340,30 +339,35 @@ $('#updateData').click(function() {
         alert(res.msg);
         return;
     }
-    //验证组织人员
 
 
-    //如果所有页面中没有被选中的，请选则提示
-    if (!arr99.length) {
-        // if (!$('.pure-table.pure-table-inner #dataList3 tr').has('.checked').length && !arrDelPd.length) {
-        layer.msg('请选择一条需要修改的信息!', { icon: 5 });
-        return
-    } else {
-        let spot_id = [];
-        spot_id = arr99;
-        spot_id = spot_id.join(',');
-        // alert(spot_id);
+    let spot_id = [];
+    spot_id = arr99;
+    spot_id = spot_id.join(',');
+    allParam.spot_id = spot_id;
+    // alert(spot_id);
+
+
+    let delete_id = [];
+    delete_id = arrDelPd;
+    delete_id = delete_id.join(',');
+    allParam.delete_id = delete_id;
+    // alert(delete_id);
+
 
-        allParam.spot_id = spot_id;
-    }
     let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
     allParam.id = dataId;
 
     ajaxRequest(PLAN_EDIT, "POST", allParam, function(result) {
-        innerPage = 1;
-        layer.close(layerUpdateIndex);
-        layer.msg('修改成功!', { icon: 6 });
-        getListDataAjax();
+        if (result.success == false) {
+            //服务端返回报错
+            alert(result.MSG);
+        } else {
+            innerPage = 1;
+            layer.close(layerUpdateIndex);
+            layer.msg('修改成功!', { icon: 6 });
+            getListDataAjax();
+        }
     }, function(errorMsg) {
         alert("数据修改失败!");
     }, 2)

js/team-inner.js

@@ -12,21 +12,40 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
         let items = '';
         if (result.totalCount > 0) {
             data.forEach(function(item, key) {
+
+
+                // if (item.pd) {
+                //     if (arrDelPd.indexOf(item.username) > -1) {
+                //         items += "<tr>" + "<td class='status ' data-id='" + item.id + "' data-pd='" + item.pd + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></ a></td>" + "</tr>"
+                //     } else {
+                //         items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.id + "' data-pd='" + item.pd + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></ a></td>" + "</tr>"
+                //     }
+                // } else {
+                //     if (arr99.indexOf(item.username) > -1) {
+                //         items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></ a></td>" + "</tr>"
+                //     } else {
+                //         items += "<tr>" + "<td class='status' data-id='" + item.id + "'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></ a></td>" + "</tr>"
+                //     }
+                // }
+
+
                 if (item.pd) {
-                    arr99.push(item.username)
-                    arr99 = unique(arr99);
+                    // 如果数组里含有item.id  被选中
+                    if (arr99.indexOf(item.username) > -1) {
+                        items += "<tr>" + "<td class='status'  data-pd='" + item.pd + "' data-id='" + item.username + "' data-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
+                    } else {
+                        items += "<tr class='selected'>" + "<td class='status checked'  data-pd='" + item.pd + "' data-id='" + item.username + "' data-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
+                    }
 
-                    // arrDelPd.push(item.username);
-                    // arrDelPd = unique(arrDelPd);
-                    console.log('arr99')
-                    console.log(arr99)
-                }
-                // 如果数组里含有item.id  被选中
-                if (arr99.indexOf(item.username) > -1) {
-                    items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.username + "' data-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
                 } else {
-                    items += "<tr>" + "<td class='status' data-id='" + item.username + "' data-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
+                    if (arr99.indexOf(item.username) > -1) {
+                        items += "<tr class='selected'>" + "<td class='status checked' data-id='" + item.username + "' data-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
+                    } else {
+                        items += "<tr>" + "<td class='status' data-id='" + item.username + "' data-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
+                    }
+
                 }
+
             })
             $('#dataList2').html(items);
             $('#dataList3').html(items);

js/team.js

@@ -185,6 +185,7 @@ layui.use('layer', function() {
     //修改弹框信息 
     $('.edit').click(function() {
         arr99 = [];
+        arrDelPd = [];
         filterAll();
         let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
         if (!$('.pure-table tr').has('.checked').length) {
@@ -262,19 +263,19 @@ $('#addData').click(function() {
             allParam.phone = phone;
 
             let userName = [];
-            // $(".pure-table-inner #dataList2 td.checked").each(function() {
-            //     userName.push($(this).attr("data-username"));
-            // });
             userName = arr99;
             allParam.RY_LIST = userName;
+
         }
 
         // 验证通过 请求ajax
         ajaxRequest(TEAM_ADD, "POST", allParam, function(result) {
             layer.close(layerCreateIndex);
-            layer.msg('添加成功!', { icon: 6 });
+            layer.msg('新增成功!', { icon: 6 });
             getListDataAjax();
             $('#addTeamForm')[0].reset();
+
+
         }, function(errorMsg) {
             alert("异常错误!");
         }, 3)
@@ -297,32 +298,43 @@ $('#dataUpdate').click(function() {
         return;
     }
     //验证组织人员
-    if (!$('.pure-table.pure-table-inner tr').has('.checked').length) {
-        layer.msg('请选择一条需要修改的信息!', { icon: 5 });
-        return
-    } else {
+    // if (!$('.pure-table.pure-table-inner tr').has('.checked').length) {
+    //     layer.msg('请选择一条需要修改的信息!', { icon: 5 });
+    //     return
+    // } else {
 
-        let phone = $('.editTeamOut').find("option:selected").attr("data-phone")
-        allParam.phone = phone;
 
-        let userName = [];
+    // }
+
+    let phone = $('.editTeamOut').find("option:selected").attr("data-phone")
+    allParam.phone = phone;
+
+    let userName = [];
+    userName = arr99;
+    allParam.RY_LIST = userName;
+
+    let delete_id = [];
+    delete_id = arrDelPd;
+    allParam.delete_id = delete_id;
+
 
-        userName = arr99;
-        // $(".editTeamOut .pure-table tr td.checked").each(function() {
-        //     userName.push($(this).attr("data-username"));
-        // });
-        allParam.RY_LIST = userName;
-    }
     let dataId = $('.pure-table tr').find('.checked').data('id');
 
     allParam.id = dataId;
 
     ajaxRequest(TEAM_EDIT, "POST", allParam, function(result) {
-        innerPage = 1;
-        $('#editTeamForm')[0].reset();
-        layer.close(layerUpdateIndex);
-        layer.msg('修改成功!', { icon: 6 });
-        getListDataAjax();
+
+        if (result.success == false) {
+            //服务端返回报错
+            alert(result.MSG);
+        } else {
+            innerPage = 1;
+            $('#editTeamForm')[0].reset();
+            layer.close(layerUpdateIndex);
+            layer.msg('修改成功!', { icon: 6 });
+            getListDataAjax();
+        }
+
     }, function(errorMsg) {
         alert("数据修改失败!");
     }, 2)

operate-manage.html

@@ -30,7 +30,7 @@
                 </ul>
             </div>
             <div class="column3 flex10">
-                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="pages/operation/plan.html"></iframe>
+                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="pages/operation/record.html"></iframe>
             </div>
         </div>
     </section>

pages/operation/plan.html

@@ -220,7 +220,7 @@
             <form action="" id="editDataForm">
                 <div class="ttBox">
                     <a class="clsBtn"></a>
-                    <span class="tt">新增维保计划</span>
+                    <span class="tt">修改维保计划</span>
                 </div>
 
                 <div class="chooseArea">