板块改版更新

api/request.js

@@ -173,12 +173,18 @@ 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' //维保计划导出
+const PLAN_EXPORT = 'iot/planmaster/getPlanMasterListExcel' //维保计划导出
+const TEAM_SELECT = 'iot/devopsteam/getDevopsTeamListbox'; //执行团队下拉  
+
+
+const POINT_LIST = 'iot/inspectionpoints/getList'; //维保点位列表查询  
+const POINT_ADD = 'iot/inspectionpoints/append'; //维保点位新增
+const POINT_EDIT = 'iot/inspectionpoints/update'; //维保点位修改
+const POINT_DELETE = 'iot/inspectionpoints/del'; //维保点位删除
+const POINT_EXPORT = 'iot/inspectionpoints/getInspectionPointsListExcel ' //维保点位导出
 
 
 

css/common.css

@@ -548,6 +548,10 @@ li.parent_li ul li ul li {
     line-height: 22px
 }
 
+.innerPager {
+    bottom: 45px;
+}
+
 .pager-right {
     font-family: tahoma, arial, verdana, sans-serif;
     font-size: 0.2rem;
@@ -646,12 +650,14 @@ li.parent_li ul li ul li {
 }
 
 .pg-refresh,
-.pg-refresh2 {
+.pg-refresh2,
+.pg-refresh3 {
     background: url(../images/refresh.gif);
 }
 
 .pg-refresh a,
-.pg-refresh2 a {
+.pg-refresh2 a,
+.pg-refresh3 a {
     display: inline-block;
     width: 100%;
     height: 100%

css/per-manage.css

@@ -614,4 +614,13 @@
     
     .layui-layer-btn .layui-layer-btn0 {
         font-size: 0.3rem;
+    }
+    /* 点位弹框 */
+    
+    .point-des {
+        text-align: left;
+    }
+    
+    .point-des p {
+        margin-top: 10px
     }

js/plan-inner.js

@@ -1,19 +1,21 @@
 /**新增 修改弹框中的列表渲染及分页操作**/
 
 var innerPage = 1;
-
-
 // 新增修改 组织人员 列表渲染 ajax请求
 function getTeamInnerList(queryParam = {}, innerPage = 1) {
     queryParam.page = innerPage;
-    queryParam.limit = 5; // 每页显示条数
+    queryParam.limit = 8; // 每页显示条数
     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>"
+                if (item.pd) {
+                    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.dwid + "><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.dwid + "><img src='../../images/tupianbtn.png'></a></td>" + "</tr>"
+                }
             })
             $('#dataList2').html(items);
             $('#dataList3').html(items);
@@ -24,14 +26,14 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
         console.log(result)
         totalPages = result.totalCount / result.limit;
         totalPages = Math.ceil(totalPages);
-        $('#totalPage2').html(totalPages); // 总共多少页
-        $('#dataTotal2').html(result.totalCount); // 总共多少条数据
-        $('#currentPage2').val(innerPage); // 当前页面
+        $('#totalPage2,#totalPage3').html(totalPages); // 总共多少页
+        $('#dataTotal2,#dataTotal3').html(result.totalCount); // 总共多少条数据
+        $('#currentPage2,#currentPage3').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);
+        $('#pageFrom2,#pageFrom3').html(pageFrom);
+        $('#pageTo2,#pageTo3').html(pageTo);
 
         // 无数据时
         if (!result.totalCount) {
@@ -43,51 +45,63 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
         }
         if (innerPage < totalPages) {
             $('#nextPageButton2,#lastPageButton2').removeClass('disabled');
+            $('#nextPageButton3,#lastPageButton3').removeClass('disabled');
         } else {
             $('#nextPageButton2,#lastPageButton2').addClass('disabled');
+            $('#nextPageButton3,#lastPageButton3').addClass('disabled');
         }
         if (innerPage === 1) {
             $('#firstPageButton2,#prevPageButton2').addClass('disabled');
+            $('#firstPageButton3,#prevPageButton3').addClass('disabled');
         } else {
             $('#firstPageButton2,#prevPageButton2').removeClass('disabled');
+            $('#firstPageButton3,#prevPageButton3').removeClass('disabled');
         }
     }, function(errorMsg) {
         alert("请求数据失败!");
     }, 3)
 };
 
-
-// 分页操作
-$('#firstPageButton2').on('click', function() {
+// 新增修改弹框分页操作
+$('#firstPageButton2,#firstPageButton3').on('click', function() {
     innerPage = 1;
     getTeamInnerList({}, 1);
 });
 
-$('#lastPageButton2').on('click', function() {
+$('#lastPageButton2,#lastPageButton3').on('click', function() {
     innerPage = totalPages;
     getTeamInnerList({}, innerPage);
 });
 
-$('#prevPageButton2').on('click', function() {
+$('#prevPageButton2,#prevPageButton3').on('click', function() {
     innerPage -= 1;
     getTeamInnerList({}, innerPage);
 });
 
-$('#nextPageButton2').on('click', function() {
+$('#nextPageButton2,#nextPageButton3').on('click', function() {
     innerPage += 1;
     getTeamInnerList({}, innerPage);
 })
 
-// 分页刷新按钮
+// 新增分页刷新按钮
 $('.pg-refresh2').click(resetForm);
 
-// 重置表单
 function resetForm() {
     innerPage = 1;
     getTeamInnerList();
 }
 
 
+// 修改分页刷新
+$('.pg-refresh3').click(resetForm);
+
+function resetForm() {
+    let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
+    innerPage = 1;
+    getTeamInnerList({ 'dwid': dataId });
+}
+
+
 //点位详情弹框
 $(document).on('click', 'a.pointDetail', function() {
     let dwId = $(this).data('id');
@@ -116,4 +130,98 @@ $(document).on('click', 'a.pointDetail', function() {
             })
         }
     })
-})
+})
+
+
+//新增修改弹框时间选择
+layui.use(['form', 'layedit', 'laydate'], function() {
+
+});
+layui.use('laydate', function() {
+    var laydate = layui.laydate;
+    //开始日期
+    var insStart = laydate.render({
+        elem: '#startTime',
+        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: '#endTime',
+        trigger: 'click',
+        done: function(value, date) {
+            //更新开始日期的最大日期
+            insStart.config.max = lay.extend({}, date, {
+                month: date.month - 1
+            });
+        }
+    });
+});
+
+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
+            });
+        }
+    });
+});
+
+
+//维保时间
+var timeArr = [];
+var start = 0;
+var a = '';
+for (let i = 0; i < 48; i++) {
+    a = timeMeter(start, 1)
+    timeArr.push(a)
+    start += 1800;
+}
+var itemsArr = ''
+timeArr.forEach(function(item, key) {
+    itemsArr += `<option value="${item}">${item}</option>`
+})
+$('#start_inspect_time,#start_inspect_time2').append(itemsArr);
+$('#end_inspect_time,#end_inspect_time2').append(itemsArr);
+
+// 维保时间转化
+function timeMeter(t, type = 1) {
+    let time = Number(t);
+    let h = time / 3600 < 10 ? "0" + parseInt(time / 3600) : parseInt(time / 3600);
+    if (h != '00') time = time - h * 3600;
+    let m = time / 60 < 10 ? "0" + parseInt(time / 60) : parseInt(time / 60);
+    // let s = time % 60 < 10 ? "0" + (time % 60) : time % 60;
+    if (type == 1) {
+        return h + ':' + m;
+    } else if (type == 2) {
+        return m + "分" + s + "秒";
+    }
+}

