改版页面及功能实现

api/request.js

@@ -157,15 +157,30 @@ const LOG_EXPORT = 'iot/log/getLogListExecl' //日志导出
 
 
 const RECORD_LIST = 'iot/spotoperationrecord/getList' //维保记录列表查询
-const RECORD_STATIC_AND_SELECT = 'iot/spotoperationrecord/getList3' //维保记录数据统计  
-const RECORD_EXPORT = 'iot/spotoperationrecord/getSpotOperationRecordListExcel' //维保记录导出
+const RECORD_STATIC_AND_SELECT = 'iot/spotoperationrecord/getList3' //维保记录数据统计及责任人下拉  
 const RECORD_AND_POINT = 'iot/spotoperationrecord/getJlPointsList' //维保点位弹框   
 const RECORD_POINT_DETAIL = 'iot/inspectionpoints/getList' //维保点位图片详情弹框
 
 
 const TEAM_LIST = 'iot/devopsteam/getDevopsTeamList'; //班组人员列表查询
+const TEAM_ADD = 'iot/devopsteam/appendDevopsTeam'; //班组人员新增
+const TEAM_EDIT = 'iot/devopsteam/updateDevopsTeam'; //班组人员修改
+const TEAM_DELETE = 'iot/devopsteam/deleteDevopsTeam'; //班组人员删除
+const TEAM_EXPORT = 'iot/devopsteam/getDevopsTeamListExcel' //班组人员导出
+
 const TEAM_PERSON = 'iot/devopsteam/getUserList'; //班组人员责任人下拉    
-const TEAM_INNERLIST = 'iot/devopsteam/getUserPdList'; //组织人员列表查询
+const TEAM_INNERLIST = 'iot/devopsteam/getUserPdList'; //组织人员列表查询   
+
+
+const PLAN_LIST = 'iot/planmaster/getList'; //维保计划列表查询  
+const TEAM_SELECT = 'iot/devopsteam/getDevopsTeamListbox'; //执行团队下拉  
+
+const PLAN_ADD = 'iot/planmaster/append'; //维保计划新增
+const PLAN_EDIT = 'iot/planmaster/update'; //维保计划修改
+const PLAN_DELETE = 'iot/planmaster/del'; //维保计划删除
+const PLAN_EXPORT = 'iot/inspectionpoints/getInspectionPointsListExcel' //维保计划导出
+
+
 
 
 

css/per-manage.css

@@ -418,14 +418,15 @@
     margin:5px;
     background:red; */
     }
-    /* 资产管理弹框样式 */
+    /* 资产管理 维保计划  弹框样式 */
     
