更改页面结构 导出功能 bug修复

api/request.js

@@ -1,28 +1,29 @@
-//动态获取url
-//const BASEURL = getRequestPrefix();
+// // 动态获取url
+// const BASEURL = getRequestPrefix();
 
-// 动态获取用户名密码
+// // 动态获取用户名密码
 // const LOGIN_NAME = sessionStorage.getItem('V_LOGINNAME');
 // const LOGIN_PASSWORD = sessionStorage.getItem('V_PASSWORD');
 
 
-//服务端url
-// const BASEURL = "http://101.133.214.75:8080/Device_Manager/";
+// //服务端url
+// // const BASEURL = "http://101.133.214.75:8080/Device_Manager/";
 
-//本地调试url
+// //本地调试url
 const BASEURL = "http://127.0.0.1:8080/Device_Manager/";
 
-//最新测试url
-// const BASEURL = "http://121.40.217.77:8080/Device_Manager/";
+// //最新测试url
+// // const BASEURL = "http://121.40.217.77:8080/Device_Manager/";
 
 //用户名、密码 
 const LOGIN_NAME = "admin";
 const LOGIN_PASSWORD = "e10adc3949ba59abbe56e057f20f883e";
 
-const UPLOAD_FILE = 'sys/uploadSysIcon'; //logo上传
 
 
 
+const UPLOAD_FILE = 'sys/uploadSysIcon';
+
 const COMPANY_LIST_ORG = "companyManagement/queryCompanyList"; //单位查询（组织机构）
 const COMPANY_ADD = "companyManagement/addCompany"; //单位新增（组织机构）
 const COMPANY_UPDATE = "companyManagement/updateCompany"; //单位更新（组织机构）
@@ -96,15 +97,18 @@ const DEVICE_LIST_SEARCH = 'device/queryDeviceList' //设备列表查询
 const DEVICE_LIST_ADD = "device/deviceRegister"; //设备列表新增  (本地设备注册)
 const DEVICE_LIST_UPDATE = "device/deviceUpdate"; //设备列表修改   
 const DEVICE_LIST_DELETE = "device/delDevice"; //设备列表删除
+const DEVICE_LIST_EXPORT = "device/queryDeviceListExcel"; //设备列表导出
+
 
 
 
 const DEVICE_TYPE_LIST = 'iot/devicetype/getDeviceTypeList' //设备类型查询
 const TYPE_LIST = "iot/devicetype/getDeviceTypeList1"; //设备类型下拉
-
 const DEVICE_TYPE_ADD = "iot/devicetype/appendDeviceType"; //设备类型新增
 const DEVICE_TYPE_UPDATE = "iot/devicetype/updateDeviceType"; //设备类型修改
 const DEVICE_TYPE_DELETE = "iot/devicetype/deleteDeviceType"; //设备类型删除
+const DEVICE_TYPE_EXPORT = "iot/devicetype/getDeviceTypeListExcel"; //设备类型导出
+
 
 const DEVICE_COMMUNICATE_LIST = 'iot/interface/getInterfaceList' //通信列表查询
 const DEVICE_COMMUNICATE_ADD = "iot/interface/appentInterface"; //通信新增
@@ -124,6 +128,8 @@ const DEVICE_CHECKCHANNEL_LIST = 'iot/device_object_passageway/getDeviceObjectPa
 const DEVICE_CHECKCHANNEL_ADD = "iot/device_object_passageway/appendDeviceObjectPassageway"; //设备检测对象通道表新增
 const DEVICE_CHECKCHANNEL_UPDATE = "iot/device_object_passageway/updateDeviceObjectPassageway"; //设备检测对象通道表修改
 const DEVICE_CHECKCHANNEL_DELETE = "iot/device_object_passageway/deleteDeviceObjectPassageway"; //设备检测对象通道表删除
+const DEVICE_CHECKCHANNEL_EXPORT = "iot/device_object_passageway/getDeviceObjectPassagewayList "; //设备检测对象通道表导出
+
 
 const WORK_MANAGE_LIST = 'iot/work_order/getWorkOrderList' //工单管理列表查询
 const WORK_MANAGE_ADD = "iot/work_order/appendWorkOrder"; //工单管理新增

deviceCheck-channel.html

@@ -53,7 +53,7 @@
                         <a class="button edit">修改</a>
                         <a class="button add">+ 新增</a>
                         <a class="button delete ">- 删除</a>
-                        <a class="button">导出</a>
+                        <a class="button export">导出</a>
 
                     </ul>
 

deviceCheck.html

@@ -233,8 +233,9 @@
                         <div class="layui-col-xs4">
                             <div class="grid-demo">
                                 <span>单位：<i class="necessary">*</i></span>
-                                <select name="company_code" id="getNameList2">
-                           </select>
+                                <!-- <select name="company_code" id="getNameList2" readonly> -->
+                                <input type="text" name="company_code" readonly>
+                                </select>
                             </div>
                         </div>
                     </div>
