温红权 9 лет назад
Родитель
Сommit
cae5e88e53

+ 4 - 4
VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-var base_ui_url = "http://localhost:8080/";
-var base_server_url = "http://localhost:8089/";
+// var base_ui_url = "http://localhost:8080/";
+// var base_server_url = "http://localhost:8089/";
 
 
-// var base_ui_url = "http://192.168.31.233:8080/";
-// var base_server_url = "http://192.168.31.233:8089/";
+var base_ui_url = "http://192.168.31.233:8080/";
+var base_server_url = "http://192.168.31.233:8089/";

+ 26 - 44
VisualInspection/js/main.js

@@ -26,7 +26,7 @@ $(document).ready(function() {
         for (var i = 0; i < data.length; i++) {
             var menu = data[i];
             var datatemp = {}
-            datatemp["html"] = "<a class=\"p_m\" href=\"#\"><i class=\"icon icon-" + menu.iconClass + "\"></i>" + menu.menuname + "</a>";
+            datatemp["html"] = "<a  id=\"" + menu.id + "\" class=\"p_m\" href=\"#\"><i class=\"icon icon-" + menu.iconClass + "\"></i>" + menu.menuname + "</a>";
 
             datatemp["open"] = false;
             if (menu.childs.length > 0) {
@@ -54,13 +54,29 @@ $(document).ready(function() {
         MENU = data;
 
 
+
+        //获取当前页
+        var currentpage = 0;
+        currentpage = $.zui.store.get("currentpage");
+        if (typeof(currentpage) != undefined && currentpage != null) {
+            //改变页面
+            getPageInfo(currentpage);
+        }
+
+
     }, function(error) {
 
     });
 
+});
+
+function chageToPageUI(menu) {
+    $('#treeMenu').tree('expand', $("#" + menu.parentId).parent());
+    $('#treeMenu li.active').removeClass('active');
+    $("#" + menu.id).closest('li').addClass('active');
+}
 
 
-});
 
 function setletftime() {
     var height = window.innerHeight;
@@ -75,50 +91,15 @@ function setletftime() {
 
 
 function getPageInfo(id) {
-    var html = "";
-    // <<<<<<< HEAD
-    //     switch (id) {
-    //         case "1_1":
-    //             {
-    //                 html = __inline('/view/mytask/unchecked.html');
-    //                 break;
-    //             }
-    //         case "1_1_1":
-    //             {
-    //                 html = __inline('/view/mytask/check.html');
-    //                 break;
-    //             }
-    //          case "1_1_1_1":
-    //             {
-    //                 html = __inline('/view/mytask/preSubmit.html');
-    //                 break;
-    //             }
-    //         case "1_2":
-    //             {
-    //                 html = __inline('/view/mytask/unexamined.html');
-    //                 break;
-    //             }
-    //          case "1_3":
-    //             {
-    //                 html = __inline('/view/mytask/undispatched.html');
-    //                 break;
-    //             }
-    //          case "1_4":
-    //             {
-    //                 html = __inline('/view/mytask/dispatched.html');
-    //                 break;
-    //             }
-    //         case "7_5":
-    //             {
-    //                 html = __inline('/view/constant/constant.html');
-    //                 break;
-    // =======
-    if (typeof(MENU) != undefined && MENU != null) {
+    //设置当前页面
+    $.zui.store.set("currentpage", id);
+    if (typeof(MENU) != "undefined" && MENU != null) {
         for (var i = 0; i < MENU.length; i++) {
             var menu = MENU[i];
             if (menu.id == id) {
-                if (typeof(mtemp.url) != "undefined") {
-                    $("#main_content").load(base_ui_url + mtemp.url);
+                if (typeof(menu.url) != "undefined") {
+                    changePage(menu.url);
+                    chageToPageUI(menu)
                     return;
                 }
                 break;
@@ -128,7 +109,8 @@ function getPageInfo(id) {
                     var mtemp = menu.childs[j];
                     if (mtemp.id == id) {
                         if (typeof(mtemp.url) != "undefined") {
-                            $("#main_content").load(base_ui_url + mtemp.url);
+                            changePage(mtemp.url);
+                            chageToPageUI(mtemp)
                             return;
                         }
                         break;

+ 1 - 1
VisualInspection/js/user/login.js

@@ -13,7 +13,7 @@ $(document).ready(function() {
         }
         UserLogin(data, function(data) {
             $btn.button('reset');
-
+            $.zui.store.remove("currentpage");
             window.location.href = base_ui_url + "view/main.html"
 
         }, function(error) {

+ 86 - 24
VisualInspection/js/user/userManager.js

@@ -2,30 +2,92 @@ $(document).ready(function() {
 
     $("#main_content_title").html("用户管理")
 
-    var myTreeData = [{
-        title: '水果',
-        url: 'http://zui.sexy',
-        open: true,
-        children: [
-            { title: '橘子' },
-            {
-                title: '瓜',
-                children: [
-                    { title: '西瓜' },
-                    { title: '黄瓜' }
-                ]
-            }
-        ]
-    }, {
-        title: '坚果',
-        children: [
-            { title: '向日葵' },
-            { title: '瓜子' }
-        ]
-    }, {
-        title: '蔬菜'
-    }];
+    var zTreeObj;
+    // zTree 的参数配置,深入使用请参考 API 文档(setting 配置详解)
+    var setting = {};
+    // zTree 的数据属性,深入使用请参考 API 文档(zTreeNode 节点数据详解)
+    var zNodes = [{
+            name: "test1",
+            open: true,
+            children: [
+                { name: "test1_1" }, { name: "test1_2" }
+            ]
+        },
+        {
+            name: "test2",
+            open: true,
+            children: [
+                { name: "test2_1" }, { name: "test2_2" }
+            ]
+        }
+    ];
+    zTreeObj = $.fn.zTree.init($("#department_tree"), setting, zNodes);
 
-    $('#department_tree').tree({ data: myTreeData });
 
+
+    $('.datatable').datatable({
+        checkable: false,
+        sortable: false,
+        data: {
+            cols: [{
+                width: 30,
+                text: '序号',
+                type: 'number',
+                flex: false,
+                colClass: 'text-center'
+            }, {
+                width: 50,
+                text: '姓名',
+                type: 'date',
+                flex: false,
+                sort: 'down'
+            }, {
+                width: 30,
+                text: '工号',
+                type: 'string',
+                flex: true,
+                colClass: ''
+            }, {
+                width: 80,
+                text: '手机号',
+                type: 'date',
+                flex: false,
+                sort: 'down'
+            }, {
+                width: 80,
+                text: '角色',
+                type: 'string',
+                flex: true,
+                colClass: ''
+            }, {
+                width: 160,
+                text: '操作',
+                type: 'string',
+                flex: true,
+                colClass: ''
+            }],
+            rows: [{
+                checked: false,
+                data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+            }, {
+                checked: false,
+                data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+            }, {
+                checked: false,
+                data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+            }, {
+                checked: false,
+                data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+            }, {
+                checked: false,
+                data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+            }, {
+                checked: false,
+                data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+            }, {
+                checked: false,
+                data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+            }]
+        }
+    });
 });

+ 11 - 0
VisualInspection/js/util/util.js

@@ -90,6 +90,17 @@ function HandleError(error) {
 }
 
 
+function GetQueryString(name) {
+    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+    var r = window.location.search.substr(1).match(reg);
+
+    if (r != null) {
+        return unescape(r[2]);
+    }
+    return null;
+}
+
+
 // var ViewMap = new HashMap()
 // ViewMap.set("/view/mytask/unchecked.html", __inline('/view/mytask/unchecked.html'));
 // ViewMap.set("/view/mytask/unexamined.html", __inline('/view/mytask/unexamined.html'));

+ 1 - 0
VisualInspection/view/common/commoncsslink.html

@@ -1,5 +1,6 @@
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/css/zui.min.css">
 <link href="/node_modules/zui/dist/lib/datatable/zui.datatable.min.css" rel="stylesheet">
 <link href="/node_modules/sweetalert/dist/sweetalert.css" rel="stylesheet">
+<link rel="stylesheet" href="/node_modules/ztree/css/zTreeStyle/zTreeStyle.css" type="text/css">
 <link rel="stylesheet" type="text/css" href="/css/common/header.css">
 <link rel="stylesheet" type="text/css" href="/css/common/foot.css">

+ 101 - 58
VisualInspection/view/constant/constant.html

@@ -1,76 +1,119 @@
-    <div class="container-fluid ">
-        <div class="row">
-            <div class="col-xs-3">
-                <div class="input-group">
-                    <span class="input-group-addon">关键词</span>
-                    <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
-                </div>
-            </div>
-            
-            <div class="col-xs-3">
-                 <div class="input-group">
-                    <button class="btn btn-primary " type="button">查询</button>
-                 </div>
-            </div>
-            <div style="float:right;">
-                <button class="btn btn-success" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 添加</button>
+<div class="container-fluid ">
+    <div class="row">
+        <div class="col-xs-3">
+            <div class="input-group">
+                <span class="input-group-addon">关键词</span>
+                <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
             </div>
         </div>
-        <br>
 
-        <div class="row">
-             <!-- 使用一个div来显示数据表格 -->
-            <div class="datatable" data-checkable="true" data-sortable="true"></div 
+        <div class="col-xs-3">
+            <div class="input-group">
+                <button class="btn btn-primary " type="button">查询</button>
+            </div>
         </div>
-        <div class="row" style="text-align:center">
-            <ul class="pager center-block">
-                <li class="previous"><a href="#">« 上一页</a></li>
-                <li><a href="#">1</a></li>
-                <li class="active"><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li class="next"><a href="#">下一页 »</a></li>
-            </ul>
+        <div style="float:right;">
+            <button class="btn btn-success" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 添加</button>
         </div>
     </div>
-    <!-- 对话框HTML -->
-    <div class="modal fade" id="myModal">
+    <br>
+
+    <div class="row">
+        <!-- 使用一个div来显示数据表格 -->
+        <div class="datatable" data-checkable="true" data-sortable="true"></div>
+    </div>
+    <div class="row" style="text-align:center">
+        <ul class="pager center-block">
+            <li class="previous"><a href="#">« 上一页</a></li>
+            <li><a href="#">1</a></li>
+            <li class="active"><a href="#">2</a></li>
+            <li><a href="#">3</a></li>
+            <li><a href="#">4</a></li>
+            <li><a href="#">5</a></li>
+            <li class="next"><a href="#">下一页 »</a></li>
+        </ul>
+    </div>
+</div>
+<!-- 对话框HTML -->
+<div class="modal fade" id="myModal">
     <div class="modal-dialog">
         <div class="modal-content">
-            
+
         </div>
         <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-        <h4 class="modal-title">添加常量</h4>
-      </div>
-      <div class="modal-body">
-        <link rel="import" href="/view/constant/add.html?__inline">
-      </div>
-    </div>
-    </div>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                <h4 class="modal-title">添加常量</h4>
+            </div>
+            <div class="modal-body">
+                <link rel="import" href="/view/constant/add.html?__inline">
+            </div>
+        </div>
     </div>
+</div>
 <script>
     $(document).ready(function() {
         // 使用data参数更新数据:
-        $('.datatable').datatable( {
-            checkable:false,
-            sortable:false,
+        $('.datatable').datatable({
+            checkable: false,
+            sortable: false,
             data: {
-                cols: [
-                    {width: 80, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
-                    {width: 80, text: '代码编号', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '代码名称', type: 'string', flex: true, colClass: ''},
-                    {width: 80, text: '有效标志', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '代码标识', type: 'string', flex: true, colClass: ''},
-                    {width: 160, text: '标识名称', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '备注', type: 'string', flex: true, colClass: ''},
-                    {width: 160, text: '操作', type: 'string', flex: true, colClass: ''}
-                ],
-                rows: [
-                    {checked: false, data: [1, '1','上行','1','DIRECTION','方向','未稽查','<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [2, '2','下行','1','DIRECTION','方向','未稽查','<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                cols: [{
+                    width: 80,
+                    text: '序号',
+                    type: 'number',
+                    flex: false,
+                    colClass: 'text-center'
+                }, {
+                    width: 80,
+                    text: '代码编号',
+                    type: 'date',
+                    flex: false,
+                    sort: 'down'
+                }, {
+                    width: 80,
+                    text: '代码名称',
+                    type: 'string',
+                    flex: true,
+                    colClass: ''
+                }, {
+                    width: 80,
+                    text: '有效标志',
+                    type: 'date',
+                    flex: false,
+                    sort: 'down'
+                }, {
+                    width: 80,
+                    text: '代码标识',
+                    type: 'string',
+                    flex: true,
+                    colClass: ''
+                }, {
+                    width: 160,
+                    text: '标识名称',
+                    type: 'date',
+                    flex: false,
+                    sort: 'down'
+                }, {
+                    width: 80,
+                    text: '备注',
+                    type: 'string',
+                    flex: true,
+                    colClass: ''
+                }, {
+                    width: 160,
+                    text: '操作',
+                    type: 'string',
+                    flex: true,
+                    colClass: ''
+                }],
+                rows: [{
+                        checked: false,
+                        data: [1, '1', '上行', '1', 'DIRECTION', '方向', '未稽查', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+                    }, {
+                        checked: false,
+                        data: [2, '2', '下行', '1', 'DIRECTION', '方向', '未稽查', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
+                    },
                     // 更多数据
                 ]
             }

+ 3 - 3
VisualInspection/view/main.html

@@ -27,14 +27,14 @@
 
                     <div class="panel">
                         <div class="panel-heading" id="main_content_title">
-                            <ol class="breadcrumb" style="margin-bottom: 0;padding:0px;">
+                            <!--<ol class="breadcrumb" style="margin-bottom: 0;padding:0px;">
                                 <li><a href="your/url/">视频稽查</a></li>
                                 <li><a href="your/url/">已稽查</a></li>
                                 <li class="active">稽查详情</li>
-                            </ol>
+                            </ol>-->
                         </div>
                         <div class="panel-body" id="main_content">
-                            <link rel="import" href="/view/mytask/unchecked.html?__inline">
+                            <!--<link rel="import" href="/view/mytask/unchecked.html?__inline">-->
                         </div>
                     </div>
 

+ 0 - 64
VisualInspection/view/mum.html

@@ -1,69 +1,5 @@
 <link rel="stylesheet" type="text/css" href="/css/mum.css">
 <nav class="menu" data-ride="menu">
     <ul id="treeMenu" class="tree tree-menu" data-ride="tree">
-
-        <li>
-            <a class="p_m" href="#"><i class="icon icon-time"></i>我的任务</a>
-            <ul>
-                <li><a id="1_1" href="#"><i class="icon">·</i>待稽查任务</a></li>
-                <li><a id="1_2" href="#"><i class="icon">·</i>待审核任务</a></li>
-                <li><a id="1_3" href="#"><i class="icon">·</i>待发放任务</a></li>
-                <li><a id="1_4" href="#"><i class="icon">·</i>已发放任务</a></li>
-            </ul>
-        </li>
-        <li>
-            <a class="p_m" href="#"><i class="icon icon-time"></i>考核办法管理</a>
-            <ul>
-                <li><a id="2_1" href="#"><i class="icon">·</i>考核办法管理</a></li>
-            </ul>
-        </li>
-
-        <li>
-            <a class="p_m" href="#"><i class="icon icon-time"></i>排班管理</a>
-            <ul>
-                <li><a id="3_1" href="#"><i class="icon">·</i>稽查人员排班</a></li>
-                <li><a id="3_2" href="#"><i class="icon">·</i>收费人员排班</a></li>
-                <li><a id="3_3" href="#"><i class="icon">·</i>稽查人员班组管理</a></li>
-                <li><a id="3_4" href="#"><i class="icon">·</i>收费人员班组管理</a></li>
-            </ul>
-        </li>
-        <li>
-            <a class="p_m" href="#"><i class="icon icon-time"></i>申诉管理</a>
-            <ul>
-                <li><a id="4_1" href="#"><i class="icon">·</i>稽查人员排班</a></li>
-                <li><a id="4_2" href="#"><i class="icon">·</i>收费人员排班</a></li>
-                <li><a id="4_3" href="#"><i class="icon">·</i>稽查人员班组管理</a></li>
-                <li><a id="4_4" href="#"><i class="icon">·</i>收费人员班组管理</a></li>
-            </ul>
-        </li>
-        <li>
-            <a class="p_m" href="#"><i class="icon icon-time"></i>稽查管理</a>
-            <ul>
-                <li><a id="5_1" href="#"><i class="icon">·</i>稽查人员排班</a></li>
-                <li><a id="5_2" href="#"><i class="icon">·</i>收费人员排班</a></li>
-                <li><a id="5_3" href="#"><i class="icon">·</i>稽查人员班组管理</a></li>
-                <li><a id="5_4" href="#"><i class="icon">·</i>收费人员班组管理</a></li>
-            </ul>
-        </li>
-        <li>
-            <a class="p_m" href="#"><i class="icon icon-time"></i>统计查询</a>
-            <ul>
-                <li><a id="6_1" href="#"><i class="icon">·</i>稽查人员排班</a></li>
-                <li><a id="6_2" href="#"><i class="icon">·</i>收费人员排班</a></li>
-                <li><a id="6_3" href="#"><i class="icon">·</i>稽查人员班组管理</a></li>
-                <li><a id="6_4" href="#"><i class="icon">·</i>收费人员班组管理</a></li>
-            </ul>
-        </li>
-        <li>
-            <a class="p_m" href="#"><i class="icon icon-time"></i>基础信息管理</a>
-            <ul>
-                <li><a id="7_1" href="#"><i class="icon">·</i>用户管理</a></li>
-                <li><a id="7_2" href="#"><i class="icon">·</i>角色管理</a></li>
-                <li><a id="7_3" href="#"><i class="icon">·</i>权限管理</a></li>
-                <li><a id="7_4" href="#"><i class="icon">·</i>菜单管理</a></li>
-                <li><a id="7_5" href="#"><i class="icon">·</i>常量管理</a></li>
-            </ul>
-        </li>
-
     </ul>
 </nav>

+ 4 - 8
VisualInspection/view/user/userManager.html

@@ -4,11 +4,10 @@
         <div class="col-md-3">
             <div class="panel" data-id="1">
                 <div class="panel-heading">
-                    <i class="icon icon-list"></i>
-                    <span class="title">面板标题</span>
+                    <span class="title">部门列表</span>
                 </div>
                 <div class="panel-body">
-                    <ul id="department_tree" class="tree tree-lines" data-animate="true" data-ride="tree">
+                    <ul id="department_tree" class="ztree">
 
                     </ul>
                 </div>
@@ -18,13 +17,10 @@
         <div class="col-md-9">
             <div class="panel" data-id="3">
                 <div class="panel-heading">
-                    <i class="icon icon-table"></i>
-                    <span class="title">包含表格</span>
+                    <span class="title">人员详情</span>
                 </div>
                 <div class="panel-body no-padding">
-                    <table class="table">
-                        ...
-                    </table>
+                    <div class="datatable" data-checkable="true" data-sortable="true"></div>
                 </div>
             </div>