js/plan.js

@@ -4,14 +4,12 @@ var totalPages = 0;
 var param1 = '';
 var param2 = '';
 
-var aa = ''
-
 //列表渲染
 getListDataAjax();
 //获取列表ajax请求
 function getListDataAjax(queryParam = {}, page = 1) {
     queryParam.page = page;
-    queryParam.limit = 8; //每页显示条数
+    queryParam.limit = 20; //每页显示条数
     queryParam.start = (queryParam.page - 1) * queryParam.limit;
     ajaxRequest(PLAN_LIST, "POST", queryParam, function(result) {
         let data = result.RESULT;
@@ -24,7 +22,7 @@ function getListDataAjax(queryParam = {}, page = 1) {
                     "<td>" + item.plan_name + "</td>" +
                     "<td>" + item.cycle_name + "</td>" +
                     "<td>" + item.zxsj + "</td>" +
-                    "<td>" + item.plan_name + "</td>" +
+                    "<td>" + item.team_name + "</td>" +
                     "<td>" + item.name + "</td>" +
                     "</tr>"
             })
@@ -67,7 +65,6 @@ function getListDataAjax(queryParam = {}, page = 1) {
     }, 3)
 }
 
-
 // 责任人下拉 start
 getStaticAndSelectAjax({ "pd": "no" });
 