-    .layui-col-xs4.choose-item {
-        /* margin-bottom:20px */
+    .layui-col-xs4.choose-item,
+    .layui-col-xs6.choose-item {
         margin-bottom: 10px
     }
     
-    .layui-col-xs4.choose-item span {
+    .layui-col-xs4.choose-item span,
+    .layui-col-xs6.choose-item span {
         width: 100px;
         text-align: right;
     }

device-manage.html

@@ -25,8 +25,8 @@
                     <li class="selected"><a href="pages/device-manage/deviceType.html" target="iframe">设备类型</a></li>
                     <li><a href="pages/device-manage/deviceList.html" target="iframe">设备列表</a></li>
                     <li><a href="pages/device-manage/deviceCommunicate.html" target="iframe">通信接口</a></li>
-                    <li><a href="pages/device-manage/deviceCheck.html" target="iframe">监测对象</a></li>
-                    <li><a href="pages/device-manage/deviceCheck-channel.html" target="iframe">设备监测对象通道表</a></li>
+                    <li><a href="pages/device-manage/deviceCheck.html" target="iframe">监测点位</a></li>
+                    <li><a href="pages/device-manage/deviceCheck-channel.html" target="iframe">监测通道</a></li>
                 </ul>
             </div>
             <div class="column3 flex10">

js/plan-inner.js

@@ -0,0 +1,119 @@
+/**新增 修改弹框中的列表渲染及分页操作**/
+
+var innerPage = 1;
+
+
+// 新增修改 组织人员 列表渲染 ajax请求
+function getTeamInnerList(queryParam = {}, innerPage = 1) {
+    queryParam.page = innerPage;
+    queryParam.limit = 5; // 每页显示条数
+    queryParam.start = (queryParam.page - 1) * queryParam.limit;
+    ajaxRequest(RECORD_POINT_DETAIL, "POST", queryParam, function(result) {
+        let data = result.RESULT;
+        let items = '';
+        if (result.totalCount > 0) {
+            data.forEach(function(item, key) {
+                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.dwid + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
+            })
+            $('#dataList2').html(items);
+            $('#dataList3').html(items);
+        } else {
+            $('#dataList2').html('');
+            $('#dataList3').html('');
+        }
+        console.log(result)
+        totalPages = result.totalCount / result.limit;
+        totalPages = Math.ceil(totalPages);
+        $('#totalPage2').html(totalPages); // 总共多少页
+        $('#dataTotal2').html(result.totalCount); // 总共多少条数据
+        $('#currentPage2').val(innerPage); // 当前页面
+        let pageFrom = (innerPage - 1) * result.limit + 1; // 开始
+        let pageTo = result.page * result.limit; // 结束
+        pageTo = pageTo > result.totalCount ? result.totalCount : pageTo;
+        $('#pageFrom2').html(pageFrom);
+        $('#pageTo2').html(pageTo);
+
+        // 无数据时
+        if (!result.totalCount) {
+            $('.pager2.has-data').hide()
+            $('.pager2.no-data').show()
+        } else {
+            $('.pager2.has-data').show()
+            $('.pager2.no-data').hide()
+        }
+        if (innerPage < totalPages) {
+            $('#nextPageButton2,#lastPageButton2').removeClass('disabled');
+        } else {
+            $('#nextPageButton2,#lastPageButton2').addClass('disabled');
+        }
+        if (innerPage === 1) {
+            $('#firstPageButton2,#prevPageButton2').addClass('disabled');
+        } else {
+            $('#firstPageButton2,#prevPageButton2').removeClass('disabled');
+        }
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    }, 3)
+};
+
+
+// 分页操作
+$('#firstPageButton2').on('click', function() {
+    innerPage = 1;
+    getTeamInnerList({}, 1);
+});
+
+$('#lastPageButton2').on('click', function() {
+    innerPage = totalPages;
+    getTeamInnerList({}, innerPage);
+});
+
+$('#prevPageButton2').on('click', function() {
+    innerPage -= 1;
+    getTeamInnerList({}, innerPage);
+});
+
+$('#nextPageButton2').on('click', function() {
+    innerPage += 1;
+    getTeamInnerList({}, innerPage);
+})
+
+// 分页刷新按钮
+$('.pg-refresh2').click(resetForm);
+
+// 重置表单
+function resetForm() {
+    innerPage = 1;
+    getTeamInnerList();
+}
+
+
+//点位详情弹框
+$(document).on('click', 'a.pointDetail', function() {
+    let dwId = $(this).data('id');
+    layerDepartmentIndex = layer.open({
+        type: 1,
+        title: false,
+        closeBtn: 0,
+        shadeClose: true,
+        skin: 'yourclass',
+        area: [
+            '400px', '400px'
+        ],
+        content: $(".pointDetailOut"),
+        success: function() {
+            ajaxRequest(RECORD_POINT_DETAIL, "POST", { "id": dwId }, function(result) {
+                console.log(result.RESULT[0])
+                var data = result.RESULT[0];
+                $('#pointDetailUrl').attr('src', data.picture_route);
+            }, function(errorMsg) {
+                alert("请求数据失败!");
+            }, 3);
+
+            $('.clsBtn2,.cancel2').click(function() {
+                innerPage = 1;
+                layer.close(layerDepartmentIndex);
+            })
+        }
+    })
+})

js/plan.js

@@ -3,61 +3,36 @@ var totalPages = 0;
 
 var param1 = '';
 var param2 = '';
-var param3 = '';
-var param4 = '';
-var param5 = '';
 
-// 数据统计及责任人下拉 start
-getStaticAndSelectAjax();
-
-function getStaticAndSelectAjax(queryParam = {}) {
-
-    ajaxRequest(RECORD_STATIC_AND_SELECT, "POST", queryParam, function(result) {
-        let data = result.RESULT1;
-        $('#xjrysl').html(result.xjrysl)
-        $('#jrrw').html(result.jrrw)
-        $('#csrw').html(result.csrw)
-        $('#jrwcrw').html(result.jrwcrw)
-
-        let items = '';
-        data.forEach(function(item, key) {
-            items += `<option value="${item.person_liable_id}">${item.name}</option>`
-        })
-        $('#person_liable_id').append(items);
-    }, function(errorMsg) {
-        alert("请求数据失败!");
-    })
-}
-// 数据统计及责任人下拉end
+var aa = ''
 
 //列表渲染
 getListDataAjax();
-
-//获取列表 ajax请求
+//获取列表ajax请求
 function getListDataAjax(queryParam = {}, page = 1) {
     queryParam.page = page;
     queryParam.limit = 8; //每页显示条数
     queryParam.start = (queryParam.page - 1) * queryParam.limit;
-    ajaxRequest(RECORD_LIST, "POST", queryParam, function(result) {
+    ajaxRequest(PLAN_LIST, "POST", queryParam, function(result) {
         let data = result.RESULT;
         let items = '';
         if (result.totalCount > 0) {
             data.forEach(function(item, key) {
                 items += "<tr>" +
-                    "<td class='status'></td>" +
+                    "<td class='status'  data-user='" + JSON.stringify(item) + "' data-id='" + item.id + "'></td>" +
                     "<td>" + item.xh + "</td>" +
                     "<td>" + item.plan_name + "</td>" +
-                    "<td>" + item.id + "</td>" +
-                    "<td>" + item.ywcsj + "</td>" +
-                    "<td>" + item.zt + "</td>" +
-                    "<td>" + item.completion + "</td>" +
+                    "<td>" + item.cycle_name + "</td>" +
+                    "<td>" + item.zxsj + "</td>" +
+                    "<td>" + item.plan_name + "</td>" +
+                    "<td>" + item.name + "</td>" +
                     "</tr>"
             })
             $('#dataList').html(items);
         } else {
             $('#dataList').html('');
         }
-        console.log(result)
+
         totalPages = result.totalCount / result.limit;
         totalPages = Math.ceil(totalPages);
         $('#totalPage').html(totalPages); //总共多少页
@@ -92,30 +67,77 @@ function getListDataAjax(queryParam = {}, page = 1) {
     }, 3)
 }
 
+
+// 责任人下拉 start
+getStaticAndSelectAjax({ "pd": "no" });
+
+function getStaticAndSelectAjax(queryParam = {}) {
+
+    ajaxRequest(TEAM_PERSON, "POST", queryParam, function(result) {
+        queryParam.pd = 'no';
+        let data = result.RESULT;
+
+        let items = '';
+        data.forEach(function(item, key) {
+            items += `<option value="${item.id}">${item.username}</option>`
+        })
+        $('#person_liable_id').append(items);
+        $('#person_liable_id2').append(items);
+        $('#person_liable_id3').append(items);
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    }, 3)
+}
+// 责任人下拉end
+
+//单位下拉
+getNameList()
+    //单位下拉 ajax请求
+function getNameList() {
+    ajaxRequest(DEVICE_TYPE_COMPANYLIST, "POST", {}, function(result) {
+        let data = result.RESULT;
+        let items = '';
+        data.forEach(function(item, key) {
+            items += `<option value="${item.owner_id}">${item.owner_name}</option>`
+        })
+        $('#getNameList').append(items);
+        $('#getNameList3').append(items);
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    })
+}
+
+//执行团队下拉
+getTeamList()
+    //执行团队下拉 ajax请求
+function getTeamList() {
+    ajaxRequest(TEAM_SELECT, "POST", {}, function(result) {
+        let data = result.RESULT;
+        let items = '';
+        data.forEach(function(item, key) {
+            items += `<option value="${item.id}">${item.team_name}</option>`
+        })
+        $('#getTeamList').append(items);
+        $('#getTeamList3').append(items);
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    })
+}
+
 //按钮搜索
 $('#buttonSearch').on('click', function() {
     page = 1;
     getListDataAjax(getSearchParamObj());
 
-    param1 = $('#data3a').val()
-    param2 = $('#data3b').val()
-    param3 = $('#zt').val()
-    param4 = $('#plan_name').val()
-    param5 = $('#person_liable_id').val()
+    param1 = $('#plan_name').val()
+    param2 = $('#person_liable_id').val()
 })
 
 //拼接搜索条件
 function getSearchParamObj() {
     let queryParam = {};
-    let data3a = $('#data3a').val();
-    let data3b = $('#data3b').val();
-    let zt = $('#zt').val();
-    let plan_name = $('#plan_name').val()
+    let plan_name = $('#plan_name').val();
     let person_liable_id = $('#person_liable_id').val();
-
-    queryParam.data3a = data3a;
-    queryParam.data3b = data3b;
-    queryParam.zt = zt;
     queryParam.plan_name = plan_name;
     queryParam.person_liable_id = person_liable_id;
     return queryParam;
@@ -130,17 +152,11 @@ $('.pg-refresh').click(resetForm);
 function resetForm() {
     page = 1;
 
-    $("#data3a").val("");
-    $("#data3b").val("");
-    $("#zt").val("4");
     $("#plan_name").val("");
     $("#person_liable_id").val("");
     getListDataAjax(getSearchParamObj());
 
-    param1 = $('#data3a').val()
-    param2 = $('#data3b').val()
-    param3 = $('#zt').val()
-    param4 = $('#plan_name').val()
+    param1 = $('#plan_name').val()
     param5 = $('#person_liable_id').val()
 }
 
@@ -149,78 +165,80 @@ $('#firstPageButton').on('click', function() {
     page = 1;
     getListDataAjax(getSearchParamObj(), 1);
 })
-
 $('#lastPageButton').on('click', function() {
     page = totalPages;
     getListDataAjax({}, page);
 })
-
 $('#prevPageButton').on('click', function() {
     page -= 1;
     getListDataAjax(getSearchParamObj(), page);
 })
-
 $('#nextPageButton').on('click', function() {
     page += 1;
     getListDataAjax(getSearchParamObj(), page);
 })
 
 
-
 /*新增 修改 关闭 弹框*/
 var layer = layui.layer;
 var layerCreateIndex = '';
 var layerUpdateIndex = ''
 layui.use('layer', function() {
 
-    //新增弹框
-    $('.add').click(function() {
-            layerCreateIndex = layer.open({
+    // 新增弹框
+    $(document).on('click', '.add', function() {
+        layerCreateIndex = layer.open({
+            type: 1,
+            title: false,
+            closeBtn: 0,
+            skin: 'yourclass',
+            area: ['800px', '600px'],
+            content: $(".addDataOut"),
+            success: function() {
+                getTeamInnerList();
+                $('.clsBtn,.cancel').click(function() {
+                    layer.close(layerCreateIndex);
+                })
+            }
+        })
+
+
+    })
+
+    //修改弹框信息 
+    $('.edit').click(function() {
+        let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
+
+        if (!$('.pure-table tr').has('.checked').length) {
+            layer.msg('请选择一条需要修改的信息!', { icon: 5 });
+        } else {
+            let userInfo = $('.pure-table tr').find('.checked').data('user');
+            $('.editDataOut input[name=plan_name]').val(userInfo.plan_name)
+            $('.editDataOut select[name=team_id]').val(userInfo.team_id)
+            $('.editDataOut select[name=company_code]').val(userInfo.company_code)
+            $('.editDataOut input[name=cycle]').val(userInfo.cycle)
+            $('.editDataOut input[name=start_inspect_time]').val(userInfo.start_inspect_time)
+            $('.editDataOut input[name=end_inspect_time]').val(userInfo.end_inspect_time)
+            $('.editDataOut input[name=start_date]').val(userInfo.start_date)
+            $('.editDataOut input[name=end_date]').val(userInfo.end_date)
+
+            layerUpdateIndex = layer.open({
                 type: 1,
                 title: false,
                 closeBtn: 0,
                 shadeClose: true,
                 skin: 'yourclass',
-                area: ['450px', '500px'],
-                content: $(".addDeviceTypeOut"),
+                area: ['800px', '600px'],
+                content: $(".editDataOut"),
                 success: function() {
+                    getTeamInnerList({ "dwid": dataId });
                     $('.clsBtn,.cancel').click(function() {
-                        layer.close(layerCreateIndex);
+                        layer.close(layerUpdateIndex);
                     })
                 }
-            })
-        }),
-        //修改弹框信息 
-        $('.edit').click(function() {
-
-            if (!$('.pure-table tr').has('.checked').length) {
-                layer.msg('请选择一条需要修改的信息!', { icon: 5 });
-            } else {
-                let userInfo = $('.pure-table tr').find('.checked').data('user');
-
-                $('.editDeviceTypeOut input[name=type_name]').val(userInfo.type_name)
-                $('.editDeviceTypeOut input[name=type_value]').val(userInfo.type_value)
-                $('.editDeviceTypeOut select[name=transmission_model]').val(userInfo.transmission_model)
-                $('.editDeviceTypeOut input[name=business').val(userInfo.business)
-                $('.editDeviceTypeOut select[name=company_code]').val(userInfo.company_code)
-                $('.editDeviceTypeOut input[name=id').val(userInfo.id)
-
-                layerUpdateIndex = layer.open({
-                    type: 1,
-                    title: false,
-                    closeBtn: 0,
-                    shadeClose: true,
-                    skin: 'yourclass',
-                    area: ['410px', '400px'],
-                    content: $(".editDeviceTypeOut"),
-                    success: function() {
-                        $('.clsBtn,.cancel').click(function() {
-                            layer.close(layerUpdateIndex);
-                        })
-                    }
-                });
-            }
-        })
+            });
+        }
+    })
 
     //删除信息
     $('.delete').click(function() {
@@ -228,10 +246,9 @@ layui.use('layer', function() {
             //layer.msg('请选择一条需要修改的信息');
             layer.msg('请选择一条需要删除的信息!', { icon: 5 });
         } else {
-            let dataId = $('.pure-table tr').find('.checked').data('id');
-            ajaxRequest(DEVICE_TYPE_DELETE, "POST", { "ID_LIST": [{ "id": dataId }] }, function(result) {
+            let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
+            ajaxRequest(PLAN_DELETE, "POST", { "ID_LIST": [{ "id": dataId }] }, function(result) {
                 $(".pure-table tbody tr.selected").remove()
-                let data = result
                 layer.close(layer.layerCreateIndex);
                 layer.msg('删除成功!', { icon: 6 });
                 getListDataAjax()
@@ -244,85 +261,110 @@ layui.use('layer', function() {
 })
 
 /* 新增发送请求 */
-$('#addMenu').click(function() {
-
-    //获取表单的值 并转换成对象
-    let allParam = serializeArrayToObj($("#addMenuForm").serializeArray());
-
-    //验证数据是否为空
-    let res = validParamIsEmpty(allParam, {
-        "type_name": "请输入类型名称",
-        "type_value": "请输入类型参数",
-        "transmission_model": "请选择传输类型",
-        "business": "请输入厂家名称",
-        "company_code": "请选择所属单位",
-    });
+$('#addData').click(function() {
+
+        //获取表单的值 并转换成对象
+        let allParam = serializeArrayToObj($("#addDataForm").serializeArray());
+
+        //验证数据是否为空
+        let res = validParamIsEmpty(allParam, {
+            "plan_name": "请输入任务名称",
+            "team_id": "请选择执行团队",
+            "company_code": "请选择单位",
+            "cycle": "请选择周期",
+            "start_inspect_time": "请选择维保开始时间",
+            "end_inspect_time": "请选择维保结束时间",
+            "start_date": "请选择执行开始日期",
+            "end_date": "请选择执行结束日期",
+        });
+
+        if (res.code == -1) {
+            alert(res.msg);
+            return;
+        }
+        //验证组织人员
+        if (!$('.pure-table.pure-table-inner tr').has('.checked').length) {
+            layer.msg('请选择一条需要修改的信息!', { icon: 5 });
+            return
+        } else {
+            let spot_id = $('.pure-table tr').find('.checked').data('id');
+            allParam.spot_id = spot_id;
+        }
 
-    if (res.code == -1) {
-        alert(res.msg);
-        return;
-    }
 
-    //验证通过 请求ajax
-    ajaxRequest(DEVICE_TYPE_ADD, "POST", allParam, function(result) {
-        layer.close(layerCreateIndex);
-        layer.msg('添加成功!', { icon: 6 });
-        getListDataAjax();
-        $('#addMenuForm')[0].reset();
-    }, function(errorMsg) {
-        alert("异常错误!");
+        //验证通过 请求ajax
+        ajaxRequest(PLAN_ADD, "POST", allParam, function(result) {
+            layer.close(layerCreateIndex);
+            layer.msg('添加成功!', { icon: 6 });
+            getListDataAjax();
+            $('#addDataForm')[0].reset();
+        }, function(errorMsg) {
+            alert("异常错误!");
+        }, 3)
     })
-})
-
-/* 修改发送请求 */
-$('#dataUpdate').click(function() {
+    /* 修改发送请求 */
+$('#updateData').click(function() {
 
     //获取表单的值 并转换成对象
-    let allParam = serializeArrayToObj($("#updateMenuForm").serializeArray());
+    let allParam = serializeArrayToObj($("#editDataForm").serializeArray());
 
     //验证数据是否为空
     let res = validParamIsEmpty(allParam, {
-        "type_name": "请输入类型名称",
-        "type_value": "请输入类型参数",
-        "transmission_model": "请选择传输方式",
-        "business": "请输入厂家名称",
+        "plan_name": "请输入任务名称",
+        "team_id": "请选择执行团队",
+        "company_code": "请选择单位",
+        "cycle": "请选择周期",
+        "start_inspect_time": "请选择维保开始时间",
+        "end_inspect_time": "请选择维保结束时间",
+        "start_date": "请选择执行开始日期",
+        "end_date": "请选择执行结束日期",
     });
 
     if (res.code == -1) {
         alert(res.msg);
         return;
     }
+    //验证组织人员
+    if (!$('.pure-table.pure-table-inner tr').has('.checked').length) {
+        layer.msg('请选择一条需要修改的信息!', { icon: 5 });
+        return
+    } else {
+        let spot_id = $('.pure-table tr').find('.checked').data('id');
+        allParam.spot_id = spot_id;
+    }
+    let dataId = $('.pure-table tr').find('.checked').data('id');
+
+    allParam.id = dataId;
 
-    ajaxRequest(DEVICE_TYPE_UPDATE, "POST", allParam, function(result) {
+    ajaxRequest(PLAN_EDIT, "POST", allParam, function(result) {
         layer.close(layerUpdateIndex);
         layer.msg('修改成功!', { icon: 6 });
         getListDataAjax();
     }, function(errorMsg) {
         alert("数据修改失败!");
-    })
+    }, 2)
 })
 
 
-
 // 导出 start
 $('.export').click(function() {
-    getDataExport({ "data3a": param1, "data3b": param2, "zt": param3, "plan_name": param4, "person_liable_id": param5 })
+    getDataExport({ "plan_name": param1, "person_liable_id": param2 })
 })
 
 function getDataExport(queryParam = {}) {
     // 输出base64编码
     const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
-    ajaxRequest(RECORD_EXPORT, "POST", queryParam, function(result) {
+    ajaxRequest(TEAM_EXPORT, "POST", queryParam, function(result) {
         console.log('result.RESULT')
         console.log(result.RESULT)
         let data = result.RESULT;
         let newData = [];
         if (data) {
             data.forEach(function(item, index) {
-                newData.push({ xh: item.xh, plan_name: item.plan_name, ywcsj: item.ywcsj, zt: item.zt, completion: item.completion, name: item.name, phone: item.phone })
+                newData.push({ xh: item.xh, plan_name: item.plan_name, company_name: item.company_name, name: item.name, phone: item.phone, person_liable_id: item.person_liable_id, add_time: item.add_time })
             });
         }
-        let str = '<tr style="text-align:center"><th>序号</th><th>任务名称</th><th>应完成时间</th><th>当前状态</th><th>完成情况%</th><th>相关责任人</th><th>联系电话</th></tr>';
+        let str = '<tr style="text-align:center"><th>序号</th><th>团队名称</th><th>所属单位</th><th>责任人</th><th>联系方式</th><th>创建人</th><th>创建时间</th></tr>';
         // 循环遍历，每行加入tr标签，每个单元格加td标签
         for (let i = 0; i < newData.length; i++) {
             str += '<tr style="text-align:center">';
@@ -350,7 +392,7 @@ function getDataExport(queryParam = {}) {
         const link = document.createElement("a");
         link.href = uri + base64(template);
         // 对下载的文件命名
-        link.download = "维保记录数据表.xls";
+        link.download = "班组人员数据表.xls";
         link.click();
 
     }, function(errorMsg) {

js/record-inner.js

@@ -145,7 +145,7 @@ $(document).on('click', 'a.pointDetail', function() {
             ajaxRequest(RECORD_POINT_DETAIL, "POST", { "id": dwId }, function(result) {
                 console.log(result.RESULT[0])
                 var data = result.RESULT[0];
-                $('#pointDetailUrl').attr('src', data.picture_route);
+                $('#pointDetailUrl').attr('src', BASEURL + data.picture_route);
             }, function(errorMsg) {
                 alert("请求数据失败!");
             }, 3);

js/team-inner.js

@@ -1,45 +1,27 @@
-// 新增弹框
-$(document).on('click', '.add', function() {
-    layerCreateIndex = layer.open({
-        type: 1,
-        title: false,
-        closeBtn: 0,
-        shadeClose: true,
-        skin: 'yourclass',
-        area: ['450px', '500px'],
-        content: $(".addDeviceTypeOut"),
-        success: function() {
-            $('.clsBtn,.cancel').click(function() {
-                layer.close(layerCreateIndex);
-            })
-        }
-    })
-})
-
-// 新增列表渲染
+/**新增 修改弹框中的列表渲染及分页操作**/
 
+var innerPage = 1;
 
 
-
-// 获取列表 ajax请求
+// 新增修改 组织人员 列表渲染 ajax请求
 function getTeamInnerList(queryParam = {}, innerPage = 1) {
     queryParam.page = innerPage;
     queryParam.limit = 1; // 每页显示条数
     queryParam.start = (queryParam.page - 1) * queryParam.limit;
-    ajaxRequest(RECORD_AND_POINT, "POST", queryParam, function(result) {
+    ajaxRequest(TEAM_INNERLIST, "POST", queryParam, function(result) {
         let data = result.RESULT;
         let items = '';
         if (result.totalCount > 0) {
             data.forEach(function(item, key) {
-                items += "<tr>" + "<td class='status'></td>" + "<td>" + item.spot_name + "</td>" + "<td>" + item.spot_address + "</td>" + "<td>" + item.wcqk +
-                    "</td>" + "<td>" + item.wcqk + "</td>" + "<td>" + item.wcqk + "</td>" +
-                    "<td ><a class='pointDetail' data-id=" + item.dwid + "><img src='../../images/tupianbtn.png'></a></td>" + "<td ><a class='weibaoReport' data-id=" + item.jlid + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
+                items += "<tr>" + "<td class='status' data-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
             })
             $('#dataList2').html(items);
+            $('#dataList3').html(items);
         } else {
             $('#dataList2').html('');
+            $('#dataList3').html('');
         }
-        // console.log(result)
+        console.log(result)
         totalPages = result.totalCount / result.limit;
         totalPages = Math.ceil(totalPages);
         $('#totalPage2').html(totalPages); // 总共多少页
@@ -78,106 +60,29 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
 // 分页操作
 $('#firstPageButton2').on('click', function() {
     innerPage = 1;
-    getTeamInnerList(getSearchParamObj2(), 1);
+    getTeamInnerList({}, 1);
 });
 
 $('#lastPageButton2').on('click', function() {
     innerPage = totalPages;
-    getTeamInnerList(getSearchParamObj2(), innerPage);
+    getTeamInnerList({}, innerPage);
 });
 
 $('#prevPageButton2').on('click', function() {
     innerPage -= 1;
-    getTeamInnerList(getSearchParamObj2(), innerPage);
+    getTeamInnerList({}, innerPage);
 });
 
 $('#nextPageButton2').on('click', function() {
     innerPage += 1;
-    getTeamInnerList(getSearchParamObj2(), innerPage);
-})
-
-
-// 按钮搜索
-$('#buttonSearch2').on('click', function() {
-    innerPage = 1;
-    getTeamInnerList(getSearchParamObj2());
+    getTeamInnerList({}, innerPage);
 })
 
-// 拼接搜索条件
-function getSearchParamObj2() {
-    let queryParam = {};
-    let weibao = $('#weibao').val();
-    queryParam.data3 = weibao;
-    queryParam.id = pointId;
-    return queryParam;
-}
 // 分页刷新按钮
 $('.pg-refresh2').click(resetForm);
 
 // 重置表单
 function resetForm() {
     innerPage = 1;
-    $("#weibao").val("0");
-    getTeamInnerList(getSearchParamObj2());
-}
-
-
-//点位详情弹框
-// $(document).on('click', 'a.pointDetail', function() {
-//     let dwId = $(this).data('id');
-//     layerDepartmentIndex = layer.open({
-//         type: 1,
-//         title: false,
-//         closeBtn: 0,
-//         shadeClose: true,
-//         skin: 'yourclass',
-//         area: [
-//             '400px', '400px'
-//         ],
-//         content: $(".pointDetailOut"),
-//         success: function() {
-//             ajaxRequest(RECORD_POINT_DETAIL, "POST", { "id": dwId }, function(result) {
-//                 console.log(result.RESULT[0])
-//                 var data = result.RESULT[0];
-//                 $('#pointDetailUrl').attr('src', data.picture_route);
-//             }, function(errorMsg) {
-//                 alert("请求数据失败!");
-//             }, 3);
-
-//             $('.clsBtn2,.cancel2').click(function() {
-//                 innerPage = 1;
-//                 layer.close(layerDepartmentIndex);
-//             })
-//         }
-//     })
-// })
-
-//维保报告点击
-// $(document).on('click', 'a.weibaoReport', function() {
-//     let jlId = $(this).data('id'); //单位ID
-//     layerReportIndex = layer.open({
-//         type: 1,
-//         title: false,
-//         closeBtn: 0,
-//         shadeClose: true,
-//         skin: 'yourclass',
-//         area: [
-//             '400px', '400px'
-//         ],
-//         content: $(".weibaoReportOut"),
-//         success: function() {
-//             ajaxRequest(RECORD_AND_POINT, "POST", { "jlid": jlId }, function(result) {
-//                 console.log(result.RESULT[0])
-//                 var data = result.RESULT[0];
-//                 $('#weibaoReportUrl').attr('src', data.report_photos);
-//             }, function(errorMsg) {
-//                 alert("请求数据失败!");
-//             }, 3);
-
-//             $('.clsBtn3,.cancel3').click(function() {
-//                 innerPage = 1;
-//                 layer.close(layerReportIndex);
-//             })
-//         }
-//     })
-// })
+    getTeamInnerList();
+}

js/team.js

@@ -4,33 +4,11 @@ var totalPages = 0;
 var param1 = '';
 var param2 = '';
 
-
-// 数据统计及责任人下拉 start
-getStaticAndSelectAjax({ "pd": "no" });
-
-function getStaticAndSelectAjax(queryParam = {}) {
-
-    ajaxRequest(TEAM_PERSON, "POST", queryParam, function(result) {
-        queryParam.pd = 'no';
-        console.log('result')
-        console.log(result)
-        let data = result.RESULT;
-
-        let items = '';
-        data.forEach(function(item, key) {
-            items += `<option value="${item.id}">${item.username}</option>`
-        })
-        $('#add_people').append(items);
-    }, function(errorMsg) {
-        alert("请求数据失败!");
-    }, 3)
-}
-// 数据统计及责任人下拉end
+var aa = ''
 
 //列表渲染
 getListDataAjax();
-
-//获取列表 ajax请求
+//获取列表ajax请求
 function getListDataAjax(queryParam = {}, page = 1) {
     queryParam.page = page;
     queryParam.limit = 8; //每页显示条数
@@ -41,7 +19,7 @@ function getListDataAjax(queryParam = {}, page = 1) {
         if (result.totalCount > 0) {
             data.forEach(function(item, key) {
                 items += "<tr>" +
-                    "<td class='status'></td>" +
+                    "<td class='status'  data-user='" + JSON.stringify(item) + "' data-id='" + item.id + "'></td>" +
                     "<td>" + item.xh + "</td>" +
                     "<td>" + item.team_name + "</td>" +
                     "<td>" + item.company_name + "</td>" +
@@ -55,7 +33,7 @@ function getListDataAjax(queryParam = {}, page = 1) {
         } else {
             $('#dataList').html('');
         }
-        console.log(result)
+
         totalPages = result.totalCount / result.limit;
         totalPages = Math.ceil(totalPages);
         $('#totalPage').html(totalPages); //总共多少页
@@ -90,6 +68,48 @@ function getListDataAjax(queryParam = {}, page = 1) {
     }, 3)
 }
 
+
+// 责任人下拉 start
+getStaticAndSelectAjax({ "pd": "no" });
+
+function getStaticAndSelectAjax(queryParam = {}) {
+
+    ajaxRequest(TEAM_PERSON, "POST", queryParam, function(result) {
+        queryParam.pd = 'no';
+        let data = result.RESULT;
+
+        let items = '';
+        data.forEach(function(item, key) {
+            items += `<option value="${item.id}">${item.username}</option>`
+        })
+        $('#add_people').append(items);
+        $('#add_people2').append(items);
+        $('#add_people3').append(items);
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    }, 3)
+}
+// 责任人下拉end
+
+//单位下拉
+getNameList()
+    //单位下拉 ajax请求
+function getNameList() {
+    ajaxRequest(DEVICE_TYPE_COMPANYLIST, "POST", {}, function(result) {
+
+        let data = result.RESULT;
+        let items = '';
+        // console.log(data)
+        data.forEach(function(item, key) {
+            items += `<option value="${item.owner_id}">${item.owner_name}</option>`
+        })
+        $('#getNameList').append(items);
+        $('#getNameList3').append(items);
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    })
+}
+
 //按钮搜索
 $('#buttonSearch').on('click', function() {
     page = 1;
@@ -131,43 +151,19 @@ $('#firstPageButton').on('click', function() {
     page = 1;
     getListDataAjax(getSearchParamObj(), 1);
 })
-
 $('#lastPageButton').on('click', function() {
     page = totalPages;
     getListDataAjax({}, page);
 })
-
 $('#prevPageButton').on('click', function() {
     page -= 1;
     getListDataAjax(getSearchParamObj(), page);
 })
-
 $('#nextPageButton').on('click', function() {
     page += 1;
     getListDataAjax(getSearchParamObj(), page);
 })
 
-//单位下拉
-getNameList()
-
-//单位下拉 ajax请求
-function getNameList() {
-    ajaxRequest(DEVICE_TYPE_COMPANYLIST, "POST", {}, function(result) {
-
-        let data = result.RESULT;
-        let items = '';
-        console.log(data)
-        data.forEach(function(item, key) {
-            items += `<option value="${item.owner_id}">${item.owner_name}</option>`
-        })
-        $('#getNameList').append(items);
-        // $('#getNameList2').append(items);
-    }, function(errorMsg) {
-        alert("请求数据失败!");
-    })
-}
-
-
 
 /*新增 修改 关闭 弹框*/
 var layer = layui.layer;
@@ -175,37 +171,36 @@ var layerCreateIndex = '';
 var layerUpdateIndex = ''
 layui.use('layer', function() {
 
-    //新增弹框
-    // $('.add').click(function() {
-    //         layerCreateIndex = layer.open({
-    //             type: 1,
-    //             title: false,
-    //             closeBtn: 0,
-    //             shadeClose: true,
-    //             skin: 'yourclass',
-    //             area: ['450px', '500px'],
-    //             content: $(".addDeviceTypeOut"),
-    //             success: function() {
-    //                 $('.clsBtn,.cancel').click(function() {
-    //                     layer.close(layerCreateIndex);
-    //                 })
-    //             }
-    //         })
-    //     }),
+    // 新增弹框
+    $(document).on('click', '.add', function() {
+        layerCreateIndex = layer.open({
+            type: 1,
+            title: false,
+            closeBtn: 0,
+            skin: 'yourclass',
+            area: ['450px', '500px'],
+            content: $(".addTeamOut"),
+            success: function() {
+                getTeamInnerList();
+                $('.clsBtn,.cancel').click(function() {
+                    layer.close(layerCreateIndex);
+                })
+            }
+        })
+    })
+
     //修改弹框信息 
     $('.edit').click(function() {
 
+
         if (!$('.pure-table tr').has('.checked').length) {
             layer.msg('请选择一条需要修改的信息!', { icon: 5 });
         } else {
             let userInfo = $('.pure-table tr').find('.checked').data('user');
 
-            $('.editDeviceTypeOut input[name=type_name]').val(userInfo.type_name)
-            $('.editDeviceTypeOut input[name=type_value]').val(userInfo.type_value)
-            $('.editDeviceTypeOut select[name=transmission_model]').val(userInfo.transmission_model)
-            $('.editDeviceTypeOut input[name=business').val(userInfo.business)
-            $('.editDeviceTypeOut select[name=company_code]').val(userInfo.company_code)
-            $('.editDeviceTypeOut input[name=id').val(userInfo.id)
+            $('.editTeamOut input[name=team_name]').val(userInfo.team_name)
+            $('.editTeamOut select[name=name]').val(userInfo.name)
+            $('.editTeamOut select[name=company_code]').val(userInfo.company_code)
 
             layerUpdateIndex = layer.open({
                 type: 1,
@@ -214,8 +209,9 @@ layui.use('layer', function() {
                 shadeClose: true,
                 skin: 'yourclass',
                 area: ['410px', '400px'],
-                content: $(".editDeviceTypeOut"),
+                content: $(".editTeamOut"),
                 success: function() {
+                    getTeamInnerList();
                     $('.clsBtn,.cancel').click(function() {
                         layer.close(layerUpdateIndex);
                     })
@@ -230,8 +226,8 @@ layui.use('layer', function() {
             //layer.msg('请选择一条需要修改的信息');
             layer.msg('请选择一条需要删除的信息!', { icon: 5 });
         } else {
-            let dataId = $('.pure-table tr').find('.checked').data('id');
-            ajaxRequest(DEVICE_TYPE_DELETE, "POST", { "ID_LIST": [{ "id": dataId }] }, function(result) {
+            let dataId = $('.pure-table #dataList  tr').find('.checked').data('id');
+            ajaxRequest(TEAM_DELETE, "POST", { "ID_LIST": [{ "id": dataId }] }, function(result) {
                 $(".pure-table tbody tr.selected").remove()
                 let data = result
                 layer.close(layer.layerCreateIndex);
@@ -240,72 +236,93 @@ layui.use('layer', function() {
 
             }, function(errorMsg) {
                 alert("用户删除失败!");
-            }, 2)
+            }, 3)
         }
     })
 })
 
 /* 新增发送请求 */
-$('#addMenu').click(function() {
+$('#addData').click(function() {
 
-    //获取表单的值 并转换成对象
-    let allParam = serializeArrayToObj($("#addMenuForm").serializeArray());
+        //获取表单的值 并转换成对象
+        let allParam = serializeArrayToObj($("#addTeamForm").serializeArray());
 
-    //验证数据是否为空
-    let res = validParamIsEmpty(allParam, {
-        "type_name": "请输入类型名称",
-        "type_value": "请输入类型参数",
-        "transmission_model": "请选择传输类型",
-        "business": "请输入厂家名称",
-        "company_code": "请选择所属单位",
-    });
+        //验证数据是否为空
+        let res = validParamIsEmpty(allParam, {
+            "team_name": "请输入团队名称",
+            "name": "请选择责任人",
+            "company_code": "请选择所属单位",
+        });
 
-    if (res.code == -1) {
-        alert(res.msg);
-        return;
-    }
+        if (res.code == -1) {
+            alert(res.msg);
+            return;
+        }
+        //验证组织人员
+        if (!$('.pure-table.pure-table-inner tr').has('.checked').length) {
+            layer.msg('请选择一条需要修改的信息!', { icon: 5 });
+            return
+        } else {
+            let userName = $('.pure-table tr').find('.checked').data('username');
+            let phone = $('.pure-table tr').find('.checked').data('phone');
+            allParam.phone = phone;
+            allParam.RY_LIST = [userName];
+        }
 
-    //验证通过 请求ajax
-    ajaxRequest(DEVICE_TYPE_ADD, "POST", allParam, function(result) {
-        layer.close(layerCreateIndex);
-        layer.msg('添加成功!', { icon: 6 });
-        getListDataAjax();
-        $('#addMenuForm')[0].reset();
-    }, function(errorMsg) {
-        alert("异常错误!");
-    })
-})
 
-/* 修改发送请求 */
+        //验证通过 请求ajax
+        ajaxRequest(TEAM_ADD, "POST", allParam, function(result) {
+            layer.close(layerCreateIndex);
+            layer.msg('添加成功!', { icon: 6 });
+            getListDataAjax();
+            $('#addTeamForm')[0].reset();
+        }, function(errorMsg) {
+            alert("异常错误!");
+        }, 3)
+    })
+    /* 修改发送请求 */
 $('#dataUpdate').click(function() {
 
+
+
     //获取表单的值 并转换成对象
-    let allParam = serializeArrayToObj($("#updateMenuForm").serializeArray());
+    let allParam = serializeArrayToObj($("#editTeamForm").serializeArray());
 
     //验证数据是否为空
     let res = validParamIsEmpty(allParam, {
-        "type_name": "请输入类型名称",
-        "type_value": "请输入类型参数",
-        "transmission_model": "请选择传输方式",
-        "business": "请输入厂家名称",
+        "team_name": "请输入团队名称",
+        "name": "请选择责任人",
+        "company_code": "请选择所属单位",
     });
 
     if (res.code == -1) {
         alert(res.msg);
         return;
     }
+    //验证组织人员
+    if (!$('.pure-table.pure-table-inner tr').has('.checked').length) {
+        layer.msg('请选择一条需要修改的信息!', { icon: 5 });
+        return
+    } else {
+        let userName = $('.editTeamOut .pure-table tr').find('.checked').data('username');
+        let phone = $('.editTeamOut .pure-table tr').find('.checked').data('phone');
+        allParam.phone = phone;
+        allParam.RY_LIST = [userName];
+    }
+    let dataId = $('.pure-table tr').find('.checked').data('id');
 
-    ajaxRequest(DEVICE_TYPE_UPDATE, "POST", allParam, function(result) {
+    allParam.id = dataId;
+
+    ajaxRequest(TEAM_EDIT, "POST", allParam, function(result) {
         layer.close(layerUpdateIndex);
         layer.msg('修改成功!', { icon: 6 });
         getListDataAjax();
     }, function(errorMsg) {
         alert("数据修改失败!");
-    })
+    }, 2)
 })
 
 
-
 // 导出 start
 $('.export').click(function() {
     getDataExport({ "team_name": param1, "add_people": param2 })
@@ -314,17 +331,17 @@ $('.export').click(function() {
 function getDataExport(queryParam = {}) {
     // 输出base64编码
     const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
-    ajaxRequest(RECORD_EXPORT, "POST", queryParam, function(result) {
+    ajaxRequest(TEAM_EXPORT, "POST", queryParam, function(result) {
         console.log('result.RESULT')
         console.log(result.RESULT)
         let data = result.RESULT;
         let newData = [];
         if (data) {
             data.forEach(function(item, index) {
-                newData.push({ xh: item.xh, plan_name: item.plan_name, ywcsj: item.ywcsj, zt: item.zt, completion: item.completion, name: item.name, phone: item.phone })
+                newData.push({ xh: item.xh, team_name: item.team_name, company_name: item.company_name, name: item.name, phone: item.phone, add_people: item.add_people, add_time: item.add_time })
             });
         }
-        let str = '<tr style="text-align:center"><th>序号</th><th>任务名称</th><th>应完成时间</th><th>当前状态</th><th>完成情况%</th><th>相关责任人</th><th>联系电话</th></tr>';
+        let str = '<tr style="text-align:center"><th>序号</th><th>团队名称</th><th>所属单位</th><th>责任人</th><th>联系方式</th><th>创建人</th><th>创建时间</th></tr>';
         // 循环遍历，每行加入tr标签，每个单元格加td标签
         for (let i = 0; i < newData.length; i++) {
             str += '<tr style="text-align:center">';
@@ -352,7 +369,7 @@ function getDataExport(queryParam = {}) {
         const link = document.createElement("a");
         link.href = uri + base64(template);
         // 对下载的文件命名
-        link.download = "维保记录数据表.xls";
+        link.download = "班组人员数据表.xls";
         link.click();
 
     }, function(errorMsg) {

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/team.html"></iframe>
+                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="pages/operation/plan.html"></iframe>
             </div>
         </div>
     </section>

pages/operation/plan.html

@@ -10,6 +10,16 @@
     <link rel="stylesheet" href="../../css/common.css" />
     <link rel="stylesheet" href="../../css/per-manage.css" />
     <script src="../../js/flexible-inner.js"></script>
+    <style>
+        .error-radio .layui-form-radio {
+            width: 70px
+        }
+        
+        #startTime,
+        #endTime {
+            background-position: 181px 0;
+        }
+    </style>
 
 </head>
 
@@ -25,7 +35,6 @@
                 <option value="">所有</option>
             </select>
 
-
             <a class="button" id="buttonSearch">确定</a>
             <a class="button reset">重置</a>
         </div>
@@ -80,61 +89,228 @@
 
 
     <!-- 新增弹框 -->
-    <div class="xcConfirm addDeviceTypeOut" style="display:none">
+    <div class="xcConfirm addDataOut deviceCheckAdd" style="display:none">
         <div class="xc_layer"></div>
-        <div class="popBox">
-            <div class="ttBox">
-                <a class="clsBtn"></a>
-                <span class="tt">新增</span>
-            </div>
-            <form id="addMenuForm">
-                <div class="txtBox">
-                    <div>
-                        <span>团队名称<i class="necessary">*</i>
-                        </span>
-                        <input type="text" name="type_name">
-                    </div>
-                    <div>
-                        <span>责任人<i class="necessary">*</i>
-                        </span>
-                        <input type="text" name="type_value">
-                    </div>
-                    <div>
-                        <span>所属单位<i class="necessary">*</i>
-                        </span>
-                        <select name="transmission_model">
-                            <option value="">所有</option>
-                            <option value="1">NB-IOT</option>
-                            <option value="2">Lora-IOT</option>
-                            <option value="3">2G/4G/5G</option>
-                        </select>
+        <div class="deviceCheckAdd-wrapper">
+            <form action="" id="addDataForm">
+                <div class="ttBox">
+                    <a class="clsBtn"></a>
+                    <span class="tt">新增维保计划</span>
+                </div>
+
+                <div class="chooseArea">
+                    <div class="layui-row">
+                        <div class="layui-col-xs6 choose-item">
+                            <span>任务名称：</span>
+                            <input type="text" id="plan_name" name="plan_name">
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>执行团队：<i class="necessary">*</i></span>
+                            <select name="team_id" id="getTeamList">
+                                    <option value="">请选择</option>
+                                </select>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>单位/项目：<i class="necessary">*</i></span>
+                            <select name="company_code" id="getNameList">
+                                    <option value="">请选择</option>
+                                </select>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <div class="error-radio layui-form">
+                                <span>周期：</span>
+                                <div class="layui-form-item clztRadio" style="line-height:24px">
+                                    <div class="layui-input-block">
+                                        <input id="clztRadioFirst" type="radio" name="cycle" value="3" title="每日" checked="" maxlength="20">
+                                        <div class="layui-unselect layui-form-radio layui-form-radioed"><i class="layui-anim layui-icon"></i>
+                                            <div>每日</div>
+                                        </div>
+                                        <input id="clztRadioSecond" type="radio" name="cycle" value="1" title="每周" maxlength="20">
+                                        <div class="layui-unselect layui-form-radio"><i class="layui-anim layui-icon"></i>
+                                            <div>每周</div>
+                                        </div>
+                                        <input id="clztRadioSecond" type="radio" name="cycle" value="2" title="每月" maxlength="20">
+                                        <div class="layui-unselect layui-form-radio"><i class="layui-anim layui-icon"></i>
+                                            <div>每月</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!-- <input class="clztInput" type="text" value="" name="clztInput" style="display:none" readonly="" maxlength="20"> -->
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>维保开始时间<i class="necessary">*</i></span>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" id="test5" name="start_inspect_time" maxlength="100">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>维保结束时间<i class="necessary">*</i></span>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" id="test5" name="end_inspect_time" maxlength="100">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>执行开始日期<i class="necessary">*</i></span>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" id="startTime" name="start_date" maxlength="100">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>执行结束日期<i class="necessary">*</i></span>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" id="endTime" name="end_date" maxlength="100">
+                            </div>
+                        </div>
                     </div>
+                </div>
+            </form>
+
+        </div>
+        <div class="memberbox">
+            <div>维保点位</div>
+            <br>
+            <table class="pure-table pure-table-inner" cellspacing="0px">
+                <thead>
+                    <tr>
+                        <th style="width:24px">
+                        </th>
+                        <th>点位名称</th>
+                        <th>点位地址</th>
+                        <th>点位详情</th>
+                    </tr>
+                </thead>
+                <tbody id="dataList2">
+                </tbody>
+            </table>
+            <div class="pager2 has-data flex">
+                <div class="pager-left flex1 align-left">
+                    <ul>
+                        <li id="firstPageButton2" class="pg-first disabled"></li>
+                        <li id="prevPageButton2" class="pg-prev disabled"></li>
+                        <li class="pg-des">
+                            第 <input id="currentPage2" type="text" size="1" value="1"> 页，共 <span id="totalPage2">1</span> 页
+                        </li>
+                        <li id="nextPageButton2" class="pg-next"></li>
+                        <li id="lastPageButton2" class="pg-last"></li>
+                        <li class="pg-refresh2">
+                            <a href="javascript:location.reload();"></a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom2"> 1 </span> 条到 <span id="pageTo2">
+                    1 </span>条记录，总共 <span id="dataTotal2">
+                    1 </span>条
+                </div>
+            </div>
+            <div class="pager2 no-data" style="display:none;text-align:right">
+                暂无数据
+            </div>
+        </div>
 
+        <div class="btnArea">
+            <div class="btnGroup">
+                <a class="sgBtn ok" id="addData"><img src="../../images/accept.png" alt=""> 提交
+                </a>
+                <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
+            </div>
+        </div>
 
+    </div>
 
+    <!-- 修改弹框 -->
+    <div class="xcConfirm editDataOut deviceCheckAdd" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="deviceCheckAdd-wrapper">
+            <form action="" id="editDataForm">
+                <div class="ttBox">
+                    <a class="clsBtn"></a>
+                    <span class="tt">新增维保计划</span>
                 </div>
-                <div class="btnArea">
-                    <div class="btnGroup">
-                        <a class="sgBtn ok" id="addMenu"><img src="../../images/accept.png" alt=""> 提交
-                        </a>
-                        <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
+
+                <div class="chooseArea">
+                    <div class="layui-row">
+                        <div class="layui-col-xs6 choose-item">
+                            <span>任务名称：</span>
+                            <input type="text" id="plan_name" name="plan_name">
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>执行团队：<i class="necessary">*</i></span>
+                            <select name="team_id" id="getTeamList3">
+                                    <option value="">请选择</option>
+                                </select>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>单位/项目：<i class="necessary">*</i></span>
+                            <select name="company_code" id="getNameList3">
+                                    <option value="">请选择</option>
+                                </select>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <div class="error-radio layui-form">
+                                <span>周期：</span>
+                                <div class="layui-form-item clztRadio" style="line-height:24px">
+                                    <div class="layui-input-block">
+                                        <input id="clztRadioFirst" type="radio" name="cycle" value="3" title="每日" checked="" maxlength="20">
+                                        <div class="layui-unselect layui-form-radio layui-form-radioed"><i class="layui-anim layui-icon"></i>
+                                            <div>每日</div>
+                                        </div>
+                                        <input id="clztRadioSecond" type="radio" name="cycle" value="1" title="每周" maxlength="20">
+                                        <div class="layui-unselect layui-form-radio"><i class="layui-anim layui-icon"></i>
+                                            <div>每周</div>
+                                        </div>
+                                        <input id="clztRadioThrid" type="radio" name="cycle" value="2" title="每月" maxlength="20">
+                                        <div class="layui-unselect layui-form-radio"><i class="layui-anim layui-icon"></i>
+                                            <div>每月</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!-- <input class="clztInput" type="text" value="" name="clztInput" style="display:none" readonly="" maxlength="20"> -->
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>维保开始时间<i class="necessary">*</i></span>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" id="test5" name="start_inspect_time" maxlength="100">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>维保结束时间<i class="necessary">*</i></span>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" id="test5" name="end_inspect_time" maxlength="100">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>执行开始日期<i class="necessary">*</i></span>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" id="startTime2" name="start_date" maxlength="100">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6 choose-item">
+                            <span>执行结束日期<i class="necessary">*</i></span>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" id="endTime2" name="end_date" maxlength="100">
+                            </div>
+                        </div>
                     </div>
                 </div>
             </form>
+
         </div>
         <div class="memberbox">
-            <div>组织人员</div>
+            <div>维保点位</div>
             <br>
             <table class="pure-table pure-table-inner" cellspacing="0px">
                 <thead>
                     <tr>
                         <th style="width:24px">
                         </th>
-                        <th>姓名</th>
-                        <th>联系方式</th>
+                        <th>点位名称</th>
+                        <th>点位地址</th>
+                        <th>点位详情</th>
                     </tr>
                 </thead>
-                <tbody id="dataList2">
+                <tbody id="dataList3">
                 </tbody>
             </table>
             <div class="pager2 has-data flex">
@@ -152,12 +328,24 @@
                         </li>
                     </ul>
                 </div>
+                <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom2"> 1 </span> 条到 <span id="pageTo2">
+                    1 </span>条记录，总共 <span id="dataTotal2">
+                    1 </span>条
+                </div>
             </div>
             <div class="pager2 no-data" style="display:none;text-align:right">
                 暂无数据
             </div>
         </div>
 
+        <div class="btnArea">
+            <div class="btnGroup">
+                <a class="sgBtn ok" id="updateData"><img src="../../images/accept.png" alt=""> 提交
+                </a>
+                <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
+            </div>
+        </div>
+
     </div>
 
 
@@ -277,6 +465,7 @@
     <script src="../../layui/layui.js "></script>
     <script src="../../js/valid.js "></script>
     <script src="../../js/plan.js "></script>
+    <script src="../../js/plan-inner.js "></script>
 
     <script>
         layui.use(['form', 'layedit', 'laydate'], function() {
@@ -285,12 +474,11 @@
                 layedit = layui.layedit,
                 laydate = layui.laydate;
         });
-
         layui.use('laydate', function() {
             var laydate = layui.laydate;
             //开始日期
             var insStart = laydate.render({
-                elem: '#data3a',
+                elem: '#startTime',
                 trigger: 'click',
                 done: function(value, date) {
                     //更新结束日期的最小日期
@@ -304,7 +492,7 @@
 
             //结束日期
             var insEnd = laydate.render({
-                elem: '#data3b',
+                elem: '#endTime',
                 trigger: 'click',
                 done: function(value, date) {
                     //更新开始日期的最大日期
@@ -313,7 +501,37 @@
                     });
                 }
             });
+        });
+
 
+
+        layui.use('laydate', function() {
+            var laydate = layui.laydate;
+            //开始日期
+            var insStart = laydate.render({
+                elem: '#startTime2',
+                trigger: 'click',
+                done: function(value, date) {
+                    //更新结束日期的最小日期
+                    insEnd.config.min = lay.extend({}, date, {
+                        month: date.month - 1
+                    });
+                    //自动弹出结束日期的选择器
+                    insEnd.config.elem[0].focus();
+                }
+            });
+
+            //结束日期
+            var insEnd = laydate.render({
+                elem: '#endTime2',
+                trigger: 'click',
+                done: function(value, date) {
+                    //更新开始日期的最大日期
+                    insStart.config.max = lay.extend({}, date, {
+                        month: date.month - 1
+                    });
+                }
+            });
         });
     </script>
 </body>

pages/operation/team.html

@@ -15,7 +15,7 @@
 
 <body style="background:rgba(0,0,0,0)">
     <div class="memberbox ">
-        <div class="membertit">团队班组管理</div>
+        <div class="membertit">团队/班组管理</div>
         <div class="member-choose">
             <span>团队名称</span>
             <input type="text" id="team_name">
@@ -80,39 +80,38 @@
 
 
     <!-- 新增弹框 -->
-    <div class="xcConfirm addDeviceTypeOut" style="display:none">
+    <div class="xcConfirm addTeamOut" style="display:none">
         <div class="xc_layer"></div>
         <div class="popBox">
             <div class="ttBox">
                 <a class="clsBtn"></a>
                 <span class="tt">新增</span>
             </div>
-            <form id="addMenuForm">
+            <form id="addTeamForm">
                 <div class="txtBox">
                     <div>
                         <span>团队名称<i class="necessary">*</i>
                         </span>
-                        <input type="text" name="team_name">
+                        <input type="text" name="team_name" id="teamName">
                     </div>
                     <div>
                         <span>责任人<i class="necessary">*</i>
                         </span>
-                        <input type="text" name="name">
+                        <select id="add_people2" name="name" id="name">
+                            <option value="">请选择</option>
+                        </select>
                     </div>
                     <div>
                         <span>所属单位<i class="necessary">*</i>
                         </span>
-                        <select id="getNameList">
-                            <option value="">所有</option>
-                            <!-- <option value="1">NB-IOT</option>
-                            <option value="2">Lora-IOT</option>
-                            <option value="3">2G/4G/5G</option> -->
+                        <select id="getNameList" name="company_code">
+                            <option value="">请选择</option>
                         </select>
                     </div>
                 </div>
                 <div class="btnArea">
                     <div class="btnGroup">
-                        <a class="sgBtn ok" id="addMenu"><img src="../../images/accept.png" alt=""> 提交
+                        <a class="sgBtn ok" id="addData"><img src="../../images/accept.png" alt=""> 提交
                         </a>
                         <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
                     </div>
@@ -157,6 +156,83 @@
 
     </div>
 
+    <!-- 修改弹框 -->
+    <div class="xcConfirm editTeamOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">修改</span>
+            </div>
+            <form id="editTeamForm">
+                <div class="txtBox">
+                    <div>
+                        <span>团队名称<i class="necessary">*</i>
+                        </span>
+                        <input type="text" name="team_name">
+                    </div>
+                    <div>
+                        <span>责任人<i class="necessary">*</i>
+                        </span>
+                        <select id="add_people3" name="name">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>所属单位<i class="necessary">*</i>
+                        </span>
+                        <select id="getNameList3" name="company_code">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a class="sgBtn ok" id="dataUpdate"><img src="../../images/accept.png" alt=""> 提交
+                        </a>
+                        <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div class="memberbox">
+            <div>组织人员</div>
+            <br>
+            <table class="pure-table pure-table-inner" cellspacing="0px">
+                <thead>
+                    <tr>
+                        <th style="width:24px">
+                        </th>
+                        <th>姓名</th>
+                        <th>联系方式</th>
+                    </tr>
+                </thead>
+                <tbody id="dataList3">
+                </tbody>
+            </table>
+            <div class="pager2 has-data flex">
+                <div class="pager-left flex1 align-left">
+                    <ul>
+                        <li id="firstPageButton2" class="pg-first disabled"></li>
+                        <li id="prevPageButton2" class="pg-prev disabled"></li>
+                        <li class="pg-des">
+                            第 <input id="currentPage2" type="text" size="1" value="1"> 页，共 <span id="totalPage2">1</span> 页
+                        </li>
+                        <li id="nextPageButton2" class="pg-next"></li>
+                        <li id="lastPageButton2" class="pg-last"></li>
+                        <li class="pg-refresh2">
+                            <a href="javascript:location.reload();"></a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="pager2 no-data" style="display:none;text-align:right">
+                暂无数据
+            </div>
+        </div>
+
+    </div>
+
 
 
     <!-- 维保点位弹框 -->