Parcourir la source

布局修改,bug修复,前后联调

ming il y a 4 ans
Parent
commit
cad962fafd

+ 0 - 394
auth-manage.html

@@ -1,394 +0,0 @@
-<!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.js"></script>
-</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><a href="per-manage.html">人员管理</a></li>
-                    <li class="selected"><a href="auth-manage.html">权限管理</a></li>
-                    <li><a href="organization.html">组织/机构</a></li>
-                    <li><a href="security.html">安全机制</a></li>
-                    <li><a href="system-inform.html">系统信息</a></li>
-                </ul>
-            </div>
-
-            <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>
-                                <!-- <ul class="child-two">
-                                    <li>
-                                        <span><img src="images/login.png" alt=""> 永天集团</span>
-                                        <ul class="child-three">
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    物联网事业部 (1人)</span>
-                                            </li>
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    人事部 (1人)</span>
-                                            </li>
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    财务部 (3人)</span>
-                                            </li>
-                                </ul> -->
-                            </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>
-
-    </section>
-
-    <!-- 新增菜单 -->
-    <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>

+ 61 - 0
build-manage.html

@@ -0,0 +1,61 @@
+<!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.js"></script>
+</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="build-manage/building-manage.html" target="iframe">建筑管理</a></li>
+                    <li><a href="build-manage/buildingFloor-manage.html" target="iframe">楼层管理</a></li>
+                    <li><a href="build-manage/buildingRoom-manage.html" target="iframe">房间管理</a></li>
+                </ul>
+            </div>
+
+            <div class="column3 flex10">
+                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="build-manage/building-manage.html"></iframe>
+
+            </div>
+        </div>
+
+    </section>
+
+    <script src="js/jquery.js"></script>
+
+    <script>
+        $(function() {
+            $('ul li').click(function() {
+                $(this).siblings().each(function() {
+                        $(this).removeClass('selected');
+                    })
+                    //当前选中
+                $(this).addClass('selected')
+            })
+        })
+    </script>
+
+
+
+</body>
+
+</html>

+ 187 - 0
build-manage/building-manage.html

@@ -0,0 +1,187 @@
+<!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="buildName">
+            <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>
+        </ul>
+
+        <table class="pure-table " cellspacing="0px" id="test">
+            <thead>
+                <tr>
+                    <th style="width: 24px ">
+                    </th>
+                    <th>建筑名称</th>
+                    <th>地理坐标</th>
+                    <th>省</th>
+                    <th>市</th>
+                    <th>区</th>
+                    <th>详细地址</th>
+                </tr>
+            </thead>
+            <tbody id="dataList">
+            </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">1</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">
+                1 </span>条记录,总共 <span id="dataTotal">
+                1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <!-- 新增 -->
+    <div class="xcConfirm addDataOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>建筑名称:<i class="necessary">*</i></span>
+                        <input type="text" name="buildName">
+                    </div>
+                    <div>
+                        <span>建筑坐标:<i class="necessary">*</i></span>
+                        <input type="text" name="posistion">
+                    </div>
+                    <div>
+                        <span>省:<i class="necessary">*</i></span>
+                        <select name="addr1" id="province">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>市:</span>
+                        <select name="addr2" id="city">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>区、县:</span>
+                        <select name="addr3" id="town">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>详细地址:<i class="necessary">*</i></span>
+                        <input type="text" name="address">
+                    </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 editDataOut" 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="editDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>建筑名称:<i class="necessary">*</i></span>
+                        <input type="text" name="buildName">
+                    </div>
+                    <div>
+                        <span>建筑坐标:<i class="necessary">*</i></span>
+                        <input type="text" name="posistion">
+                    </div>
+                    <div>
+                        <span>省:<i class="necessary">*</i></span>
+                        <select name="addr1" id="province2">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>市:</span>
+                        <select name="addr2" id="city2">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>区、县:</span>
+                        <select name="addr3" id="town2">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div style="opacity:0">
+                        <span>建筑id:<i class="necessary">*</i></span>
+                        <input type="text" name="id">
+                    </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="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/building-manage.js"></script>
+    <script src="../plugin/threeLinkArea/area.js"></script>
+    <script src="../plugin/threeLinkArea/select.js"></script>
+
+</body>
+
+</html>

+ 163 - 0
build-manage/buildingFloor-manage.html

@@ -0,0 +1,163 @@
+<!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="floorName">
+            <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>
+        </ul>
+        <table class="pure-table " cellspacing="0px" id="test">
+            <thead>
+                <tr>
+                    <th style="width: 24px ">
+                    </th>
+                    <th>楼层名称</th>
+                    <th>创建人</th>
+                    <th>创建时间</th>
+                    <th>备注</th>
+                </tr>
+            </thead>
+            <tbody id="dataList">
+            </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">1</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">
+                1 </span>条记录,总共 <span id="dataTotal">
+                1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <!-- 新增 -->
+    <div class="xcConfirm addDataOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>楼层名称:<i class="necessary">*</i></span>
+                        <input type="text" name="floorName">
+                    </div>
+                    <div>
+                        <span>所属建筑:<i class="necessary">*</i></span>
+                        <select id="buildId" name="buildId">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>备注:<i class="necessary">*</i></span>
+                        <input type="text" name="remark">
+                    </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 editDataOut" 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="editDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>楼层名称:<i class="necessary">*</i></span>
+                        <input type="text" name="floorName">
+                    </div>
+                    <div>
+                        <span>所属建筑:<i class="necessary">*</i></span>
+                        <select id="buildId2" name="buildId">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>备注:<i class="necessary">*</i></span>
+                        <input type="text" name="remark">
+                    </div>
+                    <div style="opacity:0">
+                        <span>楼层状态:<i class="necessary">*</i></span>
+                        <select name="status" id="">
+                            <option value="0">删除</option>
+                            <option value="1">未删除</option>
+                        </select>
+                    </div>
+                    <div style="opacity:0">
+                        <span>楼层id:<i class="necessary">*</i></span>
+                        <input type="hidden" name="floorId">
+                    </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="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/buildingFloor-manage.js"></script>
+
+</body>
+
+</html>

+ 167 - 0
build-manage/buildingRoom-manage.html

@@ -0,0 +1,167 @@
+<!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="roomName">
+            <span>所属楼层</span>
+            <select name="floorIdSearch" id="floorIdSearch">
+                <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>
+        </ul>
+
+        <table class="pure-table " cellspacing="0px" id="test">
+            <thead>
+                <tr>
+                    <th style="width: 24px ">
+                    </th>
+                    <th>房间名称</th>
+                    <th>创建人</th>
+                    <th>创建时间</th>
+                    <th>备注</th>
+                </tr>
+            </thead>
+            <tbody id="dataList">
+            </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">1</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">
+                1 </span>条记录,总共 <span id="dataTotal">
+                1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <!-- 新增 -->
+    <div class="xcConfirm addDataOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>房间名称:<i class="necessary">*</i></span>
+                        <input type="text" name="roomName">
+                    </div>
+                    <div>
+                        <span>所属楼层:<i class="necessary">*</i></span>
+                        <select name="floorId" id="floorId">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>备注:<i class="necessary">*</i></span>
+                        <input type="text" name="remark">
+                    </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 editDataOut" 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="editDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>房间名称:<i class="necessary">*</i></span>
+                        <input type="text" name="roomName">
+                    </div>
+                    <div>
+                        <span>所属楼层:<i class="necessary">*</i></span>
+                        <select name="floorId" id="floorId2">
+                            <option value="">请选择</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>备注:<i class="necessary">*</i></span>
+                        <input type="text" name="remark">
+                    </div>
+                    <div style="opacity:0">
+                        <span>房间状态:<i class="necessary">*</i></span>
+                        <select name="status" id="">
+                            <option value="0">删除</option>
+                            <option value="1">未删除</option>
+                        </select>
+                    </div>
+                    <div style="opacity:0">
+                        <span>房间id:<i class="necessary">*</i></span>
+                        <input type="hidden" name="roomId">
+                    </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="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/buildingRoom-manage.js"></script>
+
+</body>
+
+</html>

+ 8 - 3
css/common.css