@@ -79,7 +76,7 @@ function getStaticAndSelectAjax(queryParam = {}) {
 
         let items = '';
         data.forEach(function(item, key) {
-            items += `<option value="${item.id}">${item.username}</option>`
+            items += `<option value="${item.username}">${item.username}</option>`
         })
         $('#person_liable_id').append(items);
         $('#person_liable_id2').append(items);
@@ -180,29 +177,25 @@ $('#nextPageButton').on('click', function() {
 
 
 /*新增 修改 关闭 弹框*/
-var layer = layui.layer;
-var layerCreateIndex = '';
-var layerUpdateIndex = ''
 layui.use('layer', function() {
-
     // 新增弹框
     $(document).on('click', '.add', function() {
         layerCreateIndex = layer.open({
             type: 1,
             title: false,
             closeBtn: 0,
+            shadeClose: true,
             skin: 'yourclass',
             area: ['800px', '600px'],
             content: $(".addDataOut"),
             success: function() {
                 getTeamInnerList();
                 $('.clsBtn,.cancel').click(function() {
+                    innerPage = 1;
                     layer.close(layerCreateIndex);
                 })
             }
         })
-
-
     })
 
     //修改弹框信息 
@@ -216,9 +209,22 @@ layui.use('layer', function() {
             $('.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)
+
+            $("input[name='cycle']").each(function() {
+                if ($(this).val() != userInfo.cycle) {
+                    $(this).removeAttr("checked");
+                } else {
+                    $(this).prop("checked", "checked");
+                }
+            });
+
+            layui.use(['form'], function() {
+                var form = layui.form;
+                form.render('radio');
+            })
+
+            $('.editDataOut select[name=start_inspect_time]').val(userInfo.start_inspect_time)
+            $('.editDataOut select[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)
 
@@ -233,6 +239,7 @@ layui.use('layer', function() {
                 success: function() {
                     getTeamInnerList({ "dwid": dataId });
                     $('.clsBtn,.cancel').click(function() {
+                        innerPage = 1;
                         layer.close(layerUpdateIndex);
                     })
                 }
@@ -291,7 +298,6 @@ $('#addData').click(function() {
             allParam.spot_id = spot_id;
         }
 
-
         //验证通过 请求ajax
         ajaxRequest(PLAN_ADD, "POST", allParam, function(result) {
             layer.close(layerCreateIndex);
@@ -329,11 +335,10 @@ $('#updateData').click(function() {
         layer.msg('请选择一条需要修改的信息!', { icon: 5 });
         return
     } else {
-        let spot_id = $('.pure-table tr').find('.checked').data('id');
+        let spot_id = $('.pure-table #dataList3 tr').find('.checked').data('id');
         allParam.spot_id = spot_id;
     }
-    let dataId = $('.pure-table tr').find('.checked').data('id');
-
+    let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
     allParam.id = dataId;
 
     ajaxRequest(PLAN_EDIT, "POST", allParam, function(result) {
@@ -354,17 +359,17 @@ $('.export').click(function() {
 function getDataExport(queryParam = {}) {
     // 输出base64编码
     const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
-    ajaxRequest(TEAM_EXPORT, "POST", queryParam, function(result) {
+    ajaxRequest(PLAN_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, company_name: item.company_name, name: item.name, phone: item.phone, person_liable_id: item.person_liable_id, add_time: item.add_time })
+                newData.push({ xh: item.xh, plan_name: item.plan_name, cycle_name: item.cycle_name, zxsj: item.zxsj, team_name: item.team_name, name: item.name })
             });
         }
-        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></tr>';
         // 循环遍历，每行加入tr标签，每个单元格加td标签
         for (let i = 0; i < newData.length; i++) {
             str += '<tr style="text-align:center">';
@@ -392,7 +397,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/point.js

@@ -0,0 +1,449 @@
+var page = 1;
+var totalPages = 0;
+
+var param1 = '';
+var param2 = '';
+
+//列表渲染
+getListDataAjax();
+//获取列表ajax请求
+function getListDataAjax(queryParam = {}, page = 1) {
+    queryParam.page = page;
+    queryParam.limit = 20; //每页显示条数
+    queryParam.start = (queryParam.page - 1) * queryParam.limit;
+    ajaxRequest(POINT_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'  data-user='" + JSON.stringify(item) + "' data-id='" + item.id + "'></td>" +
+                    "<td>" + item.xh + "</td>" +
+                    "<td>" + item.spot_name + "</td>" +
+                    "<td>" + item.company_name + "</td>" +
+                    "<td>" + item.spot_address + "</td>" +
+                    "<td>" + item.type_name + "</td>" +
+                    "<td>" + item.latest_change_time + "</td>" +
+                    "<td ><a class='pointLabel view-detail' data-id=" + item.id + ">查看</a></td>" +
+                    "<td ><a class='pointDetail' data-id=" + item.id + "><img src='../../images/tupianbtn.png'></a></td>"
+                "</tr>"
+            })
+            $('#dataList').html(items);
+        } else {
+            $('#dataList').html('');
+        }
+
+        totalPages = result.totalCount / result.limit;
+        totalPages = Math.ceil(totalPages);
+        $('#totalPage').html(totalPages); //总共多少页
+        $('#dataTotal').html(result.totalCount); //总共多少条数据
+        $('#currentPage').val(page); //当前页面
+        let pageFrom = (page - 1) * result.limit + 1; //开始
+        let pageTo = result.page * result.limit; //结束
+        pageTo = pageTo > result.totalCount ? result.totalCount : pageTo;
+        $('#pageFrom').html(pageFrom);
+        $('#pageTo').html(pageTo);
+
+        // 无数据时
+        if (!result.totalCount) {
+            $('.pager.has-data').hide()
+            $('.pager.no-data').show()
+        } else {
+            $('.pager.has-data').show()
+            $('.pager.no-data').hide()
+        }
+        if (page < totalPages) {
+            $('#nextPageButton,#lastPageButton').removeClass('disabled');
+        } else {
+            $('#nextPageButton,#lastPageButton').addClass('disabled');
+        }
+        if (page === 1) {
+            $('#firstPageButton,#prevPageButton').addClass('disabled');
+        } else {
+            $('#firstPageButton,#prevPageButton').removeClass('disabled');
+        }
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    }, 3)
+}
+
+
+//单位下拉
+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);
+        $('#getNameList2').append(items);
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    })
+}
+
+
+//按钮搜索
+$('#buttonSearch').on('click', function() {
+    page = 1;
+    getListDataAjax(getSearchParamObj());
+    param1 = $('#spot_name').val()
+    param2 = $('#spot_address').val()
+})
+
+//拼接搜索条件
+function getSearchParamObj() {
+    let queryParam = {};
+    let spot_name = $('#spot_name').val();
+    let spot_address = $('#spot_address').val();
+    queryParam.spot_name = spot_name;
+    queryParam.spot_address = spot_address;
+    return queryParam;
+}
+
+//重置表单
+$('.reset').click(resetForm);
+
+//分页刷新按钮
+$('.pg-refresh').click(resetForm);
+
+//重置表单
+function resetForm() {
+    page = 1;
+    $("#spot_name").val("");
+    $("#spot_address").val("");
+    getListDataAjax(getSearchParamObj());
+    param1 = $('#spot_name').val()
+    param5 = $('#spot_address').val()
+}
+
+//分页操作
+$('#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);
+})
+
+layui.use('layer', function() {
+    // 新增弹框
+    $(document).on('click', '.add', function() {
+        layerCreateIndex = layer.open({
+            type: 1,
+            title: false,
+            closeBtn: 0,
+            shadeClose: true,
+            skin: 'yourclass',
+            area: ['450px', '400px'],
+            content: $(".addDataOut"),
+            success: function() {
+                // getTeamInnerList();
+                $('.clsBtn,.cancel').click(function() {
+                    innerPage = 1;
+                    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=spot_name]').val(userInfo.spot_name)
+            $('.editDataOut select[name=company_code]').val(userInfo.company_code)
+            $('.editDataOut input[name=spot_address]').val(userInfo.spot_address)
+            $('.editDataOut input[name=equipment_code]').val(userInfo.spot_label_analysis)
+            $("input[name='spot_type']").each(function() {
+                if ($(this).val() != userInfo.spot_type) {
+                    $(this).removeAttr("checked");
+                } else {
+                    $(this).prop("checked", "checked");
+                }
+            });
+            layui.use(['form'], function() {
+                var form = layui.form;
+                form.render('radio');
+            })
+            if (userInfo.picture_route) {
+                $('#pictureRouteShow').attr('src', userInfo.picture_route)
+                $('#pictureRouteShow').css('display', 'block')
+            }
+            layerUpdateIndex = layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                skin: 'yourclass',
+                area: ['450px', '400px'],
+                content: $(".editDataOut"),
+                success: function() {
+                    $('.clsBtn,.cancel').click(function() {
+                        innerPage = 1;
+                        layer.close(layerUpdateIndex);
+                    })
+                }
+            });
+        }
+    })
+
+    //删除信息
+    $('.delete').click(function() {
+        if (!$('.pure-table tr').has('.checked').length) {
+            //layer.msg('请选择一条需要修改的信息');
+            layer.msg('请选择一条需要删除的信息!', { icon: 5 });
+        } else {
+            let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
+            ajaxRequest(POINT_DELETE, "POST", { "ID_LIST": [{ "id": dataId }] }, function(result) {
+                $(".pure-table tbody tr.selected").remove()
+                layer.close(layer.layerCreateIndex);
+                layer.msg('删除成功!', { icon: 6 });
+                getListDataAjax()
+
+            }, function(errorMsg) {
+                alert("用户删除失败!");
+            }, 2)
+        }
+    })
+})
+
+/* 新增发送请求 */
+$('#addData').click(function() {
+
+        //获取表单的值 并转换成对象
+        let allParam = serializeArrayToObj($("#addDataForm").serializeArray());
+
+        //验证数据是否为空
+        let res = validParamIsEmpty(allParam, {
+            "spot_name": "请输入点位名称",
+            "company_code": "请选择所属单位/项目",
+            "spot_address": "请输入点位地址",
+            "equipment_code": "请输入设备编号",
+            "spot_type": "请选择设备类型",
+        });
+        if (res.code == -1) {
+            alert(res.msg);
+            return;
+        }
+
+        //验证文件
+
+        // 判断文件是否为空 
+        var file = $("input[name='picture_route']").val(); //用户文件内容(文件)
+        if (file == "") {
+            alert("请选择上传的目标文件! ")
+            return false;
+        }
+
+        //判断文件类型
+        var fileExtension = file.substring(file.lastIndexOf(".") + 1).toLowerCase();
+
+        let allowExtension = ['jpg', 'jpeg', 'png', 'gif'];
+        if (allowExtension.indexOf(fileExtension.toLowerCase()) < 0) {
+            alert("请选择图片文件!");
+            return false;
+        }
+
+        //上传文件
+        uploadImg('pictureRouteAdd', function(data) {
+            data = JSON.parse(data); //aa json字符串转对象
+            if (data.flag) {
+                //将返回的路径 拼接到提交的数据对象里
+                allParam['picture_route'] = data.data;
+
+                //验证通过 请求ajax
+                ajaxRequest(POINT_ADD, "POST", allParam, function(result) {
+                    layer.close(layerCreateIndex);
+                    layer.msg('添加成功!', { icon: 6 });
+                    getListDataAjax();
+                    $('#addDataForm')[0].reset();
+                }, function(errorMsg) {
+                    alert("异常错误!");
+                }, 3)
+            } else {
+                //这里应该弹出删除失败的 后台返回的原因
+                alert('上传图片失败');
+                return;
+            }
+        });
+    })
+    /* 修改发送请求 */
+$('#updateData').click(function() {
+
+    //获取表单的值 并转换成对象
+    let allParam = serializeArrayToObj($("#editDataForm").serializeArray());
+
+    //验证数据是否为空
+    let res = validParamIsEmpty(allParam, {
+        "spot_name": "请输入点位名称",
+        "company_code": "请选择所属单位/项目",
+        "spot_address": "请输入点位地址",
+        "equipment_code": "请输入设备编号",
+        "spot_type": "请选择设备类型",
+    });
+    if (res.code == -1) {
+        alert(res.msg);
+        return;
+    }
+
+
+    //验证文件
+    // 判断文件是否为空 
+    if ($("input[name='picture_route']").val()) {
+        var file = $("input[name='picture_route']").val(); //用户文件内容(文件)
+        //判断文件类型
+        var fileExtension = file.substring(file.lastIndexOf(".") + 1).toLowerCase();
+        let allowExtension = ['jpg', 'jpeg', 'png', 'gif'];
+        if (allowExtension.indexOf(fileExtension.toLowerCase()) < 0) {
+            alert("请选择图片文件!");
+            return false;
+        }
+    }
+    let dataId = $('.pure-table tr').find('.checked').data('id');
+    allParam.id = dataId;
+    ajaxRequest(POINT_EDIT, "POST", allParam, function(result) {
+        layer.close(layerUpdateIndex);
+        layer.msg('修改成功!', { icon: 6 });
+        getListDataAjax();
+    }, function(errorMsg) {
+        alert("数据修改失败!");
+    }, 2)
+
+
+})
+
+
+// 导出 start
+$('.export').click(function() {
+    getDataExport({ "spot_name": param1, "spot_address": param2 })
+})
+
+function getDataExport(queryParam = {}) {
+    // 输出base64编码
+    const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
+    ajaxRequest(POINT_EXPORT, "POST", queryParam, function(result) {
+        let data = result.RESULT;
+        let newData = [];
+        if (data) {
+            data.forEach(function(item, index) {
+                newData.push({ xh: item.xh, spot_name: item.spot_name, company_name: item.company_name, spot_address: item.spot_address, type_name: item.type_name, latest_change_time: item.latest_change_time })
+            });
+        }
+        let str = '<tr style="text-align:center"><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">';
+            for (const key in newData[i]) {
+                // 增加\t为了不让表格显示科学计数法或者其他格式
+                str += `<td x:str>${ newData[i][key] + '\t'}</td>`;
+            }
+            str += '</tr>';
+        }
+        // Worksheet名
+        const worksheet = 'Sheet1'
+        const uri = 'data:application/vnd.ms-excel;base64,';
+
+        // 下载的表格模板数据
+        const template = `<html xmlns:o="urn:schemas-microsoft-com:office:office" 
+        xmlns:x="urn:schemas-microsoft-com:office:excel" 
+        xmlns="http://www.w3.org/TR/REC-html40">
+        <head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet>
+        <x:Name>${worksheet}</x:Name>
+        <x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>
+        </x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->
+        </head><body><table>${str}</table></body></html>`;
+
+        // 通过创建a标签实现
+        const link = document.createElement("a");
+        link.href = uri + base64(template);
+        // 对下载的文件命名
+        link.download = "维保点位数据表.xls";
+        link.click();
+
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    }, 3)
+}
+// 导出  end
+
+
+//点位标签弹框
+$(document).on('click', 'a.pointLabel', function() {
+    let dwId = $(this).data('id');
+    layerDepartmentIndex = layer.open({
+        type: 1,
+        title: false,
+        closeBtn: 0,
+        shadeClose: true,
+        skin: 'yourclass',
+        area: [
+            '400px', '420px'
+        ],
+        content: $(".pointLabelOut"),
+        success: function() {
+            ajaxRequest(POINT_LIST, "POST", { "id": dwId }, function(result) {
+                var data = result.RESULT[0];
+                $('#pointDetailUrl').attr('src', BASEURL + data.spot_label_route);
+                $('#spotName').html(data.spot_name);
+                $('#spotAddress').html(data.spot_address);
+                $('#spotLabelAnalysis').html(data.spot_label_analysis);
+                $('#data1').html(data.spot_type);
+                $('.ok.pointLabelDownload').attr('href', BASEURL + data.spot_label_route);
+                $('.ok.pointLabelDownload').attr('download', BASEURL + data.spot_label_route);
+
+            }, function(errorMsg) {
+                alert("请求数据失败!");
+            }, 3);
+
+            $('.clsBtn2,.cancel2').click(function() {
+                innerPage = 1;
+                layer.close(layerDepartmentIndex);
+            })
+        }
+    })
+})
+
+//点位详情点击
+$(document).on('click', 'a.pointDetail', function() {
+    let id = $(this).data('id'); //单位ID
+    layerReportIndex = layer.open({
+        type: 1,
+        title: false,
+        closeBtn: 0,
+        shadeClose: true,
+        skin: 'yourclass',
+        area: [
+            '400px', '400px'
+        ],
+        content: $(".pointDetailOut"),
+        success: function() {
+            ajaxRequest(POINT_LIST, "POST", { "id": id }, function(result) {
+                var data = result.RESULT[0];
+                $('#weibaoReportUrl').attr('src', BASEURL + data.picture_route);
+            }, function(errorMsg) {
+                alert("请求数据失败!");
+            }, 3);
+
+            $('.clsBtn3,.cancel3').click(function() {
+                layer.close(layerReportIndex);
+            })
+        }
+    })
+})

js/record-inner.js

@@ -30,7 +30,7 @@ $(document).on('click', 'a.view-detail', function() {
 // 获取列表 ajax请求
 function getPointDetailAjax(queryParam = {}, innerPage = 1) {
     queryParam.page = innerPage;
-    queryParam.limit = 1; // 每页显示条数
+    queryParam.limit = 5; // 每页显示条数
     queryParam.start = (queryParam.page - 1) * queryParam.limit;
     ajaxRequest(RECORD_AND_POINT, "POST", queryParam, function(result) {
         let data = result.RESULT;
@@ -175,7 +175,7 @@ $(document).on('click', 'a.weibaoReport', 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);
+                $('#weibaoReportUrl').attr('src', BASEURL + data.report_photos);
             }, function(errorMsg) {
                 alert("请求数据失败!");
             }, 3);

js/record.js

@@ -36,7 +36,7 @@ getListDataAjax();
 //获取列表 ajax请求
 function getListDataAjax(queryParam = {}, page = 1) {
     queryParam.page = page;
-    queryParam.limit = 8; //每页显示条数
+    queryParam.limit = 20; //每页显示条数
     queryParam.start = (queryParam.page - 1) * queryParam.limit;
     ajaxRequest(RECORD_LIST, "POST", queryParam, function(result) {
         let data = result.RESULT;

js/system-inform.js

@@ -322,7 +322,6 @@ $('#dataUpdate').click(function() {
             return false;
         }
     }
-
     ajaxRequest(SYSTEM_UPDATE, "POST", allParam, function(result) {
         if (result.flag) {
             layer.close(layerUpdateIndex);

js/team-inner.js

@@ -2,18 +2,21 @@
 
 var innerPage = 1;
 
-
 // 新增修改 组织人员 列表渲染 ajax请求
 function getTeamInnerList(queryParam = {}, innerPage = 1) {
     queryParam.page = innerPage;
-    queryParam.limit = 1; // 每页显示条数
+    queryParam.limit = 5; // 每页显示条数
     queryParam.start = (queryParam.page - 1) * queryParam.limit;
     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' data-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
+                if (item.pd) {
+                    items += "<tr class='selected'>" + "<td class='status checked' 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-username='" + item.username + "' data-phone='" + item.phone + "'></td>" + "<td>" + item.username + "</td>" + "<td>" + item.phone + "</td>" + "</tr>"
+                }
             })
             $('#dataList2').html(items);
             $('#dataList3').html(items);
@@ -24,14 +27,14 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
         console.log(result)
         totalPages = result.totalCount / result.limit;
         totalPages = Math.ceil(totalPages);
-        $('#totalPage2').html(totalPages); // 总共多少页
-        $('#dataTotal2').html(result.totalCount); // 总共多少条数据
-        $('#currentPage2').val(innerPage); // 当前页面
+        $('#totalPage2,#totalPage3').html(totalPages); // 总共多少页
+        $('#dataTotal2,#dataTotal3').html(result.totalCount); // 总共多少条数据
+        $('#currentPage2,#currentPage3').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);
+        $('#pageFrom2,#pageFrom3').html(pageFrom);
+        $('#pageTo2,#pageTo3').html(pageTo);
 
         // 无数据时
         if (!result.totalCount) {
@@ -43,13 +46,17 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
         }
         if (innerPage < totalPages) {
             $('#nextPageButton2,#lastPageButton2').removeClass('disabled');
+            $('#nextPageButton3,#lastPageButton3').removeClass('disabled');
         } else {
             $('#nextPageButton2,#lastPageButton2').addClass('disabled');
+            $('#nextPageButton3,#lastPageButton3').addClass('disabled');
         }
         if (innerPage === 1) {
             $('#firstPageButton2,#prevPageButton2').addClass('disabled');
+            $('#firstPageButton3,#prevPageButton3').addClass('disabled');
         } else {
             $('#firstPageButton2,#prevPageButton2').removeClass('disabled');
+            $('#firstPageButton3,#prevPageButton3').removeClass('disabled');
         }
     }, function(errorMsg) {
         alert("请求数据失败!");
@@ -57,32 +64,71 @@ function getTeamInnerList(queryParam = {}, innerPage = 1) {
 };
 
 
-// 分页操作
-$('#firstPageButton2').on('click', function() {
+// // 分页操作
+// $('#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();
+// }
+
+// 新增修改弹框分页操作
+$('#firstPageButton2,#firstPageButton3').on('click', function() {
     innerPage = 1;
     getTeamInnerList({}, 1);
 });
 
-$('#lastPageButton2').on('click', function() {
+$('#lastPageButton2,#lastPageButton3').on('click', function() {
     innerPage = totalPages;
     getTeamInnerList({}, innerPage);
 });
 
-$('#prevPageButton2').on('click', function() {
+$('#prevPageButton2,#prevPageButton3').on('click', function() {
     innerPage -= 1;
     getTeamInnerList({}, innerPage);
 });
 
-$('#nextPageButton2').on('click', function() {
+$('#nextPageButton2,#nextPageButton3').on('click', function() {
     innerPage += 1;
     getTeamInnerList({}, innerPage);
 })
 
-// 分页刷新按钮
+// 新增分页刷新按钮
 $('.pg-refresh2').click(resetForm);
 
-// 重置表单
 function resetForm() {
     innerPage = 1;
     getTeamInnerList();
+}
+
+
+// 修改分页刷新
+$('.pg-refresh3').click(resetForm);
+
+function resetForm() {
+    let dataId = $('.pure-table #dataList tr').find('.checked').data('id');
+    innerPage = 1;
+    getTeamInnerList({ 'dwid': dataId });
 }

js/team.js

@@ -4,14 +4,12 @@ var totalPages = 0;
 var param1 = '';
 var param2 = '';
 
-var aa = ''
-
 //列表渲染
 getListDataAjax();
 //获取列表ajax请求
 function getListDataAjax(queryParam = {}, page = 1) {
     queryParam.page = page;
-    queryParam.limit = 8; //每页显示条数
+    queryParam.limit = 20; //每页显示条数
     queryParam.start = (queryParam.page - 1) * queryParam.limit;
     ajaxRequest(TEAM_LIST, "POST", queryParam, function(result) {
         let data = result.RESULT;
@@ -73,14 +71,12 @@ 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;
-
         let items = '';
         data.forEach(function(item, key) {
-            items += `<option value="${item.id}">${item.username}</option>`
+            items += `<option value="${item.username}" data-phone="${item.phone}" data-id="${item.id}">${item.username}</option>`
         })
         $('#add_people').append(items);
         $('#add_people2').append(items);
@@ -137,11 +133,9 @@ $('.pg-refresh').click(resetForm);
 //重置表单
 function resetForm() {
     page = 1;
-
     $("#team_name").val("");
     $("#add_people").val("");
     getListDataAjax(getSearchParamObj());
-
     param1 = $('#team_name').val()
     param5 = $('#add_people').val()
 }
@@ -166,23 +160,21 @@ $('#nextPageButton').on('click', function() {
 
 
 /*新增 修改 关闭 弹框*/
-var layer = layui.layer;
-var layerCreateIndex = '';
-var layerUpdateIndex = ''
 layui.use('layer', function() {
-
     // 新增弹框
     $(document).on('click', '.add', function() {
         layerCreateIndex = layer.open({
             type: 1,
             title: false,
             closeBtn: 0,
+            shadeClose: true,
             skin: 'yourclass',
             area: ['450px', '500px'],
             content: $(".addTeamOut"),
             success: function() {
                 getTeamInnerList();
                 $('.clsBtn,.cancel').click(function() {
+                    innerPage = 1;
                     layer.close(layerCreateIndex);
                 })
             }
@@ -191,13 +183,11 @@ layui.use('layer', function() {
 
     //修改弹框信息 
     $('.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');
-
             $('.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)
@@ -208,11 +198,12 @@ layui.use('layer', function() {
                 closeBtn: 0,
                 shadeClose: true,
                 skin: 'yourclass',
-                area: ['410px', '400px'],
+                area: ['410px', '500px'],
                 content: $(".editTeamOut"),
                 success: function() {
-                    getTeamInnerList();
+                    getTeamInnerList({ "dwid": dataId });
                     $('.clsBtn,.cancel').click(function() {
+                        innerPage = 1;
                         layer.close(layerUpdateIndex);
                     })
                 }
@@ -263,13 +254,12 @@ $('#addData').click(function() {
             layer.msg('请选择一条需要修改的信息!', { icon: 5 });
             return
         } else {
-            let userName = $('.pure-table tr').find('.checked').data('username');
-            let phone = $('.pure-table tr').find('.checked').data('phone');
+            let userName = $('.pure-table #dataList2 tr').find('.checked').data('username');
+            let phone = $('#add_people2').find("option:selected").attr("data-phone")
             allParam.phone = phone;
             allParam.RY_LIST = [userName];
         }
 
-
         //验证通过 请求ajax
         ajaxRequest(TEAM_ADD, "POST", allParam, function(result) {
             layer.close(layerCreateIndex);
@@ -283,8 +273,6 @@ $('#addData').click(function() {
     /* 修改发送请求 */
 $('#dataUpdate').click(function() {
 
-
-
     //获取表单的值 并转换成对象
     let allParam = serializeArrayToObj($("#editTeamForm").serializeArray());
 

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

@@ -20,7 +20,6 @@
             background-position: 181px 0;
         }
     </style>
-
 </head>
 
 <body style="background:rgba(0,0,0,0)">
@@ -135,19 +134,22 @@
                                         </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">
+                                <select id="start_inspect_time" name="start_inspect_time">
+                                    <option value="">请选择</option>
+                                </select>
                             </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">
+                                <select id="end_inspect_time" name="end_inspect_time">
+                                    <option value="">请选择</option>
+                                </select>
                             </div>
                         </div>
                         <div class="layui-col-xs6 choose-item">
@@ -183,7 +185,7 @@
                 <tbody id="dataList2">
                 </tbody>
             </table>
-            <div class="pager2 has-data flex">
+            <div class="pager2 has-data flex innerPager">
                 <div class="pager-left flex1 align-left">
                     <ul>
                         <li id="firstPageButton2" class="pg-first disabled"></li>
@@ -203,7 +205,7 @@
                     1 </span>条
                 </div>
             </div>
-            <div class="pager2 no-data" style="display:none;text-align:right">
+            <div class="pager2 innerPager no-data" style="display:none;text-align:right">
                 暂无数据
             </div>
         </div>
@@ -251,7 +253,7 @@
                                 <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">
+                                        <input id="clztRadioFirst" type="radio" name="cycle" value="0" title="每日" checked="" maxlength="20">
                                         <div class="layui-unselect layui-form-radio layui-form-radioed"><i class="layui-anim layui-icon"></i>
                                             <div>每日</div>
                                         </div>
@@ -265,19 +267,22 @@
                                         </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">
+                                <select id="start_inspect_time2" name="start_inspect_time">
+                                    <option value="">请选择</option>
+                                </select>
                             </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">
+                                <select id="end_inspect_time2" name="end_inspect_time">
+                                    <option value="">请选择</option>
+                                </select>
                             </div>
                         </div>
                         <div class="layui-col-xs6 choose-item">
@@ -313,27 +318,27 @@
                 <tbody id="dataList3">
                 </tbody>
             </table>
-            <div class="pager2 has-data flex">
+            <div class="pager2 innerPager 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 id="firstPageButton3" class="pg-first disabled"></li>
+                        <li id="prevPageButton3" class="pg-prev disabled"></li>
                         <li class="pg-des">
-                            第 <input id="currentPage2" type="text" size="1" value="1"> 页，共 <span id="totalPage2">1</span> 页
+                            第 <input id="currentPage3" type="text" size="1" value="1"> 页，共 <span id="totalPage3">1</span> 页
                         </li>
-                        <li id="nextPageButton2" class="pg-next"></li>
-                        <li id="lastPageButton2" class="pg-last"></li>
-                        <li class="pg-refresh2">
+                        <li id="nextPageButton3" class="pg-next"></li>
+                        <li id="lastPageButton3" class="pg-last"></li>
+                        <li class="pg-refresh3">
                             <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">
+                <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom3"> 1 </span> 条到 <span id="pageTo3">
+                    1 </span>条记录，总共 <span id="dataTotal3">
                     1 </span>条
                 </div>
             </div>
-            <div class="pager2 no-data" style="display:none;text-align:right">
+            <div class="pager2 innerPager no-data" style="display:none;text-align:right">
                 暂无数据
             </div>
         </div>
@@ -345,75 +350,8 @@
                 <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
             </div>
         </div>
-
     </div>
 
-
-
-    <!-- 维保点位弹框 -->
-    <div class="xcConfirm queryPointDetailList" style="display:none">
-        <div class="xc_layer"></div>
-        <div class="popBox">
-            <div class="ttBox">
-                <a class="clsBtn"></a>
-                <span class="tt">维保点位</span>
-            </div>
-            <div class="memberbox" style="height:400px">
-                <div class="member-choose" style="margin:0.4375rem 0">
-                    <span>维保状态</span>
-                    <select name="" id="weibao">
-                        <option value="0">所有</option>
-                        <option value="1">未完成</option>
-                        <option value="2">已完成</option>
-                    </select>
-                    <a class="button" id="buttonSearch2">确定</a>
-                </div>
-                <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>
-                            <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>
-    </div>
-
-
     <!-- 点位详情弹框 -->
     <div class="xcConfirm pointDetailOut" style="display:none">
         <div class="xc_layer"></div>
@@ -423,8 +361,6 @@
                 <span class="tt">点位详情</span>
             </div>
             <div class="memberbox imgOut ">
-                <!-- <div></div> -->
-
                 <img id="pointDetailUrl" src="../../images/bg.jpg" alt="" width="300px" height="270px">
                 <br>
                 <p style="margin-top:20px">测试点位</p>
@@ -437,27 +373,6 @@
         </div>
     </div>
 
-    <!-- 维保报告弹框 -->
-    <div class="xcConfirm weibaoReportOut" style="display:none">
-        <div class="xc_layer"></div>
-        <div class="popBox">
-            <div class="ttBox">
-                <a class="clsBtn3"></a>
-                <span class="tt">点位详情</span>
-            </div>
-            <div class="memberbox imgOut ">
-                <!-- <div></div> -->
-
-                <img id="weibaoReportUrl" src="../../images/bg.jpg" alt="" width="250px" height="250px">
-            </div>
-            <div class="btnArea ">
-                <div class="btnGroup ">
-                    <a class="sgBtn cancel3 "><img src="../../images/cancel.png " alt=" ">关闭</a>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <script src="../../js/jquery.js "></script>
     <script src="../../js/util.js "></script>
     <script src="../../api/request.js "></script>
@@ -467,73 +382,6 @@
     <script src="../../js/plan.js "></script>
     <script src="../../js/plan-inner.js "></script>
 
-    <script>
-        layui.use(['form', 'layedit', 'laydate'], function() {
-            var form = layui.form,
-                layer = layui.layer,
-                layedit = layui.layedit,
-                laydate = layui.laydate;
-        });
-        layui.use('laydate', function() {
-            var laydate = layui.laydate;
-            //开始日期
-            var insStart = laydate.render({
-                elem: '#startTime',
-                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: '#endTime',
-                trigger: 'click',
-                done: function(value, date) {
-                    //更新开始日期的最大日期
-                    insStart.config.max = lay.extend({}, date, {
-                        month: date.month - 1
-                    });
-                }
-            });
-        });
-
-
-
-        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>
 
 </html>

pages/operation/point.html

@@ -14,49 +14,22 @@
 </head>
 
 <body style="background:rgba(0,0,0,0)">
-    <div class="memberbox memberbox2">
+    <div class="memberbox ">
         <div class="membertit">维保点位</div>
         <div class="member-choose">
-            <span>事件名称</span>
-            <input type="text" id="event_name">
-            <span>事件类型</span>
-            <select name="" id="event_type">>
-                <option value="">所有</option>
-                <option value="1">消防隐患</option>
-                <option value="2">消防告警</option>
-                <option value="3">设备设施</option>
-            </select>
+            <span>点位名称</span>
+            <input type="text" id="spot_name">
+
+            <span>点位地址</span>
+            <input type="text" id="spot_address">
             <a class="button" id="buttonSearch">确定</a>
             <a class="button reset">重置</a>
         </div>
         <div class="operatebox"></div>
         <ul class="member-operate">
-            <div class="event-count-box">
-                <ul>
-                    <li class="color-blue">
-                        <img src="../../images/event-icon1.png" alt="">
-                        <span>事件总数</span>
-                        <span class="event-num color-blue" id="totalCount">0</span>
-                    </li>
-                    <li class="color-orange">
-                        <img src="../../images/event-icon2.png" alt="">
-                        <span>已处置数</span>
-                        <span class="event-num color-orange" id="handled">0</span>
-                    </li>
-                    <li class="color-red">
-                        <img src="../../images/event-icon3.png" alt="">
-                        <span>未处置数</span>
-                        <span class="event-num color-red" id="unhandle">0</span>
-                    </li>
-                    <li class="color-green">
-                        <img src="../../images/event-icon4.png" alt="">
-                        <span>处置率</span>
-                        <span class="event-num color-green" id="handleRate">0%</span>
-                    </li>
-                </ul>
-            </div>
-            <a class="button add">新增</a>
-            <a class="button handle">处置</a>
+            <a class="button add">+ 新增</a>
+            <a class="button edit">修改</a>
+            <a class="button delete">- 删除</a>
             <a class="button export">导出</a>
         </ul>
         <table class="pure-table" cellspacing="0px">
@@ -65,13 +38,13 @@
                     <th style="width:24px">
                     </th>
                     <th>序号</th>
-                    <th>单位名称</th>
-                    <th>上报时间</th>
-                    <th>事件名称</th>
-                    <th>事件类型</th>
-                    <th>处理状态</th>
-                    <th>处理人</th>
-                    <th>处理时间</th>
+                    <th>点位名称</th>
+                    <th>所属单位/项目</th>
+                    <th>点位地址</th>
+                    <th>设备类型</th>
+                    <th>最新更改时间</th>
+                    <th>点位标签</th>
+                    <th>点位详情</th>
                 </tr>
             </thead>
             <tbody id="dataList">
@@ -95,108 +68,189 @@
             </ul>
         </div>
         <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
-                1 </span>条记录，总共 <span id="dataTotal">
-                1 </span>条
+                            1 </span>条记录，总共 <span id="dataTotal">
+                            1 </span>条
         </div>
     </div>
     <div class="pager no-data" style="display:none;text-align:right">
         暂无数据
     </div>
 
+
     <!-- 新增弹框 -->
-    <div class="xcConfirm  addDataOut" style="display:none">
+    <div class="xcConfirm addDataOut " style="display:none">
+        <div class="xc_layer"></div>
         <div class="popBox">
             <div class="ttBox">
                 <a class="clsBtn"></a>
                 <span class="tt">新增</span>
             </div>
-            <form action="" id="addDataForm">
+            <form id="addDataForm" action="">
                 <div class="txtBox">
                     <div>
-                        <span>事件名称：<i class="necessary">*</i></span>
-                        <input type="text" name="event_name">
+                        <span>点位名称：<i class="necessary">*</i></span>
+                        <input name="spot_name" type="text">
                     </div>
                     <div>
-                        <span>事件内容：<i class="necessary">*</i></span>
-                        <input type="text" name="event_content">
+                        <span>所属单位/项目：<i class="necessary">*</i></span>
+                        <select name="company_code" id="getNameList">
+                            <option value="">请选择</option>
+                        </select>
                     </div>
                     <div>
-                        <span>事件类型：<i class="necessary">*</i></span>
-                        <select name="event_type" id="">
-                            <option value="1">消防隐患</option>
-                            <option value="2">消防告警</option>
-                            <option value="3">设备设施</option>
-                        </select>
+                        <span>点位地址：<i class="necessary">*</i></span>
+                        <input name="spot_address" type="text">
                     </div>
                     <div>
-                        <span>所属单位：<i class="necessary">*</i></span>
-                        <select name="company_code" id="getNameList">
-                            <option value="">所有</option>
-                        </select>
+                        <span>设备编号：<i class="necessary">*</i></span>
+                        <input name="equipment_code" type="text">
+                    </div>
+                    <div class="error-radio layui-form">
+                        <span>设备类型:</span>
+                        <div class="layui-form-item ">
+                            <div class="layui-input-block">
+                                <input id="inc1" type="radio" name="spot_type" value="1" title="水系统" checked>
+                                <input id="inc0" type="radio" name="spot_type" value="2" title="火系统">
+                                <input id="inc0" type="radio" name="spot_type" value="3" title="烟感">
+                            </div>
+                        </div>
+                    </div>
+                    <div>
+                        <span>上传图片<i class="necessary">*</i></span>
+                        <input id="pictureRouteAdd" name="picture_route" type="file">
                     </div>
                 </div>
-            </form>
-            <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 class="btnArea">
+                    <div class="btnGroup">
+                        <a id="addData" class="sgBtn ok"><img src="../../images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
+                    </div>
                 </div>
-            </div>
+            </form>
         </div>
     </div>
-    </div>
-    <div class="xcConfirm  handleDataOut" style="display:none">
-        <!-- 处置弹框 -->
+
+    <!-- 修改弹框 -->
+    <div class="xcConfirm editDataOut " style="display:none">
+        <div class="xc_layer"></div>
         <div class="popBox">
             <div class="ttBox">
                 <a class="clsBtn"></a>
-                <span class="tt">处置</span>
+                <span class="tt">新增</span>
             </div>
-            <form action="" id="handleDataForm">
-                <div class="txtBox ">
+            <form id="editDataForm" action="">
+                <div class="txtBox">
                     <div>
-                        <span>单位名称：</span>
-                        <input type="text" name="company_name" readonly>
+                        <span>点位名称：<i class="necessary">*</i></span>
+                        <input name="spot_name" type="text">
                     </div>
                     <div>
-                        <span>事件类型：</span>
-                        <input type="text" name="event_type" readonly>
+                        <span>所属单位/项目：<i class="necessary">*</i></span>
+                        <select name="company_code" id="getNameList2">
+                            <option value="">请选择</option>
+                        </select>
                     </div>
                     <div>
-                        <span>事件名称：</span>
-                        <input type="text" name="event_name" readonly>
+                        <span>点位地址：<i class="necessary">*</i></span>
+                        <input name="spot_address" type="text">
+                    </div>
+                    <div>
+                        <span>设备编号：<i class="necessary">*</i></span>
+                        <input name="equipment_code" type="text">
+                    </div>
+                    <div class="error-radio layui-form">
+                        <span>设备类型:</span>
+                        <div class="layui-form-item ">
+                            <div class="layui-input-block">
+                                <input id="inc1" type="radio" name="spot_type" value="1" title="水系统" checked>
+                                <input id="inc0" type="radio" name="spot_type" value="2" title="火系统">
+                                <input id="inc2" type="radio" name="spot_type" value="3" title="烟感">
+                            </div>
+                        </div>
                     </div>
                     <div>
-                        <span>事件内容：</span>
-                        <input type="text" name="event_content" readonly>
+                        <span>上传图片<i class="necessary">*</i></span>
+                        <input id="pictureRouteEit" name="picture_route" type="file">
                     </div>
                     <div>
-                        <span>处置内容：</span>
-                        <textarea name="cl_content" id="" cols="30" rows="6"></textarea>
+                        <span></span>
+                        <div style="display:inline-block">
+                            <img style="display: none;" src="" id="pictureRouteShow" class="systemLogoShow">
+                        </div>
                     </div>
-                    <div style="opacity:0">
-                        <span>数据id：</span>
-                        <input type="text" name="id">
+                </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>
             </form>
-            <div class="btnArea">
-                <div class="btnGroup">
-                    <a class="sgBtn ok" id="handleUpdate"><img src="../../images/accept.png" alt=""> 提交</a>
-                    <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
+        </div>
+
+
+
+    </div>
+
+    <!-- 点位标签弹框 -->
+    <div class="xcConfirm pointLabelOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn2"></a>
+                <span class="tt">点位详情</span>
+            </div>
+            <div class="memberbox imgOut ">
+                <img id="pointDetailUrl" src="../../images/bg.jpg" alt="" width="200px" height="200px">
+                <br>
+                <br>
+                <div class="point-des">
+                    <p>点位名称：<span id="spotName"></span></p>
+                    <p>点位地址：<span id="spotAddress"></span></p>
+                    <p>点位编号：<span id="spotLabelAnalysis"></span> </p>
+                    <p>设备编号：<span id="data1"></span> </p>
+                </div>
+            </div>
+            <div class="btnArea ">
+                <div class="btnGroup ">
+                    <a class="sgBtn ok pointLabelDownload" id="updateData" download><img src="../../images/accept.png" alt=""> 下载
+                    </a>
+                    <a class="sgBtn cancel2 "><img src="../../images/cancel.png " alt=" ">关闭</a>
                 </div>
             </div>
         </div>
     </div>
-    <div id="view"></div>
-
-    <script src="../../js/jquery.js"></script>
-    <script src="../../js/util.js"></script>
-    <script src="../../api/request.js"></script>
-    <script src="../../js/main.js"></script>
-    <script src="../../layui/layui.js"></script>
-    <script src="../../js/valid.js"></script>
-    <script src="../../js/event-manage.js"></script>
+
+    <!-- 点位详情弹框 -->
+    <div class="xcConfirm pointDetailOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn3"></a>
+                <span class="tt">点位详情</span>
+            </div>
+            <div class="memberbox imgOut ">
+                <img id="weibaoReportUrl" src="../../images/bg.jpg" alt="" width="250px" height="250px">
+                <p style="margin-top:20px">测试点位</p>
+            </div>
+            <div class="btnArea ">
+                <div class="btnGroup ">
+                    <a class="sgBtn cancel3 "><img src="../../images/cancel.png " alt=" ">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../js/jquery.js "></script>
+    <script src="../../js/util.js "></script>
+    <script src="../../api/request.js "></script>
+    <script src="../../js/main.js "></script>
+    <script src="../../layui/layui.js "></script>
+    <script src="../../js/valid.js "></script>
+    <script src="../../js/point.js "></script>
+    <script src="../../js/upload.js"></script>
+
     <script>
         layui.use(['form', 'layedit', 'laydate'], function() {
             var form = layui.form,

pages/operation/team.html

@@ -133,7 +133,7 @@
                 <tbody id="dataList2">
                 </tbody>
             </table>
-            <div class="pager2 has-data flex">
+            <div class="pager2 has-data flex innerPager">
                 <div class="pager-left flex1 align-left">
                     <ul>
                         <li id="firstPageButton2" class="pg-first disabled"></li>
@@ -149,7 +149,7 @@
                     </ul>
                 </div>
             </div>
-            <div class="pager2 no-data" style="display:none;text-align:right">
+            <div class="pager2 no-data innerPager" style="display:none;text-align:right">
                 暂无数据
             </div>
         </div>
@@ -210,31 +210,33 @@
                 <tbody id="dataList3">
                 </tbody>
             </table>
-            <div class="pager2 has-data flex">
+            <div class="pager2 innerPager 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 id="firstPageButton3" class="pg-first disabled"></li>
+                        <li id="prevPageButton3" class="pg-prev disabled"></li>
                         <li class="pg-des">
-                            第 <input id="currentPage2" type="text" size="1" value="1"> 页，共 <span id="totalPage2">1</span> 页
+                            第 <input id="currentPage3" type="text" size="1" value="1"> 页，共 <span id="totalPage3">1</span> 页
                         </li>
-                        <li id="nextPageButton2" class="pg-next"></li>
-                        <li id="lastPageButton2" class="pg-last"></li>
-                        <li class="pg-refresh2">
+                        <li id="nextPageButton3" class="pg-next"></li>
+                        <li id="lastPageButton3" class="pg-last"></li>
+                        <li class="pg-refresh3">
                             <a href="javascript:location.reload();"></a>
                         </li>
                     </ul>
                 </div>
+                <!-- <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom3"> 1 </span> 条到 <span id="pageTo3">
+                    1 </span>条记录，总共 <span id="dataTotal3">
+                    1 </span>条
+                </div> -->
             </div>
-            <div class="pager2 no-data" style="display:none;text-align:right">
+            <div class="pager2 innerPager no-data" style="display:none;text-align:right">
                 暂无数据
             </div>
         </div>
 
     </div>
 
-
-
     <!-- 维保点位弹框 -->
     <div class="xcConfirm queryPointDetailList" style="display:none">
         <div class="xc_layer"></div>
@@ -298,7 +300,6 @@
         </div>
     </div>
 
-
     <!-- 点位详情弹框 -->
     <div class="xcConfirm pointDetailOut" style="display:none">
         <div class="xc_layer"></div>
@@ -308,8 +309,6 @@
                 <span class="tt">点位详情</span>
             </div>
             <div class="memberbox imgOut ">
-                <!-- <div></div> -->
-
                 <img id="pointDetailUrl" src="../../images/bg.jpg" alt="" width="300px" height="270px">
                 <br>
                 <p style="margin-top:20px">测试点位</p>