@@ -320,6 +321,7 @@
             //开始日期
             var insStart = laydate.render({
                 elem: '#start_add_time',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新结束日期的最小日期
                     insEnd.config.min = lay.extend({}, date, {
@@ -333,6 +335,7 @@
             //结束日期
             var insEnd = laydate.render({
                 elem: '#end_add_time',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新开始日期的最大日期
                     insStart.config.max = lay.extend({}, date, {

deviceList.html

@@ -377,6 +377,7 @@
             //开始日期
             var insStart = laydate.render({
                 elem: '#startTime',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新结束日期的最小日期
                     insEnd.config.min = lay.extend({}, date, {
@@ -390,6 +391,7 @@
             //结束日期
             var insEnd = laydate.render({
                 elem: '#endTime',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新开始日期的最大日期
                     insStart.config.max = lay.extend({}, date, {

deviceType.html

@@ -45,7 +45,6 @@
                         <span>类型值</span>
                         <input type="text" id="type_value">
 
-
                         <a class="button" id="buttonClick">确定</a>
                         <a class="button reset">重置</a>
                     </div>
@@ -54,11 +53,9 @@
                         <a class="button edit">修改</a>
                         <a class="button add">+ 新增</a>
                         <a class="button delete ">- 删除</a>
-                        <a class="button">导出</a>
-
+                        <a class="button export">导出</a>
                     </ul>
 
-
                     <table class="pure-table " cellspacing="0px" id="test">
                         <thead>
                             <tr>
@@ -77,8 +74,6 @@
                         </thead>
 
                         <tbody id="dataList">
-
-
                         </tbody>
                     </table>
                 </div>
@@ -217,8 +212,6 @@
     </div>
 
 
-
-
     <script src="js/jquery.js"></script>
     <script src="js/util.js"></script>
     <script src="api/request.js"></script>

eventDanger-manage.html

@@ -263,6 +263,7 @@
             //开始日期
             var insStart = laydate.render({
                 elem: '#time_start',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新结束日期的最小日期
                     insEnd.config.min = lay.extend({}, date, {
@@ -276,6 +277,7 @@
             //结束日期
             var insEnd = laydate.render({
                 elem: '#time_end',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新开始日期的最大日期
                     insStart.config.max = lay.extend({}, date, {

eventWarning-manage.html

@@ -269,6 +269,7 @@
             //开始日期
             var insStart = laydate.render({
                 elem: '#time_start',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新结束日期的最小日期
                     insEnd.config.min = lay.extend({}, date, {
@@ -282,6 +283,7 @@
             //结束日期
             var insEnd = laydate.render({
                 elem: '#time_end',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新开始日期的最大日期
                     insStart.config.max = lay.extend({}, date, {

js/auth-manage.js

@@ -12,7 +12,7 @@ function getRoleTree() {
         data.forEach(function(item, key) {
             items += `<li>
             <span class="treeRole" data-id=${item.roleId}>
-                <img src="images/login.png" alt="">
+                <img src="../images/login.png" alt="">
                 ${item.roleName}
             </span>
         </li>`
@@ -219,9 +219,9 @@ $('#addMenu').click(function() {
     ajaxRequest(MENU_ADD, "POST", allParam, function(result) {
 
         if (result.flag) {
-            let data = result.data;
             layer.close(layerCreateIndex);
             getMenuListDataAjax()
+            $('#addMenuForm')[0].reset();
         } else {
             //服务端返回报错
             alert(result.msg);

js/building-manage.js

@@ -242,6 +242,7 @@ $('#addData').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
+        $('#addDataForm')[0].reset();
     }, function(errorMsg) {
         alert("异常错误!");
     })

js/buildingFloor-manage.js

@@ -222,6 +222,7 @@ $('#addData').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
+        $('#addDataForm')[0].reset();
     }, function(errorMsg) {
         alert("异常错误!");
     })

js/buildingRoom-manage.js

@@ -245,6 +245,7 @@ $('#addData').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
+        $('#addDataForm')[0].reset();
     }, function(errorMsg) {
         alert("异常错误!");
     })

js/device-check.js

@@ -162,40 +162,7 @@ function getBuildTree() {
         })
 
         dataDefaultTree = treeArray
-        let items = '';
-        let companyItems = '';
-        let companyDepartmentItems = '<option value="">请选择</option>';
-
-        // data.forEach(function (item, key) {
-        //     items += `<li  data-id=${item.ownerId} ><span data-id=${item.ownerId}  class="treeCompany"><img  class="img" src="images/login.png" alt=""> ${item.ownerName}  (${item.userNumber})</span>`;
-        //     if (item.child) {
-        //         let data = item.child;
-        //         items += `<ul class="child-three">`;
-        //         data.forEach(function (item, key) {
-        //             items += `<li   data-id=${item.departmentId} ><span  data-id=${item.departmentId}  class="treeDepartment"><img class="img" src="images/login.png" alt="">${item.departmentName}</span></li>`
-        //         });
-        //         items += ` </ul>`;
-        //     }
-        //     `</li>`
-
-        //     companyItems += `<option value="${item.ownerId}">${item.ownerName}</option>`
-
-        //     if (key == 0) {
-        //         let departmentObj = item.child;
-        //         if (departmentObj) {
-        //             departmentObj.forEach(function (item, key) {
-        //                 companyDepartmentItems += `<option value="${item.id}">${item.departmentName}</option>`
-        //             })
-        //             $('#departmentId').html(companyDepartmentItems);
-        //             $('#departmentIdUpdate').html(companyDepartmentItems);
-        //         }
-        //     }
-        // })
-
-        // $('#child-two').html(items);
-        // $('#companyId').html(companyItems);
-        // $('#companyId2').html(companyItems);
-        // treeClickSearch();
+
 
     }, function(errorMsg) {
         alert("请求数据失败!");
@@ -366,15 +333,6 @@ layui.use('layer', function() {
 
     //新增弹框
     $('.add').click(function() {
-
-            //重新渲染表单
-            // $('#addDeviceCheckForm')[0].reset()
-
-            // layui.use(['form'], function() {
-            //     var form = layui.form;
-            //     form.render('checkbox');
-            // });
-
             layerCreateIndex = layer.open({
                 type: 1,
                 title: false,
@@ -401,7 +359,7 @@ layui.use('layer', function() {
             } else {
                 let userInfo = $('.pure-table tr').find('.checked').data('user');
                 $('.editDataOut input[name=object_name]').val(userInfo.object_name)
-                $('.editDataOut select[name=company_code]').val(userInfo.company_code)
+                $('.editDataOut input[name=company_code]').val(userInfo.company_name)
                 $('.editDataOut input[name=id]').val(userInfo.id)
 
                 // 建筑赋值
@@ -521,6 +479,8 @@ layui.use('layer', function() {
 $('#addData').click(function() {
 
     let formAllParam = $("#addDeviceCheckForm").serializeArray();
+    console.log('formAllParam')
+    console.log(formAllParam)
 
     let allParam = {};
     let deviceCodeArr = [];
@@ -545,15 +505,20 @@ $('#addData').click(function() {
     }
 
     //验证通过 请求ajax
-
     ajaxRequest(DEVICE_CHECK_ADD, "POST", { "ID_LIST": [allParam] }, function(result) {
-        layer.close(layerCreateIndex);
-        layer.msg('添加成功!', { icon: 6 });
-        getListDataAjax();
-
-    }, function(errorMsg) {
-        alert("异常错误!");
-    }, 2)
+            layer.close(layerCreateIndex);
+            layer.msg('添加成功!', { icon: 6 });
+            getListDataAjax();
+            $('#addDeviceCheckForm')[0].reset();
+            getTypeListDataAjax()
+                // allParam.device_code = []
+
+            console.log('formAllParam2')
+            console.log($("#addDeviceCheckForm").serializeArray())
+        },
+        function(errorMsg) {
+            alert("异常错误!");
+        }, 2)
 })
 
 /* 修改发送请求 */

js/device-communicate.js

@@ -308,6 +308,7 @@ $('#addDataButton').click(function() {
                 layer.close(layerCreateIndex);
                 layer.msg('添加成功!', { icon: 6 });
                 getListDataAjax();
+                $('#addDataForm')[0].reset();
             }, function(errorMsg) {
                 alert("新增失败!");
             })

js/device-list.js

@@ -1,6 +1,10 @@
 var pageNo = 1;
 var totalPages = 0;
 
+var param1 = '';
+var param2 = '';
+var param3 = '';
+
 //设备列表
 getListDataAjax();
 
@@ -74,6 +78,10 @@ function getListDataAjax(queryParam = {}, pageNo = 1) {
 $('#buttonClick').on('click', function() {
     pageNo = 1;
     getListDataAjax(getSearchParamObj());
+
+    param1 = $('#ownerName').val()
+    param2 = $('#startTime').val()
+    param3 = $('#endTime').val()
 })
 
 //拼接搜索条件
@@ -98,6 +106,10 @@ function resetForm() {
     $("#startTime").val("");
     $("#endTime").val("");
     getListDataAjax(getSearchParamObj());
+
+    param1 = $('#ownerName').val()
+    param2 = $('#startTime').val()
+    param3 = $('#endTime').val()
 }
 
 //分页操作
@@ -143,7 +155,7 @@ function getCompanyList() {
 getTypeList()
 
 function getTypeList() {
-    ajaxRequest(TYPE_LIST, "POST", {}, function(result) {
+    ajaxRequest(DEVICE_TYPE_EXPORT, "POST", {}, function(result) {
         let data = result.RESULT.pageList;
         let items = '';
         data.forEach(function(item, key) {
@@ -427,6 +439,7 @@ $('#addData').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
+        $('#addDataForm')[0].reset();
     }, function(errorMsg) {
         alert("异常错误!");
     })
@@ -473,4 +486,39 @@ $('#dataUpdate').click(function() {
     }, function(errorMsg) {
         alert("数据修改失败!");
     })
-})
+})
+
+// 导出 start
+$('.export').click(function() {
+    getDataExport({ "ownerName": param1, "startTime": param2, "endTime": param3 })
+})
+
+function getDataExport(queryParam = {}) {
+    ajaxRequest(DEVICE_LIST_EXPORT, "POST", queryParam, function(result) {
+        console.log(result)
+        let data = result.pageList;
+        let newData = [];
+        if (data) {
+            data.forEach(function(item, index) {
+                var installTime = item.installTime ? getFormatDate(item.installTime) : '';
+                newData.push({ ownerCode: item.ownerCode, ownerName: item.ownerName, dwtype: item.dwtype, installMan: item.installMan, installTime: installTime })
+            });
+        }
+
+        let str = '<tr style="text-align:center"><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>';
+        }
+        downExcel(str, '设备列表数据表')
+
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    })
+}
+// 导出  end

js/device-type.js

@@ -1,6 +1,9 @@
 var pageNo = 1;
 var totalPages = 0;
 
+var param1 = '';
+var param2 = '';
+
 //设备类型列表
 getListDataAjax();
 
@@ -82,6 +85,9 @@ function getListDataAjax(queryParam = {}, pageNo = 1) {
 $('#buttonClick').on('click', function() {
     pageNo = 1
     getListDataAjax(getSearchParamObj());
+
+    param1 = $('#business').val()
+    param2 = $('#type_value').val()
 })
 
 //拼接搜索条件
@@ -125,6 +131,9 @@ function resetForm() {
     $("#business").val("");
     $("#type_value").val("");
     getListDataAjax(getSearchParamObj());
+
+    param1 = $('#business').val()
+    param2 = $('#type_value').val()
 }
 
 //单位下拉
@@ -247,6 +256,7 @@ $('#addMenu').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
+        $('#addMenuForm')[0].reset();
     }, function(errorMsg) {
         alert("异常错误!");
     })
@@ -278,4 +288,48 @@ $('#dataUpdate').click(function() {
     }, function(errorMsg) {
         alert("数据修改失败!");
     })
-})
+})
+
+
+// 导出 start
+$('.export').click(function() {
+    getDataExport({ "business": param1, "type_value": param2 })
+})
+
+function getDataExport(queryParam = {}) {
+    ajaxRequest(DEVICE_TYPE_EXPORT, "POST", queryParam, function(result) {
+        console.log(result.RESULT)
+        let data = result.RESULT.pageList;
+        let newData = [];
+        if (data) {
+            data.forEach(function(item, index) {
+                var add_time = getFormatDate(item.add_time.time);
+                let transmissionModel = "";
+                if (item.transmission_model == 1) {
+                    transmissionModel = "NB-IOT"
+                } else if (item.transmission_model == 2) {
+                    transmissionModel = "Lora-IOT"
+                } else {
+                    transmissionModel = "2G/4G/5G"
+                }
+                newData.push({ xh: item.xh, type_name: item.type_name, type_value: item.type_value, transmissionModel: transmissionModel, business: item.business, company_name: item.company_name, add_people: item.add_people, add_time: add_time })
+            });
+        }
+
+        let str = '<tr style="text-align:center"><th>序号</th><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">';
+            for (const key in newData[i]) {
+                // 增加\t为了不让表格显示科学计数法或者其他格式
+                str += `<td x:str>${ newData[i][key] + '\t'}</td>`;
+            }
+            str += '</tr>';
+        }
+        downExcel(str, '设备类型数据表')
+
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    })
+}
+// 导出  end

js/deviceCheck-channel.js

@@ -1,6 +1,9 @@
 var pageNo = 1;
 var totalPages = 0;
 
+var param1 = '';
+var param2 = '';
+
 //列表渲染
 getListDataAjax();
 
@@ -69,6 +72,9 @@ function getListDataAjax(queryParam = {}, pageNo = 1) {
 $('#buttonSearch').on('click', function() {
     pageNo = 1;
     getListDataAjax(getSearchParamObj());
+
+    param1 = $('#passageway_name').val()
+    param2 = $('#passageway_type_name').val()
 })
 
 //拼接搜索条件
@@ -90,6 +96,9 @@ function resetForm() {
     $("#passageway_name").val("");
     $("#passageway_type_name").val("");
     getListDataAjax(getSearchParamObj());
+
+    param1 = $('#passageway_name').val()
+    param2 = $('#passageway_type_name').val()
 }
 
 //分页操作
@@ -244,7 +253,7 @@ $('#addData').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
-
+        $('#addDataForm')[0].reset();
     }, function(errorMsg) {
         alert("异常错误!");
     })
@@ -298,4 +307,39 @@ function mingTest(dwTypeValue, elementId, passagewayTypeFirstIndex = 0) {
         $('#' + elementId + ' .passagewayTypeThird').show();
         $('#' + elementId + ' .passagewayTypeThird').eq(passagewayTypeFirstIndex - 1).prop("selected", true);
     }
-}
+}
+
+// 导出 start
+$('.export').click(function() {
+    getDataExport({ "passageway_name": param1, "passageway_type_name": param2 })
+})
+
+function getDataExport(queryParam = {}) {
+    ajaxRequest(DEVICE_CHECKCHANNEL_EXPORT, "POST", queryParam, function(result) {
+        console.log(result.RESULT)
+        let data = result.RESULT.pageList;
+        let newData = [];
+        if (data) {
+            data.forEach(function(item, index) {
+                var add_time = getFormatDate(item.add_time.time);
+                newData.push({ xh: item.xh, passageway_name: item.passageway_name, passageway_type_name: item.passageway_type_name, dwtype_name: item.dwtype_name, company_name: item.company_name, add_people: item.add_people, add_time: add_time })
+            });
+        }
+
+        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">';
+            for (const key in newData[i]) {
+                // 增加\t为了不让表格显示科学计数法或者其他格式
+                str += `<td x:str>${ newData[i][key] + '\t'}</td>`;
+            }
+            str += '</tr>';
+        }
+        downExcel(str, '设备监测对象通道数据表')
+
+    }, function(errorMsg) {
+        alert("请求数据失败!");
+    })
+}
+// 导出  end

js/event-manage.js

@@ -252,6 +252,8 @@ $('#addData').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
+        $('#addDataForm')[0].reset();
+
     }, function(errorMsg) {
         alert("异常错误!");
     })

js/flexible-inner.js

@@ -0,0 +1,43 @@
+(function flexible(window, document) {
+    var docEl = document.documentElement;
+    var dpr = window.devicePixelRatio || 1;
+
+    // adjust body font size
+    function setBodyFontSize() {
+        if (document.body) {
+            document.body.style.fontSize = 12 * dpr + "px";
+        } else {
+            document.addEventListener("DOMContentLoaded", setBodyFontSize);
+        }
+    }
+    setBodyFontSize();
+
+    // set 1rem = viewWidth / 10
+    function setRemUnit() {
+        var rem = docEl.clientWidth / 19;
+        docEl.style.fontSize = rem + "px";
+    }
+
+    setRemUnit();
+
+    // reset rem unit on page resize
+    window.addEventListener("resize", setRemUnit);
+    window.addEventListener("pageshow", function(e) {
+        if (e.persisted) {
+            setRemUnit();
+        }
+    });
+
+    // detect 0.5px supports
+    if (dpr >= 2) {
+        var fakeBody = document.createElement("body");
+        var testElement = document.createElement("div");
+        testElement.style.border = ".5px solid transparent";
+        fakeBody.appendChild(testElement);
+        docEl.appendChild(fakeBody);
+        if (testElement.offsetHeight === 1) {
+            docEl.classList.add("hairlines");
+        }
+        docEl.removeChild(fakeBody);
+    }
+})(window, document);

js/organization-department.js

@@ -112,10 +112,11 @@ $('#addDataDepart').click(function() {
     allParam.companyId = companyId;
 
     ajaxRequest(DEPARTMENT_ADD, "POST", allParam, function(result) {
-        let data = result.data;
         layer.close(layerCreateIndex2);
         layer.msg('添加成功!', { icon: 6 });
         getDepartmentDataAjax({ "companyId": companyId })
+        $('#addDepartmentForm')[0].reset();
+
     }, function(errorMsg) {
         alert("添加失败!");
 

js/organization.js

@@ -264,9 +264,9 @@ layui.use('layer', function() {
 
         //验证通过 请求ajax
         ajaxRequest(COMPANY_ADD, "POST", allParam, function(result) {
-            let data = result.data;
             layer.close(layerCreateIndex);
             layer.msg('添加成功!', { icon: 6 });
+            $('#addCompanyForm')[0].reset();
             getListDataAjax();
         }, function(errorMsg) {
             alert("添加失败!");

js/per-manage.js

@@ -39,11 +39,11 @@ $(".treeCompany").on('click', function() {
         //     return;
         // }
         //判断有没有样式
-        $('.treeCompany').removeClass('selected').find('.img').attr('src', 'images/login.png');
-        $('.treeDepartment').removeClass('selected').find('.img').attr('src', 'images/login.png');
+        $('.treeCompany').removeClass('selected').find('.img').attr('src', '../images/login.png');
+        $('.treeDepartment').removeClass('selected').find('.img').attr('src', '../images/login.png');
 
 
-        $(this).addClass('selected').find('.img').attr('src', 'images/loginSelected.png');
+        $(this).addClass('selected').find('.img').attr('src', '../images/loginSelected.png');
 
         companyId = $(this).data('id');
         depname = 0;
@@ -68,11 +68,11 @@ $(".treeDepartment").on('click', function() {
     //     return;
     // }
 
-    $('.treeDepartment').removeClass('selected').find('.img').attr('src', 'images/login.png')
-    $('.treeCompany').removeClass('selected').find('.img').attr('src', 'images/login.png')
+    $('.treeDepartment').removeClass('selected').find('.img').attr('src', '../images/login.png')
+    $('.treeCompany').removeClass('selected').find('.img').attr('src', '../images/login.png')
 
-    $(this).addClass('selected').parent().parent().siblings().addClass('selected').find('.img').attr('src', 'images/loginSelected.png');
-    $(this).find('.img').attr('src', 'images/loginSelected.png');
+    $(this).addClass('selected').parent().parent().siblings().addClass('selected').find('.img').attr('src', '../images/loginSelected.png');
+    $(this).find('.img').attr('src', '../images/loginSelected.png');
 
     companyId = 0;
     depname = $(this).data('id');
@@ -182,12 +182,12 @@ function getCompanyTree() {
         let companyDepartmentItems = '<option value="">请选择</option>';
 
         data.forEach(function(item, key) {
-            items += `<li  data-id=${item.ownerId} ><span data-id=${item.ownerId}  class="treeCompany"><img  class="img" src="images/login.png" alt=""> ${item.ownerName}  (${item.userNumber})</span>`;
+            items += `<li  data-id=${item.ownerId} ><span data-id=${item.ownerId}  class="treeCompany"><img  class="img" src="../images/login.png" alt=""> ${item.ownerName}  (${item.userNumber})</span>`;
             if (item.child) {
                 let data = item.child;
                 items += `<ul class="child-three">`;
                 data.forEach(function(item, key) {
-                    items += `<li   data-id=${item.departmentId} ><span  data-id=${item.departmentId}  class="treeDepartment"><img class="img" src="images/login.png" alt="">${item.departmentName}</span></li>`
+                    items += `<li   data-id=${item.departmentId} ><span  data-id=${item.departmentId}  class="treeDepartment"><img class="img" src="../images/login.png" alt="">${item.departmentName}</span></li>`
                 });
                 items += ` </ul>`;
             }
@@ -466,13 +466,14 @@ $('#addUser').click(function() {
     }
 
     //验证通过 请求ajax
-
     ajaxRequest(USER_ADD, "POST", userAddParam, function(result) {
         if (result.flag) {
-            let data = result.data;
             layer.close(layerCreateIndex);
             layer.msg(result.msg, { icon: 6 });
             getListDataAjax();
+
+            $('#addUserForm')[0].reset();
+
         } else {
             //服务端返回报错
             alert(result.msg);

js/property.js

@@ -403,6 +403,7 @@ $('#addData').click(function() {
             layer.close(layerCreateIndex);
             layer.msg('添加成功!', { icon: 6 });
             getListDataAjax();
+            $('#addDataForm')[0].reset();
         } else {
             alert(result.msg)
         }

js/system-inform.js

@@ -261,12 +261,10 @@ $('#addSystem').click(function() {
             allParam['systemLogo'] = data.data;
 
             ajaxRequest(SYSTEM_ADD, "POST", allParam, function(result) {
-
-                let data = result.data;
                 layer.close(layer.index);
                 layer.msg('添加成功!', { icon: 6 });
                 getSystemListDataAjax();
-
+                $('#addSystemFormBox')[0].reset();
             }, function(errorMsg) {
                 alert("系统信息添加失败!");
             })
@@ -279,8 +277,7 @@ $('#addSystem').click(function() {
         }
     });
 
-    // document.getElementById("addSystemFormBox").reset();
-    $('#addSystemFormBox')[0].reset();
+
 })
 
 /* 修改发送请求 */

js/userAccount.js

@@ -367,6 +367,7 @@ $('#addUser').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
+        $('#addUserForm')[0].reset();
     }, function(errorMsg) {
         alert("用户添加失败!");
     })

js/util.js

@@ -73,4 +73,32 @@ document.addEventListener('input', function(e) {
 
 
 //限制输入框字符长度
-$("input").attr("maxLength", 100);
+$("input").attr("maxLength", 100);
+
+// 导出封装 
+function downExcel(str, titleName) {
+    // 输出base64编码
+    const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
+
+    // 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 = titleName + ".xls";
+    link.click();
+
+}

js/work-manage.js

@@ -255,6 +255,7 @@ $('#addData').click(function() {
         layer.close(layerCreateIndex);
         layer.msg('添加成功!', { icon: 6 });
         getListDataAjax();
+        $('#addDataForm')[0].reset();
     }, function(errorMsg) {
         alert("异常错误!");
     })
@@ -276,6 +277,7 @@ $('#handleUpdate').click(function() {
         layer.close(layerUpdateIndex);
         layer.msg('处置成功!', { icon: 6 });
         getListDataAjax();
+
     }, function(errorMsg) {
         alert("数据修改失败!");
     })
@@ -289,9 +291,6 @@ $('.export').click(function() {
 })
 
 function getDataExport(queryParam = {}) {
-    // 输出base64编码
-    const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
-
     ajaxRequest(WORK_MANAGE_EXPORT, "POST", queryParam, function(result) {
         console.log(result.RESULT)
         let data = result.RESULT.pageList;
@@ -315,26 +314,7 @@ function getDataExport(queryParam = {}) {
             }
             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();
+        downExcel(str, '工单管理数据表')
 
     }, function(errorMsg) {
         alert("请求数据失败!");

organization.html

@@ -480,6 +480,7 @@
             //开始日期
             var insStart = laydate.render({
                 elem: '#startTime',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新结束日期的最小日期
                     insEnd.config.min = lay.extend({}, date, {
@@ -493,6 +494,7 @@
             //结束日期
             var insEnd = laydate.render({
                 elem: '#endTime',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新开始日期的最大日期
                     insStart.config.max = lay.extend({}, date, {

per-manage.html

@@ -33,7 +33,6 @@
                     <li><a href="organization.html">组织/机构</a></li>
                     <li><a href="security.html">安全机制</a></li>
                     <li><a href="system-inform.html">系统信息</a></li>
-                    <!-- <li> <a class="dropdown-item" onclick="keep_menu()" href="building_management/index3.jsp?theme=" target="mainframe">建筑物管理</a></li> -->
 
                 </ul>
             </div>

system-manage.html

@@ -0,0 +1,240 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>系统管理</title>
+    <script src="js/flexible.js"></script>
+    <link rel="stylesheet" href="layui/css/layui.css" />
+    <link rel="stylesheet" href="css/common.css" />
+    <link rel="stylesheet" href="css/per-manage.css" />
+</head>
+
+<body style="background-image:url(images/big-bg.png)">
+    <section class="mainbox ">
+        <div class="tit-box flex">
+            <h2 class="title flex2">系统管理
+
+            </h2>
+            <h2 class="title flex10">详细列表</h2>
+        </div>
+
+        <div class="content-box flex">
+            <div class="column column1 flex2">
+                <ul>
+                    <li class="selected"><a href="system-manage/per-manage.html" target="iframe">人员管理</a></li>
+                    <li><a href="system-manage/auth-manage.html" target="iframe">权限管理</a></li>
+                    <li><a href="system-manage/organization.html" target="iframe">组织/机构</a></li>
+                    <li><a href="system-manage/security.html" target="iframe">安全机制</a></li>
+                    <li><a href="system-manage/system-info.html" target="iframe">系统信息</a></li>
+                </ul>
+            </div>
+            <div class="column3 flex10">
+                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="system-manage/per-manage.html"></iframe>
+
+            </div>
+        </div>
+
+    </section>
+
+    <!-- 新增人员 -->
+    <div class="xcConfirm addUserOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addUserForm">
+                <div class="txtBox">
+
+                    <div>
+                        <span>姓名：<i class="necessary">*</i> </span>
+                        <input name="username" type="text">
+                    </div>
+                    <div>
+                        <span>密码：<i class="necessary">*</i></span>
+                        <input name="password" type="password">
+                    </div>
+                    <!-- <div>
+                        <span>重复密码：</span>
+                        <input type="password">
+                    </div> -->
+                    <div>
+                        <span>年龄：<i class="necessary">*</i></span>
+                        <input name="age" type="text">
+                    </div>
+                    <div>
+                        <span>性别：<i class="necessary">*</i></span>
+                        <select name="sex" id="sex2">
+                            <option value="男">男</option>
+                            <option value="女">女</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>分机号：</span>
+                        <input name="extension" type="text">
+                    </div>
+
+                    <div>
+                        <span>真实姓名：<i class="necessary">*</i></span>
+                        <input name="truename" type="text">
+                    </div>
+                    <div>
+                        <span>座机号：</span>
+                        <input name="tel" type="text">
+                    </div>
+                    <div>
+                        <span>手机号：<i class="necessary">*</i></span>
+                        <input name="phone" type="text">
+                    </div>
+                    <div>
+                        <span>角色：<i class="necessary">*</i></span>
+                        <select name="posname" id="roleId2">
+                           
+                        </select>
+                    </div>
+                    <div>
+                        <span>单位名称：<i class="necessary">*</i></span>
+                        <select name="bian" id="companyId" class="companyList">
+                            <option value="">单位1</option>
+                            <option value="">单位2</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>部门名称：</span>
+                        <select name="depname" id="departmentId">
+                            <option value="">请选择部门</option>
+                            <!-- <option value="">单位2</option> -->
+                        </select>
+                    </div>
+
+
+
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a id="addUser" class="sgBtn ok"><img src="images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+
+
+    <!-- 修改人员信息 -->
+    <div class="xcConfirm editUserOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">修改</span>
+            </div>
+            <form id="editUserForm">
+                <div class="txtBox">
+
+                    <div>
+                        <span>真实姓名：<i class="necessary">*</i></span>
+                        <input name="truename" type="text">
+                    </div>
+
+                    <div>
+                        <span>性别：<i class="necessary">*</i></span>
+                        <select name="sex" id="sec">
+                            <option value="男">男</option>
+                            <option value="女">女</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>角色：<i class="necessary">*</i></span>
+                        <select name="posname" id="roleId3">
+                            <option value="1">角色1</option>
+                            <option value="2">角色2</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>手机号：<i class="necessary">*</i></span>
+                        <input name="phone" type="text">
+                    </div>
+                    <div>
+                        <span>删除状态：</span>
+                        <select name="status">
+                            <option value="0">删除</option>
+                            <option value="1">未删除</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>锁定状态：<i class="necessary">*</i></span>
+                        <select name="locked">
+                            <option value="0">锁定</option>
+                            <option value="1">未锁定</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>登录错误次数：<i class="necessary">*</i></span>
+                        <input name="wrongtimes" type="text">
+                    </div>
+
+                    <div>
+                        <span>单位名称：<i class="necessary">*</i></span>
+                        <select name="bian" id="companyId2" class="companyList">
+                            <option value="">单位1</option>
+                            <option value="">单位2</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>部门名称：</span>
+                        <select name="depname" id="departmentIdUpdate">
+                            <option value="">请选择部门</option>
+                            <!-- <option value="">单位2</option> -->
+                        </select>
+                    </div>
+
+                    <div style="opacity:0">
+                        <span>用户登录名：<i class="necessary">*</i></span>
+                        <input name="username" type="text">
+                    </div>
+
+
+                </div>
+
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a id="editUser" class="sgBtn ok"><img src="images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+    <!-- loading -->
+
+
+    <script src="js/jquery.js"></script>
+    <!-- <script src="https://cdn.bootcss.com/blueimp-md5/2.10.0/js/md5.js"></script> -->
+    <script src="js/md5.js"></script>
+    <script src="js/util.js"></script>
+    <script src="api/request.js"></script>
+    <script src="layui/layui.js"></script>
+    <script src="js/valid.js"></script>
+    <script src="js/per-manage.js"></script>
+
+    <script src="js/main.js"></script>
+    <script>
+        $(function() {
+            $('ul li').click(function() {
+                $(this).siblings().each(function() {
+                        $(this).removeClass('selected');
+                    })
+                    //当前选中
+                $(this).addClass('selected')
+            })
+        })
+    </script>
+</body>
+
+</html>

system-manage/auth-manage.html

@@ -0,0 +1,361 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>权限管理</title>
+    <link rel="shortcut icon" href="../favicon.ico">
+    <link rel="stylesheet" href="../layui/css/layui.css" />
+    <link rel="stylesheet" href="../css/common.css" />
+    <link rel="stylesheet" href="../css/per-manage.css" />
+    <script src="../js/flexible-inner.js"></script>
+</head>
+
+<body style="background:rgba(0,0,0,0)">
+
+
+
+    <div class="content-box flex">
+
+
+        <div class="column column2 flex2">
+
+            <div class="departlist-box">
+                <div class="departtit">角色列表</div>
+                <!-- <ul class="depart-opera">
+                        <li><a class="button add">新增</a></li>
+                        <li><a class="button" >编辑</a></li>
+                        <li><a class="button">删除</a></li>
+                    </ul> -->
+                <div class="tree well">
+                    <ul id="roleTree">
+                        <li>
+                            <span class="maintree">
+                                    <img src="../images/login.png" alt="">
+                                    超级管理员
+                                </span>
+                        </li>
+                        <li>
+                            <span class="maintree">
+                                    <img src="images/login.png" alt="">
+                                    普通用户
+                                </span>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+        <div class="column3 flex8">
+
+
+            <div class="memberbox">
+                <div class="membertit">权限设置</div>
+                <!-- <div class="member-choose">
+
+                        <span>菜单级别</span>
+                        <select name="" id="">
+                            <option value="">所有</option>
+                            <option value="">级别1</option>
+                            <option value="">级别2</option>
+                            <option value="">级别3</option>
+                        </select>
+                        <a class="button" href="">确定</a>
+                        <a class="button reset" href="">重置</a>
+                    </div>
+                    <div class="operatebox"></div> -->
+                <ul class="member-operate">
+                    <a class="button updateAuth" style="display:none">+ 新增权限</a>
+
+                    <a class="button edit">修改</a>
+                    <a class="button add">+ 新增</a>
+                </ul>
+
+
+                <table class="pure-table" cellspacing="0px">
+                    <thead>
+                        <tr>
+                            <th>
+                                <!-- <span class="checkall status"></span> -->
+                            </th>
+                            <th>菜单名称</th>
+                            <!-- <th>菜单URL</th> -->
+                            <th>菜单类型</th>
+                            <th>菜单排序</th>
+                            <th>是否为父节点</th>
+                        </tr>
+                    </thead>
+
+                    <tbody id="menuList">
+                        <!-- <tr>
+                                <td class="status"></td>
+                                <td>系统管理</td>
+                                <td>菜单URL</td>
+                                <td>菜单</td>
+                                <td>1</td>
+                                <td>是</td>
+                            </tr>
+
+                            <tr>
+                                <td class="status"></td>
+                                <td>用户管理</td>
+                                <td>菜单URL</td>
+                                <td>菜单</td>
+                                <td>2</td>
+                                <td>是</td>
+                            </tr>
+
+                            <tr>
+                                <td class="status"></td>
+                                <td>设备管理</td>
+                                <td>菜单URL</td>
+                                <td>菜单</td>
+                                <td>3</td>
+                                <td>是</td>
+                            </tr>
+                            <tr>
+                                <td class="status"></td>
+                                <td>事件管理</td>
+                                <td>菜单URL</td>
+                                <td>菜单</td>
+                                <td>4</td>
+                                <td>是</td>
+                            </tr>
+
+                            <tr>
+                                <td class="status"></td>
+                                <td>工单管理</td>
+                                <td>菜单URL</td>
+                                <td>菜单</td>
+                                <td>5</td>
+                                <td>是</td>
+                            </tr>
+
+                            <tr>
+                                <td class="status"></td>
+                                <td>消防物联网</td>
+                                <td>菜单URL</td>
+                                <td>菜单</td>
+                                <td>6</td>
+                                <td>是</td>
+                            </tr>
+
+                            <tr>
+                                <td class="status"></td>
+                                <td>运维管理</td>
+                                <td>菜单URL</td>
+                                <td>菜单</td>
+                                <td>7</td>
+                                <td>是</td>
+                            </tr> -->
+
+                    </tbody>
+                </table>
+
+                <!-- <div class="save-box" style="margin: 0.625rem 0;text-align:center;cursor: pointer;">
+                        <a class="button">保存</a>
+                    </div> -->
+
+            </div>
+        </div>
+    </div>
+
+
+    <!-- 新增菜单 -->
+    <div class="xcConfirm addMenuOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addMenuForm">
+                <div class="txtBox">
+
+                    <div>
+                        <span>是否为父节点：</span>
+                        <select name="parented" id="parented">
+                            <option value="0">否</option>
+
+                            <option value="1">是</option>
+                        </select>
+                    </div>
+
+                    <div id="parentIdDiv">
+                        <span>父级菜单：<i class="necessary">*</i></span>
+                        <select name="parentId" id="parentId">
+   
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>菜单名称：<i class="necessary">*</i></span>
+                        <input name="name" type="text">
+                    </div>
+
+                    <div>
+                        <span>菜单URL：</span>
+                        <input name="url" type="text">
+                    </div>
+                    <div>
+                        <span>菜单配置：<i class="necessary">*</i></span>
+                        <textarea name="perms" id="" cols="15" rows="10"></textarea>
+                    </div>
+                    <div>
+                        <span>菜单类型：<i class="necessary">*</i></span>
+                        <select name="type" id="menuType">
+                            <option value="0">目录</option>
+                            <option value="1">菜单</option>
+                            <option value="2">按钮</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>菜单排序：</span>
+                        <input type="text" name="orderNum">
+                    </div>
+
+
+
+                </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>
+                </div>
+            </form>
+        </div>
+    </div>
+
+
+    <!-- 修改菜单 -->
+    <div class="xcConfirm editMenuOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">修改</span>
+            </div>
+            <form id="editMenuForm">
+                <div class="txtBox">
+
+                    <div>
+                        <span>是否为父节点：</span>
+                        <select name="parented" id="parented2" disabled="disabled">
+                            <option value="0">否</option>
+                            <option value="1">是</option>
+                        </select>
+                    </div>
+
+                    <div id="parentIdDiv2">
+                        <span>父级菜单id：<i class="necessary">*</i></span>
+                        <select name="parentId" id="parentId2">
+   
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>菜单名称：<i class="necessary">*</i></span>
+                        <input name="name" type="text">
+                    </div>
+
+                    <div>
+                        <span>菜单URL：</span>
+                        <input name="url" type="text">
+                    </div>
+                    <div>
+                        <span>菜单配置：<i class="necessary">*</i></span>
+                        <textarea name="perms" id="" cols="20" rows="10"></textarea>
+                    </div>
+                    <div>
+                        <span>菜单类型：<i class="necessary">*</i></span>
+                        <select name="type" id="menuType2">
+                            <option value="0">目录</option>
+                            <option value="1">菜单</option>
+                            <option value="2">按钮</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>菜单排序：</span>
+                        <input type="text" name="orderNum">
+                    </div>
+
+                    <div style="opacity:0">
+                        <span>menuId：</span>
+                        <input type="text" name="menuId">
+                    </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>
+
+
+    <!-- 新增权限 -->
+    <div class="xcConfirm addAuthOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addAuthForm">
+                <div class="txtBox">
+
+                    <!-- <div>
+                        <span>是否为父节点：</span>
+                        <select name="parented" id="parented">
+                            <option value="0">否</option>
+
+                            <option value="1">是</option>
+                        </select>
+                    </div> -->
+
+                    <div id="parentIdDiv">
+                        <span>父级菜单：<i class="necessary">*</i></span>
+                        <select name="menuIdList" id="menuIdList">
+   
+                        </select>
+                    </div>
+
+
+
+
+
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a class="sgBtn ok" id="addAuth"><img src="images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+
+
+
+    <script src="../js/jquery.js"></script>
+
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+
+    <script src="../api/request.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../js/auth-manage.js"></script>
+    <script>
+    </script>
+
+
+</body>
+
+</html>

system-manage/organization.html

@@ -0,0 +1,431 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>组织机构</title>
+    <link rel="shortcut icon" href="../favicon.ico">
+
+
+    <link rel="stylesheet" href="../layui/css/layui.css" />
+    <link rel="stylesheet" href="../css/common.css" />
+    <link rel="stylesheet" href="../css/per-manage.css" />
+    <script src="../js/flexible-inner.js"></script>
+</head>
+
+<body style="background:rgba(0,0,0,0)">
+
+    <div class="memberbox">
+        <div class="membertit">组织/机构列表</div>
+        <div class="member-choose">
+            <span>单位名称</span>
+            <input type="text" id="companyName">
+            <span>创建时间</span>
+            <div class="layui-inline">
+                <input type="text" id="startTime" class="layui-input test-item" placeholder="所有">
+            </div>
+
+            <span>~</span>
+
+            <div class="layui-inline">
+                <input type="text" id="endTime" class="layui-input test-item" placeholder="所有">
+            </div>
+
+
+            <a class="button" id="buttonClick">确定</a>
+            <a class="button reset">重置</a>
+        </div>
+        <div class="operatebox"></div>
+        <ul class="member-operate">
+            <a class="button edit">修改</a>
+            <a class="button add">+ 新增</a>
+            <a class="button delete">- 删除</a>
+            <a class="button delete unshow">导出</a>
+
+        </ul>
+
+
+        <table class="pure-table companylist" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th style="width:24px">
+                        <!-- <span class="checkall status"></span> -->
+                    </th>
+                    <th>单位编号</th>
+                    <th>单位名称</th>
+                    <th>所属建筑id</th>
+                    <th>单位地址</th>
+                    <th>单位负责人</th>
+                    <th>联系人</th>
+                    <th>创建人</th>
+                    <th>创建时间</th>
+                    <th>详情</th>
+                </tr>
+            </thead>
+
+            <tbody id="dataList">
+                <tr>
+                    <td class="status"></td>
+                    <td>123456</td>
+                    <td>永天集团</td>
+                    <td>123</td>
+                    <td>办公</td>
+                    <td>张三</td>
+                    <td>13652525252</td>
+                    <td>李四</td>
+                    <td><a class="view-detail ">详情</a></td>
+                </tr>
+
+
+            </tbody>
+        </table>
+    </div>
+
+    <div class="pager has-data flex">
+        <div class="pager-left flex1 align-left">
+            <ul>
+                <li id="firstPageButton" class="pg-first disabled"></li>
+                <li id="prevPageButton" class="pg-prev disabled"></li>
+                <li class="pg-des">
+                    第 <input id="currentPage" type="text" size="1" value="1"> 页，共 <span id="totalPage">100</span> 页
+                </li>
+                <li id="nextPageButton" class="pg-next"></li>
+                <li id="lastPageButton" class="pg-last"></li>
+                <li class="pg-refresh">
+                    <a href="javascript:location.reload();"></a>
+                </li>
+            </ul>
+        </div>
+        <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
+                            15 </span>条记录，总共 <span id="dataTotal">
+                            46 </span>条
+        </div>
+
+
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+
+
+    </div>
+
+
+
+
+    <!-- 单位新增 -->
+    <div class="xcConfirm addCompanyDataOut" 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="addCompanyForm">
+                <div class="txtBox">
+                    <div>
+                        <span>单位负责人：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerMan">
+                    </div>
+                    <div>
+                        <span>单位名称：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerName">
+                    </div>
+                    <div>
+                        <span>单位地址：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerAddress">
+
+                    </div>
+                    <div>
+                        <span>办公地址 ：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerOffice">
+                    </div>
+                    <div>
+                        <span>所属建筑：<i class="necessary">*</i></span>
+                        <select name="buildingId" id="getBuildingId">
+                            <option value="">请选择</option>
+                        </select>
+
+                    </div>
+                    <div>
+                        <span>类型：<i class="necessary">*</i></span>
+                        <input type="text" name="xmlx">
+                    </div>
+                    <div>
+                        <span>联系人：<i class="necessary">*</i></span>
+                        <input type="text" name="contacts">
+                    </div>
+                    <div>
+                        <span>联系电话：<i class="necessary">*</i></span>
+                        <input type="text" name="contactsPhone">
+                    </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>
+            </form>
+
+        </div>
+    </div>
+
+    <!-- 单位修改 -->
+    <div class="xcConfirm editCompanyDataOut" 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="editCompanyForm">
+                <div class="txtBox">
+                    <div>
+                        <span>单位负责人：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerMan">
+                    </div>
+                    <div>
+                        <span>单位名称：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerName">
+                    </div>
+                    <div>
+                        <span>单位地址：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerAddress">
+
+                    </div>
+                    <div>
+                        <span>办公地址 ：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerOffice">
+                    </div>
+                    <div>
+                        <span>所属建筑：<i class="necessary">*</i></span>
+                        <select name="buildingId" id="getBuildingId2">
+                            <option value="">请选择</option>
+                        </select>
+
+                    </div>
+                    <div>
+                        <span>类型：<i class="necessary">*</i></span>
+                        <input type="text" name="xmlx">
+                    </div>
+                    <div>
+                        <span>联系人：<i class="necessary">*</i></span>
+                        <input type="text" name="contacts">
+                    </div>
+                    <div>
+                        <span>联系电话：<i class="necessary">*</i></span>
+                        <input type="text" name="contactsPhone">
+                    </div>
+                    <div style="opacity:0">
+                        <span>单位id：<i class="necessary">*</i></span>
+                        <input type="text" name="ownerId">
+                    </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>
+
+    <!-- 部门详情 -->
+    <div class="xcConfirm queryCompanyList" 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="">
+                <ul class="member-operate">
+                    <a class="button edit2">修改</a>
+                    <a class="button add2">+ 新增</a>
+                    <a class="button delete2">- 删除</a>
+                </ul>
+                <table class="pure-table pure-table-inner" cellspacing="0px" style="width: 96%;margin-left: 2%;">
+                    <thead>
+                        <tr>
+                            <th style="width:24px">
+                                <!-- <span class="checkall status"></span> -->
+                            </th>
+                            <th>部门名称</th>
+                            <th>部门负责人</th>
+                            <th>联系电话</th>
+                            <th>创建人</th>
+                            <th>创建时间</th>
+                        </tr>
+                    </thead>
+                </table>
+                <div class="scroll" style="height:270px;overflow-y:auto;width:98%">
+                    <table class="pure-table pure-table-inner result" cellspacing="0px" style="width: 98%;margin-left: 2%;">
+
+                        <tbody id="dataList2">
+                        </tbody>
+                    </table>
+                </div>
+
+            </div>
+
+
+        </div>
+    </div>
+
+    <!-- 部门新增 -->
+    <div class="xcConfirm addDepartmentDataOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn2"></a>
+                <span class="tt">部门新增</span>
+            </div>
+            <form id="addDepartmentForm">
+                <div class="txtBox">
+                    <div>
+                        <span>部门名称：<i class="necessary">*</i></span>
+                        <input type="text" name="departmentName">
+                    </div>
+                    <div>
+                        <span>部门负责人：<i class="necessary">*</i></span>
+                        <input type="text" name="departmentMan">
+                    </div>
+                    <div>
+                        <span>负责人电话：<i class="necessary">*</i></span>
+                        <input type="text" name="departmentPhone">
+
+                    </div>
+                    <!-- <div>
+                        <span>所属单位：<i class="necessary">*</i></span>
+                        <select name="companyId" id="getCompanyName" >
+                            <option value="">请选择</option>
+                        </select>
+                    </div> -->
+
+
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a class="sgBtn ok" id="addDataDepart"><img src="images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel2"><img src="images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+    </div>
+
+    <!-- 部门修改 -->
+    <div class="xcConfirm editDepartmentDataOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn2"></a>
+                <span class="tt">修改</span>
+            </div>
+            <form id="editDepartmentForm">
+                <div class="txtBox">
+                    <div>
+                        <span>部门名称：<i class="necessary">*</i></span>
+                        <input type="text" name="departmentName">
+                    </div>
+                    <div>
+                        <span>部门负责人：<i class="necessary">*</i></span>
+                        <input type="text" name="departmentMan">
+                    </div>
+                    <div>
+                        <span>负责人电话：<i class="necessary">*</i></span>
+                        <input type="text" name="departmentPhone">
+
+                    </div>
+                    <div style="opacity:0">
+                        <span>所属单位：<i class="necessary">*</i></span>
+                        <input type="text" name="companyId" readonly>
+
+                    </div>
+                    <div style="opacity:0">
+                        <span>所属部门：<i class="necessary">*</i></span>
+                        <input type="text" name="departmentId" readonly>
+
+                    </div>
+                    <!-- <div>
+                        <span>所属部门：<i class="necessary">*</i></span>
+                        <select name="departmentId" id="getCompanyName2">
+                            <option value="">请选择</option>
+                        </select>
+                    </div> -->
+
+
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a class="sgBtn ok" id="editDataDepart"><img src="images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel2"><img src="images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+    </div>
+
+
+
+    <script src="../js/jquery.js"></script>
+    <!-- <script src="https://cdn.bootcss.com/blueimp-md5/2.10.0/js/md5.js"></script> -->
+    <script src="../js/md5.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/organization.js"></script>
+    <script src="../js/organization-department.js"></script>
+    <script src="../js/main.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
+                    });
+                }
+            });
+
+
+
+
+        });
+    </script>
+</body>
+
+</html>

system-manage/per-manage.html

@@ -0,0 +1,317 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>人员管理</title>
+    <!--    <link rel="shortcut icon" href="favicon.ico">-->
+    <script src="../js/flexible-inner.js"></script>
+    <link rel="stylesheet" href="../layui/css/layui.css" />
+    <link rel="stylesheet" href="../css/common.css" />
+    <link rel="stylesheet" href="../css/per-manage.css" />
+
+    <style>
+
+    </style>
+</head>
+
+<body style="background:rgba(0,0,0,0)">
+
+
+    <div class="content-box flex">
+
+        <div class="column column2 flex2">
+
+            <div class="departlist-box">
+                <div class="departtit">部门列表</div>
+                <div class="treebox">
+                    <div class="tree  well">
+                        <!-- <div class="loadingdata"></div> -->
+                        <div id="loading"></div>
+                        <ul>
+                            <li>
+                                <span class="maintree">
+                                        <img src="../images/login.png" alt="">
+                                        超级管理员
+                                    </span>
+                                <ul class="child-two" id="child-two">
+                                </ul>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+        <div class="column3 flex8">
+
+            <div class="memberbox">
+                <div class="membertit">成员列表</div>
+                <div class="member-choose">
+                    <span>姓名</span>
+                    <input id="userName" type="text">
+                    <span>用户身份</span>
+                    <select name="" id="roleId">
+                            <option value="">所有</option>
+                        </select>
+                    <a class="button" id="buttonClick">确定</a>
+                    <a class="button reset">重置</a>
+                </div>
+                <div class="operatebox"></div>
+                <ul class="member-operate">
+                    <a class="button edit">修改</a>
+                    <a class="button add">+ 新增</a>
+                    <a class="button delete">- 删除</a>
+                    <a class="button export">导出</a>
+
+                </ul>
+
+
+                <table class="pure-table" cellspacing="0px">
+                    <thead>
+                        <tr>
+                            <th style="width: 24px ">
+                                <!-- <span class="checkall status"></span> -->
+                            </th>
+                            <th>姓名</th>
+                            <th>性别</th>
+                            <!-- <th>部门名称</th> -->
+                            <th>用户身份</th>
+                            <th>创建时间</th>
+                            <th>创建人</th>
+                            <th>锁定状态</th>
+                            <th>错误次数</th>
+                        </tr>
+                    </thead>
+
+                    <tbody id="dataList">
+
+                    </tbody>
+                </table>
+            </div>
+
+
+
+        </div>
+        <div class="pager has-data flex">
+            <div class="pager-left flex1 align-left">
+                <ul>
+                    <li id="firstPageButton" class="pg-first disabled"></li>
+                    <li id="prevPageButton" class="pg-prev disabled"></li>
+                    <li class="pg-des">
+                        第 <input id="currentPage" type="text" size="1" value="1"> 页，共 <span id="totalPage">100</span> 页
+                    </li>
+                    <li id="nextPageButton" class="pg-next"></li>
+                    <li id="lastPageButton" class="pg-last"></li>
+                    <li class="pg-refresh">
+                        <a href="javascript:location.reload();"></a>
+                    </li>
+                </ul>
+            </div>
+            <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
+                        15 </span>条记录，总共 <span id="dataTotal">
+                        46 </span>条
+            </div>
+
+
+        </div>
+        <div class="pager no-data" style="display:none;text-align:right">
+            暂无数据
+
+
+        </div>
+    </div>
+
+
+    <!-- 新增人员 -->
+    <div class="xcConfirm addUserOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addUserForm">
+                <div class="txtBox">
+
+                    <div>
+                        <span>姓名：<i class="necessary">*</i> </span>
+                        <input name="username" type="text">
+                    </div>
+                    <div>
+                        <span>密码：<i class="necessary">*</i></span>
+                        <input name="password" type="password">
+                    </div>
+                    <!-- <div>
+                        <span>重复密码：</span>
+                        <input type="password">
+                    </div> -->
+                    <div>
+                        <span>年龄：<i class="necessary">*</i></span>
+                        <input name="age" type="text">
+                    </div>
+                    <div>
+                        <span>性别：<i class="necessary">*</i></span>
+                        <select name="sex" id="sex2">
+                            <option value="男">男</option>
+                            <option value="女">女</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>分机号：</span>
+                        <input name="extension" type="text">
+                    </div>
+
+                    <div>
+                        <span>真实姓名：<i class="necessary">*</i></span>
+                        <input name="truename" type="text">
+                    </div>
+                    <div>
+                        <span>座机号：</span>
+                        <input name="tel" type="text">
+                    </div>
+                    <div>
+                        <span>手机号：<i class="necessary">*</i></span>
+                        <input name="phone" type="text">
+                    </div>
+                    <div>
+                        <span>角色：<i class="necessary">*</i></span>
+                        <select name="posname" id="roleId2">
+                           
+                        </select>
+                    </div>
+                    <div>
+                        <span>单位名称：<i class="necessary">*</i></span>
+                        <select name="bian" id="companyId" class="companyList">
+                            <option value="">单位1</option>
+                            <option value="">单位2</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>部门名称：</span>
+                        <select name="depname" id="departmentId">
+                            <option value="">请选择部门</option>
+                            <!-- <option value="">单位2</option> -->
+                        </select>
+                    </div>
+
+
+
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a id="addUser" class="sgBtn ok"><img src="../images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+
+
+    <!-- 修改人员信息 -->
+    <div class="xcConfirm editUserOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">修改</span>
+            </div>
+            <form id="editUserForm">
+                <div class="txtBox">
+
+                    <div>
+                        <span>真实姓名：<i class="necessary">*</i></span>
+                        <input name="truename" type="text">
+                    </div>
+
+                    <div>
+                        <span>性别：<i class="necessary">*</i></span>
+                        <select name="sex" id="sec">
+                            <option value="男">男</option>
+                            <option value="女">女</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>角色：<i class="necessary">*</i></span>
+                        <select name="posname" id="roleId3">
+                            <option value="1">角色1</option>
+                            <option value="2">角色2</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>手机号：<i class="necessary">*</i></span>
+                        <input name="phone" type="text">
+                    </div>
+                    <div>
+                        <span>删除状态：</span>
+                        <select name="status">
+                            <option value="0">删除</option>
+                            <option value="1">未删除</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <span>锁定状态：<i class="necessary">*</i></span>
+                        <select name="locked">
+                            <option value="0">锁定</option>
+                            <option value="1">未锁定</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>登录错误次数：<i class="necessary">*</i></span>
+                        <input name="wrongtimes" type="text">
+                    </div>
+
+                    <div>
+                        <span>单位名称：<i class="necessary">*</i></span>
+                        <select name="bian" id="companyId2" class="companyList">
+                            <option value="">单位1</option>
+                            <option value="">单位2</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>部门名称：</span>
+                        <select name="depname" id="departmentIdUpdate">
+                            <option value="">请选择部门</option>
+                            <!-- <option value="">单位2</option> -->
+                        </select>
+                    </div>
+
+                    <div style="opacity:0">
+                        <span>用户登录名：<i class="necessary">*</i></span>
+                        <input name="username" type="text">
+                    </div>
+
+
+                </div>
+
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a id="editUser" class="sgBtn ok"><img src="../images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+    <!-- loading -->
+
+
+    <script src="../js/jquery.js"></script>
+    <!-- <script src="https://cdn.bootcss.com/blueimp-md5/2.10.0/js/md5.js"></script> -->
+    <script src="../js/md5.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/per-manage.js"></script>
+
+    <script src="../js/main.js"></script>
+    <script>
+    </script>
+</body>
+
+</html>

system-manage/security.html

@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>安全机制</title>
+    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="stylesheet" href="../layui/css/layui.css" />
+    <link rel="stylesheet" href="../css/common.css" />
+    <link rel="stylesheet" href="../css/per-manage.css" />
+    <script src="../js/flexible-inner.js"></script>
+</head>
+
+<body style="background:rgba(0,0,0,0)">
+
+
+
+
+    <div class="memberbox">
+        <div class="membertit">安全机制</div>
+
+        <div class="operatebox"></div>
+        <ul class="member-operate">
+            <a class="button edit">修改</a>
+            <!-- <a class="button add">+ 新增</a> -->
+            <!-- <a class="button delete ">- 删除</a>
+                        <a class="button">导出</a> -->
+
+        </ul>
+
+
+        <table class="pure-table" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th style="width:24px;">
+                        <!-- <span class="checkall status"></span> -->
+                    </th>
+                    <th>错误次数</th>
+                    <th>重置时间</th>
+                    <th>数据id</th>
+                    <th>重试间隔时间</th>
+                    <th>备注</th>
+                </tr>
+            </thead>
+
+            <tbody id="securityList">
+                <!-- <tr>
+                                <td class="status"></td>
+                                <td>1</td>
+                                <td>admin</td>
+                                <td>123456</td>
+                                <td>8-12个字符</td>
+                                <td>字母、数字组合</td>
+                                <td>5次错误锁定</td>
+                            </tr> -->
+
+
+
+            </tbody>
+        </table>
+    </div>
+
+    <div class="pager has-data flex">
+        <div class="pager-left flex1 align-left">
+            <ul>
+                <li id="firstPageButton" class="pg-first disabled"></li>
+                <li id="prevPageButton" class="pg-prev disabled"></li>
+                <li class="pg-des">
+                    第 <input id="currentPage" type="text" size="1" value="1"> 页，共 <span id="totalPage">100</span> 页
+                </li>
+                <li id="nextPageButton" class="pg-next"></li>
+                <li id="lastPageButton" class="pg-last"></li>
+                <li class="pg-refresh">
+                    <a href="javascript:location.reload();"></a>
+                </li>
+            </ul>
+        </div>
+        <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
+                            15 </span>条记录，总共 <span id="dataTotal">
+                            46 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+
+
+
+    <!-- 安全机制新增 -->
+    <!-- <div class="xcConfirm addSecurityOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addSecurityForm">
+                <div class="txtBox">
+                    <div>
+                        <span>错误次数：</span>
+                        <input type="text">
+                    </div>
+                    <div>
+                        <span>重置时间：</span>
+                        <input type="text">
+                    </div>
+                    <div>
+                        <span>重试间隔时间：</span>
+                        <input type="text">
+                    </div>
+                    <div>
+                        <span>状态：</span>
+                        <input type="text">
+                    </div>
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a class="sgBtn ok"><img src="images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+    </div> -->
+
+
+
+    <!-- 安全机制修改 -->
+    <div class="xcConfirm editSecurityOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">修改</span>
+            </div>
+            <form id="updateSecurityForm">
+                <div class="txtBox">
+                    <div>
+                        <span>数据id：<i class="necessary">*</i></span>
+                        <input name="id" type="text" readonly="readonly">
+                    </div>
+                    <div>
+                        <span>错误次数：<i class="necessary">*</i></span>
+                        <input name="times" type="text">
+                    </div>
+                    <div>
+                        <span>重置时间：<i class="necessary">*</i></span>
+                        <input name="restartTime" type="text">
+                    </div>
+                    <div>
+                        <span>重试间隔时间：<i class="necessary">*</i></span>
+                        <input name="intervalTime" type="text">
+                    </div>
+                    <div>
+                        <span>状态：<i class="necessary">*</i></span>
+                        <select name="status" id="">
+                            <option value="0">未启动</option>
+                            <option value="1">启动</option>
+                        </select>
+                        <!-- <input name="status" type="text"> -->
+                    </div>
+
+
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a id="dataUpdate" class="sgBtn ok"><img src="../images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+    </div>
+
+
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../js/security.js"></script>
+
+
+
+</body>
+
+</html>

system-manage/system-info.html

@@ -0,0 +1,245 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>系统信息</title>
+    <link rel="shortcut icon" href="../favicon.ico">
+    <link rel="stylesheet" href="../layui/css/layui.css" />
+    <link rel="stylesheet" href="../css/common.css" />
+    <link rel="stylesheet" href="../css/per-manage.css" />
+    <script src="../js/flexible-inner.js"></script>
+
+</head>
+
+<body style="background:rgba(0,0,0,0)">
+    <div class="memberbox">
+        <div class="membertit">系统信息</div>
+
+        <div class="operatebox"></div>
+        <ul class="member-operate">
+            <a class="button edit">修改</a>
+            <a class="button add">+ 新增</a>
+            <a class="button delete ">- 删除</a>
+
+        </ul>
+
+        <table class="pure-table" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th>
+                    </th>
+                    <th>系统名称</th>
+                    <th>logo</th>
+                    <th>全称</th>
+                    <th>简称</th>
+                    <th>官网链接</th>
+                    <th>启动状态</th>
+                    <th>创建人</th>
+                    <th>创建时间</th>
+                </tr>
+            </thead>
+
+            <tbody id="systemList">
+                <!-- <tr>
+                    <td class="status"></td>
+                    <td>1</td>
+                    <td>上海永天科技股份有限公司</td>
+                    <td><i class="logo-img"></i></td>
+                    <td>上海永天科技股份有限公司</td>
+                    <td>永天科技</td>
+                    <td>http://www.chainausky.com/</td>
+                </tr>
+
+                <tr>
+                    <td class="status"></td>
+                    <td>2</td>
+                    <td>上海永天科技股份有限公司</td>
+                    <td><i class="logo-img"></i></td>
+                    <td>上海永天科技股份有限公司</td>
+                    <td>永天科技</td>
+                    <td>http://www.chainausky.com/</td>
+                </tr>
+
+                <tr>
+                    <td class="status"></td>
+                    <td>3</td>
+                    <td>上海永天科技股份有限公司</td>
+                    <td><i class="logo-img"></i></td>
+                    <td>上海永天科技股份有限公司</td>
+                    <td>永天科技</td>
+                    <td>http://www.chainausky.com/</td>
+                </tr> -->
+
+            </tbody>
+        </table>
+    </div>
+
+    <div class="pager has-data flex">
+        <div class="pager-left flex1 align-left">
+            <ul>
+                <li id="firstPageButton" class="pg-first disabled"></li>
+                <li id="prevPageButton" class="pg-prev disabled"></li>
+                <li class="pg-des">
+                    第 <input id="currentPage" type="text" size="1" value="1"> 页，共 <span id="totalPage">100</span> 页
+                </li>
+                <li id="nextPageButton" class="pg-next"></li>
+                <li id="lastPageButton" class="pg-last"></li>
+                <li class="pg-refresh">
+                    <a href="javascript:location.reload();"></a>
+                </li>
+            </ul>
+        </div>
+        <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
+                15 </span>条记录，总共 <span id="dataTotal">
+                46 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <!-- 新增系统信息 -->
+    <div class="xcConfirm addUnitOut" 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="addSystemFormBox" action="">
+                <div class="txtBox">
+                    <div>
+                        <span>系统名称：<i class="necessary">*</i></span>
+                        <input name="systemName" type="text">
+                    </div>
+                    <div>
+                        <span>logo：<i class="necessary">*</i></span>
+                        <input id="systemLogoAdd" name="systemLogo" type="file">
+                        <!-- <input name="systemLogo" value="" type="hidden"> -->
+                    </div>
+                    <div>
+                        <span>系统全名：<i class="necessary">*</i></span>
+                        <input name="fullName" type="text">
+                    </div>
+                    <div>
+                        <span>系统简称：<i class="necessary">*</i></span>
+                        <input name="forShort" type="text">
+                    </div>
+                    <div>
+                        <span>官网链接：<i class="necessary">*</i></span>
+                        <input name="url" type="text">
+                    </div>
+                    <div>
+                        <span>参数：<i class="necessary">*</i></span>
+                        <input name="parm" type="text">
+                    </div>
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a id="addSystem" class="sgBtn ok addSystem"><img src="../images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+    </div>
+
+    <!-- 修改系统信息 -->
+    <div class="xcConfirm editSystemOut" 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="editystemFormBox">
+                <div class="txtBox">
+
+                    <div>
+                        <span>系统名称：<i class="necessary">*</i></span>
+                        <input name="systemName" type="text">
+                    </div>
+                    <div>
+                        <span>logo：<i class="necessary">*</i></span>
+                        <input id="systemLogoEdit" name="systemLogoFile" type="file">
+                        <input type="hidden" name="systemLogo">
+                    </div>
+                    <div>
+                        <span></span>
+                        <div style="display:inline-block">
+                            <img style="display: none;" src="" id="systemLogoShow" class="systemLogoShow">
+                        </div>
+                    </div>
+
+                    <div>
+                        <span>系统全名：<i class="necessary">*</i></span>
+                        <input name="fullName" type="text">
+                    </div>
+                    <div>
+                        <span>系统简称：<i class="necessary">*</i></span>
+                        <input name="forShort" type="text">
+                    </div>
+                    <div>
+                        <span>启动状态：<i class="necessary">*</i></span>
+                        <select name="status" id="status">
+                            <option value="1">启动</option>
+                            <option value="0">未启动</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>官网链接：<i class="necessary">*</i></span>
+                        <input name="url" type="text">
+                    </div>
+                    <div>
+                        <span>参数：<i class="necessary">*</i></span>
+                        <input name="parm" type="text">
+                    </div>
+
+                    <!-- <div style="opacity:0">
+                        <span>状态：</span>
+                        <input name="status" type="text">
+                    </div> -->
+
+                    <div style="opacity:0">
+                        <span>数据id：</span>
+                        <input name="id" type="text" readonly="readonly">
+                    </div>
+
+                    <div style="opacity:0">
+                        <span>创建人：</span>
+                        <input name="creatMan" type="text" readonly="readonly">
+                    </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>
+
+
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+
+
+    <script src="../layui/layui.js"></script>
+
+    <script src="../js/valid.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../js/system-inform.js"></script>
+    <script src="../js/upload.js"></script>
+
+</body>
+
+</html>

userLog-manage.html

@@ -227,6 +227,7 @@
             //开始日期
             var insStart = laydate.render({
                 elem: '#start_creat_date',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新结束日期的最小日期
                     insEnd.config.min = lay.extend({}, date, {
@@ -240,6 +241,7 @@
             //结束日期
             var insEnd = laydate.render({
                 elem: '#end_creat_date',
+                trigger: 'click',
                 done: function(value, date) {
                     //更新开始日期的最大日期
                     insStart.config.max = lay.extend({}, date, {