@@ -91,7 +91,7 @@ body {
     background: url(../images/bg.png) no-repeat #000;
     background-size: 100% 100%;
     line-height: 1.15;
-    font-size: 0.175rem!important;
+    font-size: 0.2rem!important;
     /* min-width:1280px;
     min-height:700px;
     height:100vh; */
@@ -216,7 +216,7 @@ a.button {
 }
 
 .tree {
-    font-size: 0.175rem;
+    font-size: 0.2rem;
     color: #fff;
     min-height: 0.25rem;
     /* margin: 0.275rem 0; */
@@ -540,11 +540,12 @@ li.parent_li ul li ul li {
     left: 0;
     bottom: 0;
     width: 100%;
+    line-height: 22px
 }
 
 .pager-right {
     font-family: tahoma, arial, verdana, sans-serif;
-    font-size: 0.175rem;
+    font-size: 0.2rem;
 }
 
 .pager-left li {
@@ -599,6 +600,7 @@ li.parent_li ul li ul li {
 
 .pg-first {
     background: url(../images/page-first.gif);
+    height: 22px;
 }
 
 .pg-first.disabled {
@@ -607,6 +609,7 @@ li.parent_li ul li ul li {
 }
 
 .pg-prev {
+    height: 22px;
     background: url(../images/page-prev.gif);
 }
 
@@ -616,6 +619,7 @@ li.parent_li ul li ul li {
 }
 
 .pg-next {
+    height: 22px;
     background: url(../images/page-next.gif);
 }
 
@@ -627,6 +631,7 @@ li.parent_li ul li ul li {
 
 .pg-last {
     background: url(../images/page-last.gif);
+    height: 22px;
 }
 
 .pg-last.disabled {

+ 60 - 0
device-manage.html

@@ -0,0 +1,60 @@
+<!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.js"></script>
+</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="device-manage/deviceType.html" target="iframe">设备类型</a></li>
+                    <li><a href="device-manage/deviceList.html" target="iframe">设备列表</a></li>
+                    <li><a href="device-manage/deviceCommunicate.html" target="iframe">通信接口</a></li>
+                    <li><a href="device-manage/deviceCheck.html" target="iframe">监测对象</a></li>
+                    <li><a href="device-manage/deviceCheck-channel.html" target="iframe">设备监测对象通道表</a></li>
+                </ul>
+            </div>
+
+            <div class="column3 flex10">
+                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="device-manage/deviceType.html"></iframe>
+            </div>
+        </div>
+
+    </section>
+
+
+    <script src="js/jquery.js"></script>
+
+    <script>
+        $(function() {
+            $('ul li').click(function() {
+                $(this).siblings().each(function() {
+                        $(this).removeClass('selected');
+                    })
+                    //当前选中
+                $(this).addClass('selected')
+            })
+        })
+    </script>
+
+</body>
+
+</html>

+ 197 - 0
device-manage/deviceCheck-channel.html

@@ -0,0 +1,197 @@
+<!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="passageway_name">
+            <span>通道类型名称</span>
+            <input type="text" id="passageway_type_name">
+            <a class="button" id="buttonSearch">确定</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 ">
+                    </th>
+                    <th>序号</th>
+                    <th>监测对象名称</th>
+                    <th>通道类型名称</th>
+                    <th>系统类型名称</th>
+                    <th>单位名称</th>
+                    <th>创建人</th>
+                    <th>创建时间</th>
+                </tr>
+            </thead>
+            <tbody id="dataList">
+            </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">1</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">
+                1 </span>条记录,总共 <span id="dataTotal">
+                1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+    <div class="xcConfirm addDataOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <form action="" id="addDataForm">
+                <div class="ttBox">
+                    <a class="clsBtn"></a>
+                    <span class="tt">新增</span>
+                </div>
+                <div class="txtBox">
+                    <div>
+                        <span>通道名称:<i class="necessary">*</i></span>
+                        <input type="text" name="passageway_name">
+                    </div>
+                    <div>
+                        <span>设备编号:<i class="necessary">*</i></span>
+                        <input type="text" name="device_code">
+                    </div>
+                    <div>
+                        <span>设备类型:<i class="necessary">*</i></span>
+                        <select name="dwtype" class="dwtype">
+                            <option value="1">火系统</option>
+                            <option value="2">水系统</option>
+                            <option value="3">烟感</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>通道类型:<i class="necessary">*</i></span>
+                        <div class="passageway_type_box" style="display:inline-block">
+                            <select name="passageway_type" id="passageway_type_add">
+                                <option class="passagewayTypeFirst" value="0" >通道报警</option>
+                                <option class="passagewayTypeFirst" value="1">主机报警</option>
+                                <option class="passagewayTypeSecond" value="1" >状态</option>
+                                <option class="passagewayTypeSecond" value="2">电量</option>
+                                <option class="passagewayTypeSecond" value="3">无线信号</option>
+                                <option class="passagewayTypeSecond" value="4">水压/水位</option>
+                                <option class="passagewayTypeThird" value="1" >状态</option>
+                                <option class="passagewayTypeThird" value="2">电量</option>
+                                <option class="passagewayTypeThird" value="3">无线信号</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div>
+                        <span>所属单位:<i class="necessary">*</i></span>
+                        <select name="company_code" id="getNameList">
+                            <option value="">所有</option>
+                        </select>
+                    </div>
+                </div>
+            </form>
+            <div class="btnArea">
+                <div class="btnGroup">
+                    <a class="sgBtn ok" id="addData"><img src="../images/accept.png" alt=""> 提交</a>
+                    <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="xcConfirm editDataOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <form action="" id="editDataForm">
+                <div class="ttBox">
+                    <a class="clsBtn"></a>
+                    <span class="tt">修改</span>
+                </div>
+                <div class="txtBox">
+                    <div>
+                        <span>通道名称:<i class="necessary">*</i></span>
+                        <input type="text" name="passageway_name">
+                    </div>
+                    <div>
+                        <span>设备编号:<i class="necessary">*</i></span>
+                        <input type="text" name="device_code">
+                    </div>
+                    <div>
+                        <span>设备类型:<i class="necessary">*</i></span>
+                        <select name="dwtype" class="dwtype">
+                            <option value="1">火系统</option> 
+                            <option value="2">水系统</option>
+                            <option value="3">烟感</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>通道类型:<i class="necessary">*</i></span>
+                        <div class="passageway_type_box2" style="display:inline-block">
+                            <select name="passageway_type" id="passageway_type_edit">
+                                <option class="passagewayTypeFirst" value="0">通道报警</option>
+                                <option class="passagewayTypeFirst" value="1">主机报警</option>
+                                <option class="passagewayTypeSecond" value="1">状态</option>
+                                <option class="passagewayTypeSecond" value="2">电量</option>
+                                <option class="passagewayTypeSecond" value="3">无线信号</option>
+                                <option class="passagewayTypeSecond" value="4">水压/水位</option>
+                                <option class="passagewayTypeThird" value="1">状态</option>
+                                <option class="passagewayTypeThird" value="2">电量</option>
+                                <option class="passagewayTypeThird" value="3">无线信号</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div style="opacity:0">
+                        <span>数据ID:<i class="necessary">*</i></span>
+                        <input type="hidden" name="id" readonly>
+                    </div>
+                </div>
+            </form>
+            <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>
+        </div>
+    </div>
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/deviceCheck-channel.js"></script>
+</body>
+
+</html>

+ 288 - 0
device-manage/deviceCheck.html

@@ -0,0 +1,288 @@
+<!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 layui-form">
+            <span>对象名称</span>
+            <input type="text" id="object_name">
+            <span>添加时间</span>
+            <div class="layui-inline">
+                <input type="text" id="start_add_time" class="layui-input test-item" placeholder="所有" style="margin-right: 0 ">
+            </div>
+            <i class="toTime">~</i>
+            <div class="layui-inline">
+                <input type="text" id="end_add_time" 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>
+        </ul>
+
+        <table class="pure-table" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th style="width: 24px ">
+                    </th>
+                    <th>序号</th>
+                    <th>对象名称</th>
+                    <th>单位名称</th>
+                    <th>添加人/创建人</th>
+                    <th>添加时间/创建时间</th>
+                </tr>
+            </thead>
+            <tbody id="dataList">
+            </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">1</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">
+              1 </span>条记录,总共 <span id="dataTotal">
+              1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <div class="deviceCheckAdd addDataOut" style="display:none">
+        <div class="deviceCheckAdd-wrapper">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">详情</span>
+            </div>
+            <form action="" id="addDeviceCheckForm">
+                <div class="chooseArea">
+                    <div class="layui-row" style="margin-bottom:10px">
+                        <div class="layui-col-xs4">
+                            <div class="grid-demo grid-demo-bg1">
+                                <span>对象名称:<i class="necessary">*</i></span>
+                                <input type="text" name="object_name">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs4">
+                            <div class="grid-demo">
+                                <span>单位:<i class="necessary">*</i></span>
+                                <select name="company_code" id="getNameList">
+                           </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-row">
+                        <div class="layui-col-xs4 ">
+                            <span>建筑:</span>
+                            <select name="build" id="getBuildingList">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 ">
+                            <span>楼层:</span>
+                            <select name="floor" id="getFloorList">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 ">
+                            <span>房间:</span>
+                            <select name="room" id="getRoomList">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row layui-col-space10 layui-form">
+                    <div class="layui-col-md12">
+                        <div class="tree-tit">设备列表</div>
+                        <div class=" checkselfblock" id="checkselfblock">
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div class="btnArea">
+            <div class="btnGroup">
+                <a id="addData" class="sgBtn ok"><img src="../images/accept.png" alt=""> 提交</a>
+                <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+            </div>
+        </div>
+    </div>
+
+    <div class="deviceCheckAdd editDataOut" style="display:none">
+        <div class="deviceCheckAdd-wrapper">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">修改</span>
+            </div>
+            <form action="" id="editDeviceCheckForm">
+                <div class="chooseArea">
+                    <div class="layui-row" style="margin-bottom:10px">
+                        <div class="layui-col-xs4">
+                            <div class="grid-demo grid-demo-bg1">
+                                <span>对象名称:<i class="necessary">*</i></span>
+                                <input type="text" name="object_name">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs4">
+                            <div class="grid-demo">
+                                <span>单位:<i class="necessary">*</i></span>
+                                <input type="text" name="company_code" readonly>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-row">
+                        <div class="layui-col-xs4 ">
+                            <span>建筑:</span>
+                            <select name="build" id="getBuildingList2">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 ">
+                            <span>楼层:</span>
+                            <select name="floor" id="getFloorList2">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 ">
+                            <span>房间:</span>
+                            <select name="room" id="getRoomList2">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-row layui-col-space10 layui-form">
+                    <div class="layui-col-md12">
+                        <div class="tree-tit">设备列表</div>
+                        <div class=" checkselfblock" id="checkselfblock2">
+                        </div>
+                    </div>
+                </div>
+                <div style="opacity:0">
+                    <span>数据id:</span>
+                    <input name="id" type="text" readonly="readonly">
+                </div>
+            </form>
+        </div>
+        <div class="btnArea">
+            <div class="btnGroup">
+                <a id="updataData" class="sgBtn ok"><img src="../images/accept.png" alt=""> 提交</a>
+                <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+            </div>
+        </div>
+    </div>
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/device-check.js"></script>
+
+    <script>
+        layui.use('laydate', function() {
+            var laydate = layui.laydate;
+
+            //开始日期
+            var insStart = laydate.render({
+                elem: '#start_add_time',
+                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: '#end_add_time',
+                trigger: 'click',
+                done: function(value, date) {
+                    //更新开始日期的最大日期
+                    insStart.config.max = lay.extend({}, date, {
+                        month: date.month - 1
+                    });
+                }
+            });
+        });
+
+
+        layui.use(['tree', 'util'], function() {
+            var tree = layui.tree,
+                layer = layui.layer,
+                util = layui.util
+
+            //模拟数据
+            , data = dataDefaultTree
+
+            //基本演示
+            tree.render({
+                elem: '#test12',
+                data: data,
+                showCheckbox: true //是否显示复选框
+                    ,
+                id: 'demoId1',
+                isJump: true //是否允许点击节点时弹出新窗口跳转
+                    ,
+                checkChild: false,
+                click: function(obj) {
+                    var data = obj.data; //获取当前点击的节点数据
+                    layer.msg('状态:' + obj.state + '<br>节点数据:' + JSON.stringify(data));
+                }
+            });
+            tree.render({
+                elem: '#test13',
+                data: data,
+                showCheckbox: true //是否显示复选框
+                    ,
+                id: 'demoId1',
+                isJump: true //是否允许点击节点时弹出新窗口跳转
+                    ,
+                click: function(obj) {
+                    var data = obj.data; //获取当前点击的节点数据
+                    layer.msg('状态:' + obj.state + '<br>节点数据:' + JSON.stringify(data));
+                }
+            });
+        });
+    </script>
+</body>
+
+
+</html>

+ 246 - 0
device-manage/deviceCommunicate.html

@@ -0,0 +1,246 @@
+<!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="business">
+            <span>传输方式</span>
+            <select name="" id="interface_transmission_mode">
+                            <option value="">所有</option>
+                            <option value="1">NB-IOT</option>
+                            <option value="2">Lora-IOT</option>
+                            <option value="3">2G/4G/5G</option>
+                        </select>
+            <a class="button" id="buttonSearch">确定</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 unshow">导出</a>
+        </ul>
+
+        <table class="pure-table" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th style="width: 24px ">
+                    </th>
+                    <th>序号</th>
+                    <th>接口名称</th>
+                    <th>接口路径</th>
+                    <th>接口参数</th>
+                    <th>接口传输方式</th>
+                    <th>接口说明</th>
+                    <th>接口文档</th>
+                    <th>厂家(商家)</th>
+                    <th>添加人</th>
+                    <th>添加时间</th>
+                </tr>
+            </thead>
+            <tbody id="dataList">
+            </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">1</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">
+                            1 </span>条记录,总共 <span id="dataTotal">
+                            1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <div class="xcConfirm addDataOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form action="" id="addDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>接口名称:<i class="necessary">*</i></span>
+                        <input type="text" name="interface_name">
+                    </div>
+                    <div>
+                        <span>接口路径:<i class="necessary">*</i></span>
+                        <input type="text" name="interface_route">
+                    </div>
+                    <div>
+                        <span>接口参数:<i class="necessary">*</i></span>
+                        <input type="text" name="interface_parameter">
+                    </div>
+                    <div>
+                        <span>接口传输方式:<i class="necessary">*</i></span>
+                        <select id="" name="interface_transmission_mode">
+                            <option value="1">NB-IOT</option>
+                            <option value="2">Lora-IOT</option>
+                            <option value="3">2G/4G/5G</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>所属厂家:<i class="necessary">*</i></span>
+                        <input type="text" name="business">
+                    </div>
+                    <div>
+                        <span>单位:<i class="necessary">*</i></span>
+                        <select id="getNameList" name="company_code">
+                            <option value="">所有</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>文件上传:<i class="necessary">*</i></span>
+                        <input type="file" name="file" id="addFile">
+                        <!-- <input type="hidden" name="interface_file_route"> -->
+                    </div>
+
+
+                    <div>
+                        <span>接口说明:<i class="necessary">*</i></span>
+                        <textarea name="interface_explain" id="" cols="20" rows="6"></textarea>
+                    </div>
+
+                </div>
+
+            </form>
+
+            <div class="btnArea">
+                <div class="btnGroup">
+                    <a class="sgBtn ok" id="addDataButton"><img src="../images/accept.png" alt=""> 提交</a>
+                    <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="xcConfirm editDataOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">修改</span>
+            </div>
+            <form action="" id="editDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>接口名称:<i class="necessary">*</i></span>
+                        <input type="text" name="interface_name">
+                    </div>
+                    <div>
+                        <span>接口路径:<i class="necessary">*</i></span>
+                        <input type="text" name="interface_route">
+                    </div>
+                    <div>
+                        <span>接口参数:<i class="necessary">*</i></span>
+                        <input type="text" name="interface_parameter">
+                    </div>
+                    <div>
+                        <span>接口传输方式:<i class="necessary">*</i></span>
+                        <select id="" name="interface_transmission_mode">
+                            <option value="1">NB-IOT</option>
+                            <option value="2">Lora-IOT</option>
+                            <option value="3">2G/4G/5G</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>所属厂家:<i class="necessary">*</i></span>
+                        <input type="text" name="business">
+                    </div>
+                    <!-- <div>
+                        <span>单位:</span>
+                        <select id="getNameList"  name="company_code">
+                            <option value="">所有</option>
+                        </select>
+                    </div> -->
+                    <div>
+                        <span>文件上传:</span>
+                        <input type="file" name="file" id="interface_file_route">
+                        <input type="hidden" name="interface_file_route">
+                    </div>
+                    <div>
+                        <span></span>
+                        <div style="display:inline-block">
+                            <!-- <img style="display: none;" src="" id="systemLogoShow" class="systemLogoShow"> -->
+                            <a href="" id="deviceFileShow" class="deviceFileShow" style="display: none;color:#fff" target=_blank>查看文件</a>
+                        </div>
+                    </div>
+                    <div>
+                        <span>接口说明:</span>
+                        <textarea name="interface_explain" cols="20" rows="6"></textarea>
+                    </div>
+
+                    <div style="opacity:0">
+                        <span>数据ID:<i class="necessary">*</i></span>
+                        <input type="hidden" name="id" readonly>
+                    </div>
+
+                    <div style="opacity:0">
+                        <span>文档路径:<i class="necessary">*</i></span>
+                        <input type="hidden" name="interface_file_route" readonly>
+                    </div>
+
+                </div>
+
+            </form>
+
+            <div class="btnArea">
+                <div class="btnGroup">
+                    <a class="sgBtn ok" id="editDataButton"><img src="../images/accept.png" alt=""> 提交</a>
+                    <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <!-- <script src="js/per-manage.js"></script> -->
+
+    <script src="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/device-communicate.js"></script>
+    <script src="../js/upload.js"></script>
+
+
+
+</body>
+
+</html>

+ 320 - 0
device-manage/deviceList.html

@@ -0,0 +1,320 @@
+<!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="ownerName">
+            <span>创建时间</span>
+            <div class="layui-inline">
+                <input type="text" id="startTime" class="layui-input test-item" placeholder="所有" style="margin-right: 0 ">
+            </div>
+            <i class="toTime">~</i>
+            <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 export">导出</a>
+        </ul>
+        <table class="pure-table" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th style="width: 24px ">
+                    </th>
+                    <th>设备编号</th>
+                    <th>设备名称</th>
+                    <th>设备类型</th>
+                    <th>添加人</th>
+                    <th>添加时间</th>
+                </tr>
+            </thead>
+            <tbody id="dataList">
+            </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">1</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">
+                            1 </span>条记录,总共 <span id="dataTotal">
+                            1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <!-- 列表新增 -->
+    <div class="deviceCheckAdd addDeviceListOut" style="display:none">
+        <div class="deviceCheckAdd-wrapper">
+            <div class="ttBox">
+                <span class="clsBtn"></span>
+                <span class="tt">新增</span>
+            </div>
+            <form action="" id="addDataForm">
+                <div class="chooseArea">
+                    <div class="layui-row">
+                        <div class="layui-col-xs4 choose-item">
+                            <span>设备编号:<i class="necessary">*</i></span>
+                            <input type="text" name="ownerCode">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>设备名称:<i class="necessary">*</i></span>
+                            <input type="text" name="ownerName">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>安装位置:<i class="necessary">*</i></span>
+                            <input type="text" name="unitinfo">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>建筑:<i class="necessary">*</i></span>
+                            <select name="ownerXh" id="getBuildingList">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>楼层:</span>
+                            <select name="louyu" id="getFloorList">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>房间:</span>
+                            <select name="rtmp" id="getRoomList">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+
+                        <div class="layui-col-xs4 choose-item">
+                            <span>省:<i class="necessary">*</i></span>
+                            <select name="addr1" id="province">  
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>市:<i class="necessary">*</i></span>
+                            <select name="addr2" id="city">  
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>区、县:</span>
+                            <select name="addr3" id="town">  
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>详细地址:<i class="necessary">*</i></span>
+                            <input type="text" name="address">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>GIS坐标:<i class="necessary">*</i></span>
+                            <input type="text" name="posistion">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>设备类型:<i class="necessary">*</i></span>
+                            <select name="dwtype" id="getTypeList">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>所属单位:<i class="necessary">*</i></span>
+                            <select name="company" id="getCompanyList">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>传输方式:<i class="necessary">*</i></span>
+                            <input type="text" name="transferType">
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div class="btnArea">
+            <div class="btnGroup">
+                <a id="addData" class="sgBtn ok"><img src="../images/accept.png" alt=""> 提交</a>
+                <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+            </div>
+        </div>
+    </div>
+
+
+    <!-- 列表修改 -->
+    <div class="deviceCheckAdd editDeviceListOut" style="display:none">
+        <div class="deviceCheckAdd-wrapper">
+            <div class="ttBox">
+                <span class="clsBtn"></span>
+                <span class="tt">修改</span>
+            </div>
+            <form action="" id="updateForm">
+                <div class="chooseArea">
+                    <div class="layui-row">
+                        <div class="layui-col-xs4 choose-item">
+                            <span>设备编号:<i class="necessary">*</i></span>
+                            <input type="text" name="ownerCode" readonly>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>设备名称:<i class="necessary">*</i></span>
+                            <input type="text" name="ownerName">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>安装位置:<i class="necessary">*</i></span>
+                            <input type="text" name="unitinfo">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>建筑:</span>
+                            <select name="ownerXh" id="getBuildingList2">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>楼层:</span>
+                            <select name="louyu" id="getFloorList2">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>房间:</span>
+                            <select name="rtmp" id="getRoomList2">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>省:<i class="necessary">*</i></span>
+                            <select name="addr1" id="province2">  
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>市:<i class="necessary">*</i></span>
+                            <select name="addr2" id="city2">  
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>区、县:</span>
+                            <select name="addr3" id="town2">  
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>详细地址:<i class="necessary">*</i></span>
+                            <input type="text" name="address">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>GIS坐标:<i class="necessary">*</i></span>
+                            <input type="text" name="posistion">
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>设备类型:<i class="necessary">*</i></span>
+                            <select name="dwtype" id="getTypeList2">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>所属单位:<i class="necessary">*</i></span>
+                            <select name="company" id="getCompanyList2">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                        <div class="layui-col-xs4 choose-item">
+                            <span>传输方式:<i class="necessary">*</i></span>
+                            <input type="text" name="transferType">
+                        </div>
+                        <div class="layui-col-xs4 choose-item" style="opacity:0">
+                            <span>设备状态:<i class="necessary">*</i></span>
+                            <input type="text" name="hls">
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </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>
+    </div>
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../plugin/threeLinkArea/area.js"></script>
+    <script src="../plugin/threeLinkArea/select.js"></script>
+    <script src="../js/device-list.js"></script>
+
+    <script>
+        layui.use(['form', 'layedit', 'laydate'], function() {
+            var form = layui.form,
+                layer = layui.layer,
+                layedit = layui.layedit,
+                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>

+ 182 - 0
device-manage/deviceType.html

@@ -0,0 +1,182 @@
+<!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="business">
+            <span>类型值</span>
+            <input type="text" id="type_value">
+            <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" id="test">
+            <thead>
+                <tr>
+                    <th style="width: 24px ">
+                    </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 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">1</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">
+                            1 </span>条记录,总共 <span id="dataTotal">
+                            1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+
+    <!-- 新增 -->
+    <div class="xcConfirm addDeviceTypeOut" style="display:none">
+        <div class="xc_layer"></div>
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form id="addMenuForm">
+                <div class="txtBox">
+                    <div>
+                        <span>类型名称:<i class="necessary">*</i></span>
+                        <input type="text" name="type_name">
+                    </div>
+                    <div>
+                        <span>类型参数:<i class="necessary">*</i></span>
+                        <input type="text" name="type_value">
+                    </div>
+                    <div>
+                        <span>传输方式:<i class="necessary">*</i></span>
+                        <select name="transmission_model">
+                            <option value="">所有</option>
+                            <option value="1">NB-IOT</option>
+                            <option value="2">Lora-IOT</option>
+                            <option value="3">2G/4G/5G</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>厂家(商家):<i class="necessary">*</i></span>
+                        <input type="text" name="business">
+                    </div>
+                    <div>
+                        <span>所属单位:<i class="necessary">*</i></span>
+                        <select id="getNameList" name="company_code">
+                            <option value="">所有</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="btnArea">
+                    <div class="btnGroup">
+                        <a class="sgBtn ok" id="addMenu"><img src="../images/accept.png" alt=""> 提交</a>
+                        <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <!-- 修改 -->
+    <div class="xcConfirm editDeviceTypeOut" 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="updateMenuForm">
+                <div class="txtBox">
+                    <div>
+                        <span>类型名称:<i class="necessary">*</i></span>
+                        <input type="text" name="type_name">
+                    </div>
+                    <div>
+                        <span>类型参数:<i class="necessary">*</i></span>
+                        <input type="text" name="type_value">
+                    </div>
+                    <div>
+                        <span>传输方式:<i class="necessary">*</i></span>
+                        <select name="transmission_model">
+                            <option value="1">NB-IOT</option>
+                            <option value="2">Lora-IOT</option>
+                            <option value="3">2G/4G/5G</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>厂家(商家):<i class="necessary">*</i></span>
+                        <input type="text" name="business">
+                    </div>
+                    <div style="opacity:0">
+                        <span>数据ID:<i class="necessary">*</i></span>
+                        <input type="hidden" name="id" 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="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/device-type.js"></script>
+
+</body>
+
+</html>

+ 1 - 1
deviceList.html

@@ -263,7 +263,7 @@
 
 
                         <div class="layui-col-xs4 choose-item">
-                            <span>建筑:</span>
+                            <span>建筑:<i class="necessary">*</i></span>
                             <select name="ownerXh" id="getBuildingList2">
                                 <option value="">请选择</option>
                             </select>

+ 64 - 0
event-center.html

@@ -0,0 +1,64 @@
+<!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.js"></script>
+
+</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="event-center/eventDanger-manage.html" target="iframe">隐患管理</a></li>
+                    <li><a href="event-center/eventWarning-manage.html" target="iframe">告警管理</a></li>
+                    <li><a href="event-center/eventEvent-manage.html" target="iframe">事件管理</a></li>
+                </ul>
+            </div>
+
+            <div class="column3 flex10">
+                <iframe name="iframe" width="100%" height="100%" frameborder="0" src="event-center/eventDanger-manage.html"></iframe>
+
+
+            </div>
+        </div>
+
+    </section>
+
+    <script src="js/jquery.js"></script>
+
+    <script>
+        $(function() {
+            $('ul li').click(function() {
+                $(this).siblings().each(function() {
+                        $(this).removeClass('selected');
+                    })
+                    //当前选中
+                $(this).addClass('selected')
+            })
+        })
+    </script>
+
+
+</body>
+
+</html>

+ 229 - 0
event-center/eventDanger-manage.html

@@ -0,0 +1,229 @@
+<!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>
+            <div class="layui-inline">
+                <input type="text" id="time_start" class="layui-input test-item" placeholder="所有">
+            </div>
+            <span>结束时间</span>
+            <div class="layui-inline">
+                <input type="text" id="time_end" class="layui-input test-item" placeholder="所有">
+            </div>
+            <span>处理状态</span>
+            <select name="" id="clzt">
+                <option value="">所有</option>
+                <option value="1">已处理</option>
+                <option value="0">未处理</option>
+            </select>
+            <a class="button" id="buttonSearch">确定</a>
+            <a class="button reset">重置</a>
+        </div>
+        <div class="operatebox"></div>
+        <ul class="member-operate">
+            <div class="event-count-box">
+                <ul>
+                    <li class="color-blue">
+                        <img src="../images/event-icon1.png" alt="">
+                        <span>事件总数</span>
+                        <span class="event-num color-blue" id="totalCount">125</span>
+                    </li>
+                    <li class="color-orange">
+                        <img src="../images/event-icon2.png" alt="">
+                        <span>已处置数</span>
+                        <span class="event-num color-orange" id="handled">123</span>
+                    </li>
+                    <li class="color-red">
+                        <img src="../images/event-icon3.png" alt="">
+                        <span>未处置数</span>
+                        <span class="event-num color-red" id="unhandle">122</span>
+                    </li>
+                    <li class="color-green">
+                        <img src="../images/event-icon4.png" alt="">
+                        <span>处置率</span>
+                        <span class="event-num color-green" id="handleRate">99.2%</span>
+                    </li>
+                </ul>
+            </div>
+            <a class="button handle">处置</a>
+            <a class="button export">导出</a>
+        </ul>
+        <table class="pure-table" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th style="width:24px">
+                    </th>
+                    <th>序号</th>
+                    <th>单位名称</th>
+                    <th>上报时间</th>
+                    <th>报告数据</th>
+                    <th>告警值</th>
+                    <th style="width:200px">报告内容</th>
+                    <th>处理状态</th>
+                    <th>处理人</th>
+                    <th>处理时间</th>
+                </tr>
+            </thead>
+            <tbody id="dataList">
+            </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">1</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">
+                            1 </span>条记录,总共 <span id="dataTotal">
+                            1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <div class="xcConfirm handleDataOut" style="display:none">
+        <!-- 处置弹框 -->
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">处置详情</span>
+            </div>
+            <form action="" id="handleDataForm">
+                <div class="txtBox ">
+                    <div>
+                        <span>单位名称:</span>
+                        <input type="text" name="company_name" readonly>
+                    </div>
+                    <div>
+                        <span>设备名称:</span>
+                        <input type="text" name="name" readonly>
+                    </div>
+                    <div>
+                        <span>报告数据:</span>
+                        <input type="text" name="data" readonly>
+                    </div>
+                    <div class="error-radio layui-form">
+                        <span>误报:</span>
+                        <div class="layui-form-item">
+                            <div class="layui-input-block">
+                                <input id="yes" type="radio" name="clwb" value="1" title="是" checked>
+                                <input id="no" type="radio" name="clwb" value="0" title="否">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="error-radio layui-form handle-range">
+                        <span>处理范围:</span>
+                        <div class="layui-form-item">
+                            <div class="layui-input-block">
+                                <input type="radio" name="clwb1" value="" title="批量" checked>
+                                <input type="radio" name="clwb1" value="" title="单一">
+                            </div>
+                        </div>
+                    </div>
+                    <div>
+                        <span>处理内容:</span>
+                        <textarea name="clnr" id="" cols="10" rows="5"></textarea>
+                    </div>
+                    <div style="opacity:0">
+                        <span>数据id:</span>
+                        <input type="text" name="id">
+                    </div>
+                    <div style="opacity:0">
+                        <span>设备类型:</span>
+                        <input type="text" name="dwtype">
+                    </div>
+                    <div style="opacity:0">
+                        <span>数据上报状态:</span>
+                        <input type="text" name="status">
+                    </div>
+                    <div style="opacity:0">
+                        <span>设备编号:</span>
+                        <input type="text" name="device_code">
+                    </div>
+                </div>
+            </form>
+
+            <div class="btnArea">
+                <div class="btnGroup">
+                    <a class="sgBtn ok" id="handleUpdate"><img src="../images/accept.png" alt=""> 提交</a>
+                    <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/eventDanger-manage.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: '#time_start',
+                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: '#time_end',
+                trigger: 'click',
+                done: function(value, date) {
+                    //更新开始日期的最大日期
+                    insStart.config.max = lay.extend({}, date, {
+                        month: date.month - 1
+                    });
+                }
+            });
+
+        });
+    </script>
+</body>
+
+</html>

+ 211 - 0
event-center/eventEvent-manage.html

@@ -0,0 +1,211 @@
+<!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 memberbox2">
+        <div class="membertit">事件管理</div>
+        <div class="member-choose">
+            <span>事件名称</span>
+            <input type="text" id="event_name">
+            <span>事件类型</span>
+            <select name="" id="event_type">>
+                <option value="">所有</option>
+                <option value="1">消防隐患</option>
+                <option value="2">消防告警</option>
+                <option value="3">设备设施</option>
+            </select>
+            <a class="button" id="buttonSearch">确定</a>
+            <a class="button reset">重置</a>
+        </div>
+        <div class="operatebox"></div>
+        <ul class="member-operate">
+            <div class="event-count-box">
+                <ul>
+                    <li class="color-blue">
+                        <img src="../images/event-icon1.png" alt="">
+                        <span>事件总数</span>
+                        <span class="event-num color-blue" id="totalCount">125</span>
+                    </li>
+                    <li class="color-orange">
+                        <img src="../images/event-icon2.png" alt="">
+                        <span>已处置数</span>
+                        <span class="event-num color-orange" id="handled">123</span>
+                    </li>
+                    <li class="color-red">
+                        <img src="../images/event-icon3.png" alt="">
+                        <span>未处置数</span>
+                        <span class="event-num color-red" id="unhandle">122</span>
+                    </li>
+                    <li class="color-green">
+                        <img src="../images/event-icon4.png" alt="">
+                        <span>处置率</span>
+                        <span class="event-num color-green" id="handleRate">99.2%</span>
+                    </li>
+                </ul>
+            </div>
+            <a class="button add">新增</a>
+            <a class="button handle">处置</a>
+            <a class="button export">导出</a>
+        </ul>
+        <table class="pure-table" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th style="width:24px">
+                    </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 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">1</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">
+                1 </span>条记录,总共 <span id="dataTotal">
+                1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <!-- 新增弹框 -->
+    <div class="xcConfirm  addDataOut" style="display:none">
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">新增</span>
+            </div>
+            <form action="" id="addDataForm">
+                <div class="txtBox">
+                    <div>
+                        <span>事件名称:<i class="necessary">*</i></span>
+                        <input type="text" name="event_name">
+                    </div>
+                    <div>
+                        <span>事件内容:<i class="necessary">*</i></span>
+                        <input type="text" name="event_content">
+                    </div>
+                    <div>
+                        <span>事件类型:<i class="necessary">*</i></span>
+                        <select name="event_type" id="">
+                            <option value="1">消防隐患</option>
+                            <option value="2">消防告警</option>
+                            <option value="3">设备设施</option>
+                        </select>
+                    </div>
+                    <div>
+                        <span>所属单位:<i class="necessary">*</i></span>
+                        <select name="company_code" id="getNameList">
+                            <option value="">所有</option>
+                        </select>
+                    </div>
+                </div>
+            </form>
+            <div class="btnArea">
+                <div class="btnGroup">
+                    <a class="sgBtn ok" id="addData"><img src="../images/accept.png" alt=""> 提交</a>
+                    <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    </div>
+    <div class="xcConfirm  handleDataOut" style="display:none">
+        <!-- 处置弹框 -->
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">处置</span>
+            </div>
+            <form action="" id="handleDataForm">
+                <div class="txtBox ">
+                    <div>
+                        <span>单位名称:</span>
+                        <input type="text" name="company_name" readonly>
+                    </div>
+                    <div>
+                        <span>事件类型:</span>
+                        <input type="text" name="event_type" readonly>
+                    </div>
+                    <div>
+                        <span>事件名称:</span>
+                        <input type="text" name="event_name" readonly>
+                    </div>
+                    <div>
+                        <span>事件内容:</span>
+                        <input type="text" name="event_content" readonly>
+                    </div>
+                    <div>
+                        <span>处置内容:</span>
+                        <textarea name="cl_content" id="" cols="30" rows="6"></textarea>
+                    </div>
+                    <div style="opacity:0">
+                        <span>数据id:</span>
+                        <input type="text" name="id">
+                    </div>
+                </div>
+            </form>
+            <div class="btnArea">
+                <div class="btnGroup">
+                    <a class="sgBtn ok" id="handleUpdate"><img src="../images/accept.png" alt=""> 提交</a>
+                    <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="view"></div>
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/event-manage.js"></script>
+    <script>
+        layui.use(['form', 'layedit', 'laydate'], function() {
+            var form = layui.form,
+                layer = layui.layer,
+                layedit = layui.layedit,
+                laydate = layui.laydate;
+        });
+    </script>
+
+</body>
+
+</html>

+ 240 - 0
event-center/eventWarning-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>
+    <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>
+            <div class="layui-inline">
+                <input type="text" id="time_start" class="layui-input test-item" placeholder="所有">
+            </div>
+
+            <span>结束时间</span>
+
+            <div class="layui-inline">
+                <input type="text" id="time_end" class="layui-input test-item" placeholder="所有">
+            </div>
+
+            <span>处理状态</span>
+            <select name="" id="clzt">
+                <option value="">所有</option>
+                <option value="1">已处理</option>
+                <option value="0">未处理</option>
+            </select>
+
+            <a class="button" id="buttonSearch">确定</a>
+            <a class="button reset">重置</a>
+        </div>
+        <div class="operatebox"></div>
+        <ul class="member-operate">
+            <div class="event-count-box">
+                <ul>
+                    <li class="color-blue">
+                        <img src="../images/event-icon1.png" alt="">
+                        <span>事件总数</span>
+                        <span class="event-num color-blue" id="totalCount">125</span>
+                    </li>
+                    <li class="color-orange">
+                        <img src="../images/event-icon2.png" alt="">
+                        <span>已处置数</span>
+                        <span class="event-num color-orange" id="handled">123</span>
+                    </li>
+                    <li class="color-red">
+                        <img src="../images/event-icon3.png" alt="">
+                        <span>未处置数</span>
+                        <span class="event-num color-red" id="unhandle">122</span>
+                    </li>
+                    <li class="color-green">
+                        <img src="../images/event-icon4.png" alt="">
+                        <span>处置率</span>
+                        <span class="event-num color-green" id="handleRate">99.2%</span>
+                    </li>
+                </ul>
+            </div>
+            <a class="button handle">处置</a>
+            <a class="button export">导出</a>
+
+        </ul>
+
+
+        <table class="pure-table" cellspacing="0px">
+            <thead>
+                <tr>
+                    <th style="width:24px">
+                    </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 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">1</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">
+                1 </span>条记录,总共 <span id="dataTotal">
+                1 </span>条
+        </div>
+    </div>
+    <div class="pager no-data" style="display:none;text-align:right">
+        暂无数据
+    </div>
+
+    <div class="xcConfirm handleDataOut" style="display:none">
+        <!-- 处置弹框 -->
+        <div class="popBox">
+            <div class="ttBox">
+                <a class="clsBtn"></a>
+                <span class="tt">处置详情</span>
+            </div>
+            <form action="" id="handleDataForm">
+                <div class="txtBox ">
+                    <div>
+                        <span>单位名称:</span>
+                        <input type="text" name="company_name" readonly>
+                    </div>
+                    <div>
+                        <span>设备名称:</span>
+                        <input type="text" name="name" readonly>
+                    </div>
+                    <div>
+                        <span>报告数据:</span>
+                        <input type="text" name="data" readonly>
+                    </div>
+                    <div class="error-radio layui-form">
+                        <span>误报:</span>
+                        <div class="layui-form-item">
+                            <div class="layui-input-block">
+
+                                <input id="yes" type="radio" name="clwb" value="" title="是" checked>
+                                <input id="no" type="radio" name="clwb" value="" title="否">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="error-radio layui-form handle-range">
+                        <span>处理范围:</span>
+                        <div class="layui-form-item">
+                            <div class="layui-input-block">
+                                <input type="radio" name="clwb1" value="" title="批量" checked>
+                                <input type="radio" name="clwb1" value="" title="单一">
+                            </div>
+                        </div>
+                    </div>
+                    <div>
+                        <span>处理内容:</span>
+                        <textarea name="clnr" id="" cols="10" rows="5"></textarea>
+                    </div>
+                    <div style="opacity:0">
+                        <span>数据id:</span>
+                        <input type="text" name="id">
+                    </div>
+                    <div style="opacity:0">
+                        <span>设备类型:</span>
+                        <input type="text" name="dwtype">
+                    </div>
+                    <div style="opacity:0">
+                        <span>数据上报状态:</span>
+                        <input type="text" name="status">
+                    </div>
+                    <div style="opacity:0">
+                        <span>设备编号:</span>
+                        <input type="text" name="device_code">
+                    </div>
+                </div>
+            </form>
+
+            <div class="btnArea">
+                <div class="btnGroup">
+                    <a class="sgBtn ok" id="handleUpdate"><img src="../images/accept.png" alt=""> 提交</a>
+                    <a class="sgBtn cancel"><img src="../images/cancel.png" alt="">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+
+
+    <script src="../js/jquery.js"></script>
+    <script src="../js/util.js"></script>
+    <script src="../api/request.js"></script>
+    <script src="../js/main.js"></script>
+    <script src="../layui/layui.js"></script>
+    <script src="../js/valid.js"></script>
+    <script src="../js/eventWarning-manage.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: '#time_start',
+                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: '#time_end',
+                trigger: 'click',
+                done: function(value, date) {
+                    //更新开始日期的最大日期
+                    insStart.config.max = lay.extend({}, date, {
+                        month: date.month - 1
+                    });
+                }
+            });
+        });
+    </script>
+</body>
+
+</html>

+ 1 - 1
js/buildingFloor-manage.js

@@ -66,7 +66,7 @@ function getBuilding(queryParam = {}) {
         let data = result.pageList;
         let items = '';
         data.forEach(function(item, key) {
-            items += `<option value="${item.floorName}">${item.buildName}</option>`
+            items += `<option value="${item.id}">${item.buildName}</option>`
         })
         $('#buildId').append(items);
         $('#buildId2').append(items);

+ 4 - 1
js/device-list.js

@@ -325,7 +325,7 @@ layui.use('layer', function() {
                 $('.editDeviceListOut input[name=address').val(userInfo.address)
                 $('.editDeviceListOut input[name=posistion').val(userInfo.posistion)
 
-                $('.editDeviceListOut select[name=dwtype]').val(userInfo.dwtype)
+                $('.editDeviceListOut select[name=dwtype]').val(userInfo.dwtypeCode)
                 $('.editDeviceListOut select[name=company]').val(userInfo.company)
 
                 $('.editDeviceListOut input[name=transferType').val(userInfo.transferType)
@@ -344,12 +344,15 @@ layui.use('layer', function() {
                 });
                 removeEle(city);
                 removeEle(town);
+
+
                 $.each(provinceList[cityItem].cityList, function(i, item) {
                         addEle(city, item.name)
                     })
                     // userInfo.addr2 = "市辖区"
                 $('.editDeviceListOut select[name=addr2]').val(userInfo.addr2)
 
+
                 cityText = userInfo.addr2;
                 removeEle(town);
                 $.each(provinceList, function(i, item) {

+ 1 - 1
js/per-manage.js

@@ -182,7 +182,7 @@ 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} </span>`;
             if (item.child) {
                 let data = item.child;
                 items += `<ul class="child-three">`;

+ 0 - 513
organization.html

@@ -1,513 +0,0 @@
-<!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.js"></script>
-</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><a href="per-manage.html">人员管理</a></li>
-                    <li><a href="auth-manage.html">权限管理</a></li>
-                    <li class="selected"><a href="organization.html">组织/机构</a></li>
-                    <li><a href="security.html">安全机制</a></li>
-                    <li><a href="system-inform.html">系统信息</a></li>
-                </ul>
-            </div>
-            <!-- <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>
-                            <li>
-                                <span class="maintree">
-                                    <img src="images/login.png" alt="">
-                                    永天集团
-                                </span>
-                                <ul class="child-two">
-                                    <li>
-                                        <span><img src="images/login.png" alt=""> 物联网事业部</span>
-                                        <ul class="child-three">
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    项目组</span>
-                                            </li>
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    开发组</span>
-                                            </li>
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    设计组</span>
-                                            </li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                                <ul class="child-two">
-                                    <li>
-                                        <span><img src="images/login.png" alt=""> 物联网事业部</span>
-                                        <ul class="child-three">
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    项目组</span>
-                                            </li>
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    开发组</span>
-                                            </li>
-                                            <li>
-                                                <span><img src="images/login.png" alt="">
-                                                    设计组</span>
-                                            </li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div> -->
-            <div class="column3 flex10">
-
-                <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>
-        </div>
-
-    </section>
-
-    <!-- 单位新增 -->
-    <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>

+ 0 - 337
per-manage.html

@@ -1,337 +0,0 @@
-<!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.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-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="per-manage.html">人员管理</a></li>
-                    <li><a href="auth-manage.html">权限管理</a></li>
-                    <li><a href="organization.html">组织/机构</a></li>
-                    <li><a href="security.html">安全机制</a></li>
-                    <li><a href="system-inform.html">系统信息</a></li>
-
-                </ul>
-            </div>
-            <div class="column column2 flex2">
-
-                <div class="departlist-box">
-                    <div class="departtit">部门列表</div>
-                    <!-- <ul class="depart-opera">
-                        <li><a class="button">新增</a></li>
-                        <li><a class="button">编辑</a></li>
-                        <li><a class="button">删除</a></li>
-                    </ul> -->
-                    <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 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>
-
-    </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>
-    </script>
-</body>
-
-</html>

+ 0 - 229
security.html

@@ -1,229 +0,0 @@
-<!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.js"></script>
-</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><a href="per-manage.html">人员管理</a></li>
-                    <li><a href="auth-manage.html">权限管理</a></li>
-                    <li><a href="organization.html">组织/机构</a></li>
-                    <li class="selected"><a href="security.html">安全机制</a></li>
-                    <li><a href="system-inform.html">系统信息</a></li>
-                </ul>
-            </div>
-
-            <div class="column3 flex10">
-                <div class="memberbox">
-                    <div class="membertit">安全机制</div>
-                    <!-- <div class="member-choose">
-                        
-                        <span>账号</span>
-                        <input type="text">
-
-                        <span>初始密码</span>
-                        <input type="text">
-
-                        <span>密码属性</span>
-                        <select name="" id="">
-                            <option value="">所有</option>
-                            <option value="">属性1</option>
-                            <option value="">属性2</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 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>
-        </div>
-
-    </section>
-
-    <!-- 安全机制新增 -->
-    <!-- <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>

+ 0 - 285
system-inform.html

@@ -1,285 +0,0 @@
-<!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.js"></script>
-</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><a href="per-manage.html">人员管理</a></li>
-                    <li><a href="auth-manage.html">权限管理</a></li>
-                    <li><a href="organization.html">组织/机构</a></li>
-                    <li><a href="security.html">安全机制</a></li>
-                    <li class="selected"><a href="system-inform.html">系统信息</a></li>
-                </ul>
-            </div>
-
-            <div class="column3 flex10">
-                <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>
-                        </select>
-
-                        <a class="button" href="">确定</a>
-                        <a class="button reset" href="">重置</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>
-
-                    </ul>
-
-
-                    <table class="pure-table" cellspacing="0px">
-                        <thead>
-                            <tr>
-                                <th>
-                                    <!-- <span class="checkall status"></span> -->
-                                </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>
-        </div>
-
-    </section>
-
-    <!-- 新增系统信息 -->
-    <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>

+ 0 - 3
system-manage.html

@@ -9,8 +9,6 @@
     <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)">
@@ -33,7 +31,6 @@
             </div>
             <div class="column3 flex10">
                 <iframe name="iframe" width="100%" height="100%" frameborder="0" src="system-manage/per-manage.html"></iframe>
-
             </div>
         </div>
 

+ 1 - 125
system-manage/auth-manage.html

@@ -13,21 +13,10 @@
 </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>
@@ -48,8 +37,6 @@
         </div>
 
         <div class="column3 flex8">
-
-
             <div class="memberbox">
                 <div class="membertit">权限设置</div>
                 <!-- <div class="member-choose">
@@ -71,97 +58,23 @@
                     <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 style="width: 24px ">
                             </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">
@@ -171,28 +84,22 @@
             </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">
@@ -209,14 +116,10 @@
                             <option value="2">按钮</option>
                         </select>
                     </div>
-
                     <div>
                         <span>菜单排序:</span>
                         <input type="text" name="orderNum">
                     </div>
-
-
-
                 </div>
                 <div class="btnArea">
                     <div class="btnGroup">
@@ -228,7 +131,6 @@
         </div>
     </div>
 
-
     <!-- 修改菜单 -->
     <div class="xcConfirm editMenuOut" style="display:none">
         <div class="popBox">
@@ -238,7 +140,6 @@
             </div>
             <form id="editMenuForm">
                 <div class="txtBox">
-
                     <div>
                         <span>是否为父节点:</span>
                         <select name="parented" id="parented2" disabled="disabled">
@@ -246,19 +147,15 @@
                             <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">
@@ -275,19 +172,14 @@
                             <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">
@@ -299,7 +191,6 @@
         </div>
     </div>
 
-
     <!-- 新增权限 -->
     <div class="xcConfirm addAuthOut" style="display:none">
         <div class="popBox">
@@ -309,7 +200,6 @@
             </div>
             <form id="addAuthForm">
                 <div class="txtBox">
-
                     <!-- <div>
                         <span>是否为父节点:</span>
                         <select name="parented" id="parented">
@@ -318,18 +208,11 @@
                             <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">
@@ -341,9 +224,6 @@
         </div>
     </div>
 
-
-
-
     <script src="../js/jquery.js"></script>
 
     <script src="../layui/layui.js"></script>
@@ -352,10 +232,6 @@
     <script src="../api/request.js"></script>
     <script src="../js/main.js"></script>
     <script src="../js/auth-manage.js"></script>
-    <script>
-    </script>
-
-
 </body>
 
 </html>

+ 3 - 75
system-manage/organization.html

@@ -2,13 +2,10 @@
 <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" />
@@ -16,7 +13,6 @@
 </head>
 
 <body style="background:rgba(0,0,0,0)">
-
     <div class="memberbox">
         <div class="membertit">组织/机构列表</div>
         <div class="member-choose">
@@ -26,14 +22,10 @@
             <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>
@@ -43,15 +35,11 @@
             <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>
@@ -64,21 +52,7 @@
                     <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>
@@ -89,7 +63,7 @@
                 <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> 页
+                    第 <input id="currentPage" type="text" size="1" value="1"> 页,共 <span id="totalPage">1</span> 页
                 </li>
                 <li id="nextPageButton" class="pg-next"></li>
                 <li id="lastPageButton" class="pg-last"></li>
@@ -99,21 +73,16 @@
             </ul>
         </div>
         <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
-                            15 </span>条记录,总共 <span id="dataTotal">
-                            46 </span>条
+                            1 </span>条记录,总共 <span id="dataTotal">
+                            1 </span>条
         </div>
 
 
     </div>
     <div class="pager no-data" style="display:none;text-align:right">
         暂无数据
-
-
     </div>
 
-
-
-
     <!-- 单位新增 -->
     <div class="xcConfirm addCompanyDataOut" style="display:none">
         <div class="xc_layer"></div>
@@ -135,7 +104,6 @@
                     <div>
                         <span>单位地址:<i class="necessary">*</i></span>
                         <input type="text" name="ownerAddress">
-
                     </div>
                     <div>
                         <span>办公地址 :<i class="necessary">*</i></span>
@@ -146,7 +114,6 @@
                         <select name="buildingId" id="getBuildingId">
                             <option value="">请选择</option>
                         </select>
-
                     </div>
                     <div>
                         <span>类型:<i class="necessary">*</i></span>
@@ -168,7 +135,6 @@
                     </div>
                 </div>
             </form>
-
         </div>
     </div>
 
@@ -193,7 +159,6 @@
                     <div>
                         <span>单位地址:<i class="necessary">*</i></span>
                         <input type="text" name="ownerAddress">
-
                     </div>
                     <div>
                         <span>办公地址 :<i class="necessary">*</i></span>
@@ -204,7 +169,6 @@
                         <select name="buildingId" id="getBuildingId2">
                             <option value="">请选择</option>
                         </select>
-
                     </div>
                     <div>
                         <span>类型:<i class="necessary">*</i></span>
@@ -230,7 +194,6 @@
                     </div>
                 </div>
             </form>
-
         </div>
     </div>
 
@@ -252,7 +215,6 @@
                     <thead>
                         <tr>
                             <th style="width:24px">
-                                <!-- <span class="checkall status"></span> -->
                             </th>
                             <th>部门名称</th>
                             <th>部门负责人</th>
@@ -264,15 +226,11 @@
                 </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>
 
@@ -296,16 +254,7 @@
                     <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">
@@ -338,26 +287,15 @@
                     <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">
@@ -366,14 +304,10 @@
                     </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>
@@ -393,8 +327,6 @@
 
         layui.use('laydate', function() {
             var laydate = layui.laydate;
-
-
             //开始日期
             var insStart = laydate.render({
                 elem: '#startTime',
@@ -420,10 +352,6 @@
                     });
                 }
             });
-
-
-
-
         });
     </script>
 </body>

+ 3 - 45
system-manage/per-manage.html

@@ -5,33 +5,20 @@
     <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>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-    </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>
@@ -112,7 +99,7 @@
                     <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> 页
+                        第 <input id="currentPage" type="text" size="1" value="1"> 页,共 <span id="totalPage">1</span> 页
                     </li>
                     <li id="nextPageButton" class="pg-next"></li>
                     <li id="lastPageButton" class="pg-last"></li>
@@ -122,8 +109,8 @@
                 </ul>
             </div>
             <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
-                        15 </span>条记录,总共 <span id="dataTotal">
-                        46 </span>条
+                        1 </span>条记录,总共 <span id="dataTotal">
+                        1 </span>条
             </div>
 
 
@@ -136,7 +123,6 @@
 
     </div>
 
-
     <!-- 新增人员 -->
     <div class="xcConfirm addUserOut" style="display:none">
         <div class="popBox">
@@ -146,7 +132,6 @@
             </div>
             <form id="addUserForm">
                 <div class="txtBox">
-
                     <div>
                         <span>姓名:<i class="necessary">*</i> </span>
                         <input name="username" type="text">
@@ -155,10 +140,6 @@
                         <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">
@@ -190,7 +171,6 @@
                     <div>
                         <span>角色:<i class="necessary">*</i></span>
                         <select name="posname" id="roleId2">
-                           
                         </select>
                     </div>
                     <div>
@@ -204,12 +184,8 @@
                         <span>部门名称:</span>
                         <select name="depname" id="departmentId">
                             <option value="">请选择部门</option>
-                            <!-- <option value="">单位2</option> -->
                         </select>
                     </div>
-
-
-
                 </div>
                 <div class="btnArea">
                     <div class="btnGroup">
@@ -221,8 +197,6 @@
         </div>
     </div>
 
-
-
     <!-- 修改人员信息 -->
     <div class="xcConfirm editUserOut" style="display:none">
         <div class="popBox">
@@ -232,12 +206,10 @@
             </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">
@@ -245,7 +217,6 @@
                             <option value="女">女</option>
                         </select>
                     </div>
-
                     <div>
                         <span>角色:<i class="necessary">*</i></span>
                         <select name="posname" id="roleId3">
@@ -253,7 +224,6 @@
                             <option value="2">角色2</option>
                         </select>
                     </div>
-
                     <div>
                         <span>手机号:<i class="necessary">*</i></span>
                         <input name="phone" type="text">
@@ -265,7 +235,6 @@
                             <option value="1">未删除</option>
                         </select>
                     </div>
-
                     <div>
                         <span>锁定状态:<i class="necessary">*</i></span>
                         <select name="locked">
@@ -277,7 +246,6 @@
                         <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">
@@ -289,16 +257,12 @@
                         <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">
@@ -310,21 +274,15 @@
             </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>

+ 4 - 76
system-manage/security.html

@@ -13,28 +13,19 @@
 </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> -->
-
+            <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>
@@ -43,20 +34,7 @@
                     <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>
@@ -67,7 +45,7 @@
                 <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> 页
+                    第 <input id="currentPage" type="text" size="1" value="1"> 页,共 <span id="totalPage">1</span> 页
                 </li>
                 <li id="nextPageButton" class="pg-next"></li>
                 <li id="lastPageButton" class="pg-last"></li>
@@ -77,56 +55,14 @@
             </ul>
         </div>
         <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
-                            15 </span>条记录,总共 <span id="dataTotal">
-                            46 </span>条
+                            1 </span>条记录,总共 <span id="dataTotal">
+                            1 </span>条
         </div>
     </div>
     <div class="pager no-data" style="display:none;text-align:right">
         暂无数据
     </div>
 
-
-
-
-    <!-- 安全机制新增 -->
-    <!-- <div class="xcConfirm 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">
@@ -158,10 +94,7 @@
                             <option value="0">未启动</option>
                             <option value="1">启动</option>
                         </select>
-                        <!-- <input name="status" type="text"> -->
                     </div>
-
-
                 </div>
                 <div class="btnArea">
                     <div class="btnGroup">
@@ -170,12 +103,9 @@
                     </div>
                 </div>
             </form>
-
         </div>
     </div>
 
-
-
     <script src="../js/jquery.js"></script>
     <script src="../js/util.js"></script>
     <script src="../layui/layui.js"></script>
@@ -184,8 +114,6 @@
     <script src="../js/main.js"></script>
     <script src="../js/security.js"></script>
 
-
-
 </body>
 
 </html>

+ 4 - 55
system-manage/system-info.html

@@ -10,25 +10,22 @@
     <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 style="width:24px;">
                     </th>
                     <th>系统名称</th>
                     <th>logo</th>
@@ -42,36 +39,6 @@
             </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>
@@ -82,7 +49,7 @@
                 <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> 页
+                    第 <input id="currentPage" type="text" size="1" value="1"> 页,共 <span id="totalPage">1</span> 页
                 </li>
                 <li id="nextPageButton" class="pg-next"></li>
                 <li id="lastPageButton" class="pg-last"></li>
@@ -92,8 +59,8 @@
             </ul>
         </div>
         <div class="pager-right  flex1 align-right">显示第 <span id="pageFrom"> 1 </span> 条到 <span id="pageTo">
-                15 </span>条记录,总共 <span id="dataTotal">
-                46 </span>条
+                1 </span>条记录,总共 <span id="dataTotal">
+                1 </span>条
         </div>
     </div>
     <div class="pager no-data" style="display:none;text-align:right">
@@ -117,7 +84,6 @@
                     <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>
@@ -143,7 +109,6 @@
                     </div>
                 </div>
             </form>
-
         </div>
     </div>
 
@@ -157,7 +122,6 @@
             </div>
             <form action="" id="editystemFormBox">
                 <div class="txtBox">
-
                     <div>
                         <span>系统名称:<i class="necessary">*</i></span>
                         <input name="systemName" type="text">
@@ -197,23 +161,14 @@
                         <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">
@@ -222,19 +177,13 @@
                     </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>