فهرست منبع

Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

minitiger 8 سال پیش
والد
کامیت
4b70cffc2a

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

@@ -85,7 +85,7 @@ fieldset[disabled] .btn-primary:hover {
     width: 263px;
     height: 200px;
     top: 29%;
-    right: 11.5%;
+    right: 13.5%;
     border-radius: 5px;
 }
 

BIN
VisualInspection/images/login/bg.png


BIN
VisualInspection/images/logo_name1.png


+ 4 - 175
VisualInspection/index.html

@@ -3,186 +3,15 @@
 
 <head>
     <meta charset="utf-8">
-    <title>fkjkfis</title>
+    <title>沿海高速视频稽查系统</title>
     <link rel="stylesheet" type="text/css" href="css/style.css">
 
 </head>
 
 <body>
-    <link rel="import" href="view/common/head.html?__inline">
-    <div class="main">
-
-        <ul class="nav nav-tabs">
-            <li class="active"><a data-tab href="#tabContent1">标签1</a></li>
-            <li><a data-tab href="#tabContent2">标签2</a></li>
-            <li><a data-tab href="#tabContent3">标签3</a></li>
-        </ul>
-        <div class="tab-content">
-            <div class="tab-pane active" id="tabContent1">
-                <link rel="import" href="view/user/aa.html?__inline">
-            </div>
-            <div class="tab-pane" id="tabContent2">
-                <p>标签2的内容。</p>
-            </div>
-            <div class="tab-pane" id="tabContent3">
-                <p>这是标签3的内容。</p>
-            </div>
-        </div>
-
-
-
-
-        <!--前端领域语言能力扩展示例-->
-
-        <h4>在html中定位资源</h4>
-        <blockquote>详情请查看源码以及编译后的代码</blockquote>
-
-        <!--源码:
-        <img title="百度logo" src="images/logo.gif"/>
-
-        编译后-->
-        <img title="百度logo" src="images/user/logo.gif" />
-
-        <!--源码:
-        <link rel="stylesheet" type="text/css" href="demo.css">
-
-        编译后-->
-        <link rel="stylesheet" type="text/css" href="css/demo.css">
-
-        <!--源码:
-        <script type="text/javascript" src="demo.js"></script>
-
-        编译后-->
-        <!--<script type="text/javascript" src="js/demo.js"></script>-->
-
-
-
-
-
-
-        <h4>在html中嵌入资源</h4>
-        <blockquote>详情请查看源码以及编译后的代码</blockquote>
-
-        <!--源码:
-        <img title="百度logo" src="images/logo.gif?__inline"/>
-
-        编译后-->
-        <img title="百度logo" src="images/user/logo.gif?__inline" />
-
-        <!--源码:
-        <link rel="stylesheet" type="text/css" href="demo.css?__inline">
-
-        编译后-->
-        <link rel="stylesheet" type="text/css" href="css/demo.css?__inline">
-
-        <!--源码:
-        <script type="text/javascript" src="demo.js?__inline"></script>
-
-        编译后-->
-        <!--<script type="text/javascript" src="js/demo.js?__inline"></script>-->
-
-
-
-
-
-
-        <h4>在javascript中定位资源</h4>
-        <blockquote>详情请查看源码以及编译后的代码</blockquote>
-
-        <!--源码:
-        <script type="text/javascript">
-            var img = __uri('images/logo.gif');
-            var css = __uri('demo.css');
-            var js = __uri('demo.js');
-        </script>
-
-        编译后-->
-        <script type="text/javascript">
-            var img = __uri('images/user/logo.gif');
-            var css = __uri('css/demo.css');
-            // var js = __uri('js/demo.js');
-        </script>
-
-
-
-
-
-
-        <h4 id="aa">在javascript中嵌入资源</h4>
-        <blockquote>详情请查看源码以及编译后的代码</blockquote>
-
-        <!--源码:
-        <script type="text/javascript">
-            __inline('demo.js');
-            var img = __inline('images/logo.gif');
-        </script>
-
-        编译后-->
-        <script type="text/javascript">
-            $("#aa").html("sdfsdf")
-
-            // __inline('js/demo.js');
-            var img = __inline('images/user/logo.gif');
-        </script>
-
-
-
-
-
-
-        <h4>在css中定位资源</h4>
-        <blockquote>详情请查看源码以及编译后的代码</blockquote>
-
-        <!--源码:
-        <style>
-            @import url('demo.css');
-            .style {
-                background: url('images/body-bg.png');
-                _filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/body-bg.png');
-            }
-        </style>
-
-        编译后-->
-        <style>
-            @import url('css/demo.css');
-            .style {
-                background: url('images/body-bg.png');
-                _filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/body-bg.png');
-            }
-        </style>
-
-
-
-
-
-
-        <h4>在css中嵌入资源</h4>
-        <blockquote>详情请查看源码以及编译后的代码</blockquote>
-
-        <!--源码:
-        <style>
-            @import url('demo.css?__inline');
-            .style {
-                background: url('images/logo.gif?__inline');
-                /*filter不支持base64,所以没做处理*/
-                _filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/body-bg.png?__inline');
-            }
-        </style>
-
-        编译后-->
-        <style>
-            @import url('css/demo.css?__inline');
-            .style {
-                background: url('images/user/logo.gif?__inline');
-                /*filter不支持base64,所以没做处理*/
-                _filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/body-bg.png?__inline');
-            }
-        </style>
-
-
-    </div>
-
-
+    <script type="text/javascript">
+        window.location = "http://" + window.location.host + "/view/user/login.html"
+    </script>
 </body>
 
 </html>

+ 102 - 94
VisualInspection/js/lib/kkpager_green.css

@@ -1,114 +1,122 @@
-#kkpager{
-	clear:both;
-	color:#999;
-	padding:5px 0px 5px 0px;
-	font-size:13px;
-}
-#kkpager a{
-	float: left;
-	border: 1px solid #ccc;
-	display: inline;
-	padding: 3px 10px 3px 10px;
-	margin-right: 5px;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	cursor: pointer;
-	background: #fff;
-	text-decoration:none;
-	color:#999;
+#kkpager {
+    clear: both;
+    color: #999;
+    padding: 5px 0px 5px 0px;
+    font-size: 13px;
 }
 
-#kkpager span.disabled{
-	float: left;
-	display: inline;
-	padding: 3px 10px 3px 10px;
-	margin-right: 5px;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border:1px solid #DFDFDF;
-	background-color:#FFF;
-	color:#DFDFDF;
+#kkpager a {
+    float: left;
+    border: 1px solid #ccc;
+    display: inline;
+    padding: 3px 10px 3px 10px;
+    margin-right: 5px;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    cursor: pointer;
+    background: #fff;
+    text-decoration: none;
+    color: #999;
 }
-#kkpager span.curr{
-	float: left;
-	border: 1px solid #3CC19F;
-	display: inline;
-	padding: 3px 10px 3px 10px;
-	margin-right: 5px;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	background: #F0FDFF;
-	color: #3CC19F;
+
+#kkpager span.disabled {
+    float: left;
+    display: inline;
+    padding: 3px 10px 3px 10px;
+    margin-right: 5px;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border: 1px solid #DFDFDF;
+    background-color: #FFF;
+    color: #DFDFDF;
 }
-#kkpager a:hover{
-	border:1px solid #3CC19F; 
-	background-color:#3CC19F; 
-	color:#fff;
+
+#kkpager span.curr {
+    float: left;
+    border: 1px solid #146CC0;
+    display: inline;
+    padding: 3px 10px 3px 10px;
+    margin-right: 5px;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    background: #d3dbf9;
+    color: #146CC0;
 }
-#kkpager span.normalsize{
+
+#kkpager a:hover {
+    border: 1px solid #146CC0;
+    background-color: #146CC0;
+    color: #fff;
 }
-#kkpager_gopage_wrap{
-	position:relative;
-	left:0px;
-	top:0px;
+
+#kkpager span.normalsize {}
+
+#kkpager_gopage_wrap {
+    position: relative;
+    left: 0px;
+    top: 0px;
 }
+
 #kkpager_btn_go {
-	width:44px;
-	height:18px;
-	border:0px;
-	overflow:hidden;
-	line-height:140%;
-	padding:0px;
-	margin:0px;
-	text-align:center;
-	cursor:pointer;
-	background-color:#3CC19F;
-	color:#FFF;
-	position:absolute;
-	left:0px;
-	top:-2px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	display:none;
+    width: 44px;
+    height: 18px;
+    border: 0px;
+    overflow: hidden;
+    line-height: 140%;
+    padding: 0px;
+    margin: 0px;
+    text-align: center;
+    cursor: pointer;
+    background-color: #146CC0;
+    color: #FFF;
+    position: absolute;
+    left: 0px;
+    top: -2px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    display: none;
 }
-#kkpager_btn_go_input{
-	width:36px;
-	/* height:14px; */
-	color:#999;
-	text-align:center;
-	margin-left:1px;
-	margin-right:1px;
-	border:1px solid #DFDFDF;
-	position:relative;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	left:0px;
-	top:0px;
-	outline:none;
+
+#kkpager_btn_go_input {
+    width: 36px;
+    /* height:14px; */
+    color: #999;
+    text-align: center;
+    margin-left: 1px;
+    margin-right: 1px;
+    border: 1px solid #DFDFDF;
+    position: relative;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    left: 0px;
+    top: 0px;
+    outline: none;
 }
 
-#kkpager_btn_go_input.focus{
-	border-color:#3CC19F;
+#kkpager_btn_go_input.focus {
+    border-color: #146CC0;
 }
 
-#kkpager .pageBtnWrap{
-	float:left;
+#kkpager .pageBtnWrap {
+    float: left;
 }
-#kkpager .infoTextAndGoPageBtnWrap{
-	float:right;
+
+#kkpager .infoTextAndGoPageBtnWrap {
+    float: right;
 }
-#kkpager .spanDot{
-	float:left;
-	margin-right:5px;
+
+#kkpager .spanDot {
+    float: left;
+    margin-right: 5px;
 }
 
-#kkpager .currPageNum{
-	color:#3CC19F;
+#kkpager .currPageNum {
+    color: #146CC0;
 }
 
-#kkpager .infoTextAndGoPageBtnWrap{
-	padding-top:5px;
+#kkpager .infoTextAndGoPageBtnWrap {
+    padding-top: 5px;
 }

+ 14 - 0
VisualInspection/js/main.js

@@ -1,4 +1,5 @@
 var MENU;
+var myTree;
 
 //计算左面的
 $(document).ready(function() {
@@ -18,6 +19,19 @@ $(document).ready(function() {
             // $("#main_content").html(getPageInfo(this.id));
     });
 
+
+    $('#treeMenu').on('expand.zui.tree', function($li) {
+        myTree = $('#treeMenu').data('zui.tree');
+        var c_s = myTree.$[0].children
+
+        for (var i = 0; i < c_s.length; i++) {
+            if ($(myTree.$[0].children[i]).attr("data-idx") == $li.attr("data-idx")) continue;
+            myTree.collapse($(c_s[i]))
+        }
+
+        // myTree.expand($li)
+    });
+
     //获取用户信息
     var user = $.zui.store.get("user")
     if (user == null || typeof(user) == "undefined") {

+ 181 - 172
VisualInspection/js/menu/menu.js

@@ -1,207 +1,216 @@
-function initMenu(){
+function initMenu() {
 
     //  $("#main_content_title").html("菜单管理")
 
-     $('#dashboard').dashboard({ draggable: true });
-     var zTreeObj;
-     var zNodes = [];
-     menu_tree = $.fn.zTree.init($("#menu_tree"), {}, zNodes);
-     getMenu();
-     $("#dept_add").on("click", function() {
-         var nodedata = menu_tree.getSelectedNodes();
-         edittype = "add"
-         loadData(nodedata)
-         $('#addModal').modal('show')
-     })
-
-     $("#dept_edit").on("click", function() {
-         //获取选中的节点
-         var nodedata = menu_tree.getSelectedNodes();
-         if (nodedata.length < 1) {
-             layer.msg('请先选择部门!', {
-                 time: 2000, //20s后自动关闭
-             });
-             return;
-         }
-         edittype = "edit"
-         loadData(nodedata)
-         $('#addModal').modal('show');
-     });
-
-     $("#dept_delete").on("click", function() {
-         //获取选中的节点
-         var nodedata = menu_tree.getSelectedNodes();
-         if (nodedata.length < 1) {
-             layer.msg('请先选择部门!', {
-                 time: 2000, //20s后自动关闭
-             });
-             return;
-         }
-         DeptDelete(nodedata[0].id, function(data) {
-             layer.msg('删除成功!', {
-                 time: 2000, //20s后自动关闭
-             });
-             menu_tree.removeNode(nodedata[0]);
-         }, function(error) {
-
-         });
-     });
- }
+    $('#dashboard').dashboard({ draggable: true });
+    var zTreeObj;
+    var zNodes = [];
+    menu_tree = $.fn.zTree.init($("#menu_tree"), {}, zNodes);
+    getMenu();
+    $("#dept_add").on("click", function() {
+        var nodedata = menu_tree.getSelectedNodes();
+        edittype = "add"
+        loadData(nodedata)
+        $('#addModal').modal('show')
+    })
+
+    $("#dept_edit").on("click", function() {
+        //获取选中的节点
+        var nodedata = menu_tree.getSelectedNodes();
+        if (nodedata.length < 1) {
+            layer.msg('请先选择部门!', {
+                time: 2000, //20s后自动关闭
+            });
+            return;
+        }
+        edittype = "edit"
+        loadData(nodedata)
+        $('#addModal').modal('show');
+    });
+
+    $("#dept_delete").on("click", function() {
+        //获取选中的节点
+        var nodedata = menu_tree.getSelectedNodes();
+        if (nodedata.length < 1) {
+            layer.msg('请先选择部门!', {
+                time: 2000, //20s后自动关闭
+            });
+            return;
+        }
+        DeptDelete(nodedata[0].id, function(data) {
+            layer.msg('删除成功!', {
+                time: 2000, //20s后自动关闭
+            });
+            menu_tree.removeNode(nodedata[0]);
+        }, function(error) {
+
+        });
+    });
+}
 
 function getMenu() {
-     function zTreeOnRename(event, treeId, treeNode, isCancel) {
-         alert(treeNode.tId + ", " + treeNode.name);
-     }
-
-     function zTreeOnRemove(event, treeId, treeNode) {
-         alert(treeNode.tId + ", " + treeNode.name);
-     }
-
-
-     var setting = {
-         data: {
-             simpleData: {
-                 enable: true,
-                 idKey: "id",
-                 pIdKey: "pId",
-                 rootPId: null
-             }
-         },
-         view: { //表示tree的显示状态
-             selectMulti: false //表示禁止多选
-         },
-         check: { //表示tree的节点在点击时的相关设置
-             enable: false, //是否显示radio/checkbox
-             chkStyle: "checkbox", //值为checkbox或者radio表示
-             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
-             radioType: "level" //设置tree的分组
-         },
-         callback: {
-             onClick: zTreeOnClick
-         },
-         edit: {
-             enable: true,
-             drag: {
-                 autoExpandTrigger: true,
-                 isMove: true,
-                 prev: false,
-                 next: true,
-                 inner: true,
-                 autoOpenTime: 0
-             },
-             showRenameBtn: false,
-             showRemoveBtn: false
-         }
-     };
-
-     get_common_service('menu/get/all?judge=1',null,function(data) {
-         zdata = [];
-         for (var i = 0; i < data.length; i++) {
-             var m = data[i];
-             var zdataItem = {};
-             zdataItem["id"] = m.id;
-             zdataItem["value"] = m.id;
-             zdataItem["pId"] = null;
-             zdataItem["name"] = m.menuname;
-             zdataItem["children"] = addobj(m);
-             zdata.push(zdataItem);
-         }
-         menu_tree = $.fn.zTree.init($("#menu_tree"), setting, zdata)
-     }, function(error) {
-
-     });
- }
+    function zTreeOnRename(event, treeId, treeNode, isCancel) {
+        alert(treeNode.tId + ", " + treeNode.name);
+    }
+
+    function zTreeOnRemove(event, treeId, treeNode) {
+        alert(treeNode.tId + ", " + treeNode.name);
+    }
+
+
+    var setting = {
+        data: {
+            simpleData: {
+                enable: true,
+                idKey: "id",
+                pIdKey: "pId",
+                rootPId: null
+            }
+        },
+        view: { //表示tree的显示状态
+            selectMulti: false //表示禁止多选
+        },
+        check: { //表示tree的节点在点击时的相关设置
+            enable: false, //是否显示radio/checkbox
+            chkStyle: "checkbox", //值为checkbox或者radio表示
+            checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+            radioType: "level" //设置tree的分组
+        },
+        callback: {
+            onClick: zTreeOnClick
+        },
+        edit: {
+            enable: true,
+            drag: {
+                autoExpandTrigger: true,
+                isMove: true,
+                prev: false,
+                next: true,
+                inner: true,
+                autoOpenTime: 0
+            },
+            showRenameBtn: false,
+            showRemoveBtn: false
+        }
+    };
+
+    get_common_service('menu/get/all?judge=1', null, function(data) {
+        zdata = [];
+        for (var i = 0; i < data.length; i++) {
+            var m = data[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["value"] = m.id;
+            zdataItem["pId"] = null;
+            zdataItem["name"] = m.menuname;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+        }
+        menu_tree = $.fn.zTree.init($("#menu_tree"), setting, zdata)
+    }, function(error) {
+
+    });
+}
 
 function addobj(data) {
-     var zdata = [];
-     if (typeof(data.childs) != "undefinde" && data.childs != null &&
-         data.childs.length > 0) {
-         for (var i = 0; i < data.childs.length; i++) {
-             var m = data.childs[i];
-             var zdataItem = {};
-             zdataItem["id"] = m.id;
-             zdataItem["value"] = m.id;
-             zdataItem["pId"] = data.id;
-             zdataItem["icon"] = "";
-             zdataItem["name"] = m.menuname;
-             zdataItem["children"] = addobj(m);
-             zdata.push(zdataItem);
-         }
-         return zdata;
-     } else {
-         return [];
-     }
- }
+    var zdata = [];
+    if (typeof(data.childs) != "undefinde" && data.childs != null &&
+        data.childs.length > 0) {
+        for (var i = 0; i < data.childs.length; i++) {
+            var m = data.childs[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["value"] = m.id;
+            zdataItem["pId"] = data.id;
+            zdataItem["icon"] = "";
+            zdataItem["name"] = m.menuname;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+        }
+        return zdata;
+    } else {
+        return [];
+    }
+}
 var curTreeNode;
-function zTreeOnClick(event, treeId, treeNode){
+
+function zTreeOnClick(event, treeId, treeNode) {
     // alert(treeNode.id);
-    curTreeNode=treeNode;
+    curTreeNode = treeNode;
     queryMenu(treeNode.id);
 }
-function refresh(){
+
+function refresh() {
     // alert(treeNode.id);
     getMenu();
-     $('.datatable').mytable('empty');
+    $('.datatable').mytable('empty');
     //queryMenu(curTreeNode.id);
 }
-function queryMenu(id){
+
+function queryMenu(id) {
     var data = {
         "pid": id
     }
     var cols = [
-                {width: 80, text: '菜单名称', type: 'number', flex: false, field: 'menuname'},
-                {width: 160, text: '地址', type: 'string', flex: false, field: 'url'},
-                // {width: 80, text: '字典名称', type: 'string', flex: true, field: 'parentId'},
-                {width: 60, text: '图标', type: 'string', flex: false, field: 'iconClass'},
-                {width: 50, text: '类型', type: 'string', flex: false, field: 'type'},
-                {width: 50, text: '排序号', type: 'number', flex: false, field: 'sortNo'},
-                {width: 60, text: '操作', type: 'string', flex: false, field: 'id',
-                    oper:[
-                        {func:'showEditMenu',text:'修改',icon_class:'icon-edit'},
-                        {func:'deleteMenu',text:'删除',icon_class:'icon-remove-circle'}
-                    ]
-                }
-            ];
-    $('.datatable').mytable({'cols':cols,
-                            'url':"/menu/getMenuByParent/"+id+"/",
-                            'param':data}
-                            );
+        { width: 80, text: '菜单名称', type: 'number', flex: false, field: 'menuname' },
+        { width: 160, text: '地址', type: 'string', flex: false, field: 'url' },
+        // {width: 80, text: '字典名称', type: 'string', flex: true, field: 'parentId'},
+        { width: 60, text: '图标', type: 'string', flex: false, field: 'iconClass' },
+        { width: 50, text: '类型', type: 'string', flex: false, field: 'type' },
+        { width: 50, text: '排序号', type: 'number', flex: false, field: 'sortNo' },
+        {
+            width: 60,
+            text: '操作',
+            type: 'string',
+            flex: false,
+            field: 'id',
+            oper: [
+                { func: 'showEditMenu', text: '修改', icon_class: 'icon-edit' },
+                { func: 'deleteMenu', text: '删除', icon_class: 'icon-remove-circle' }
+            ]
+        }
+    ];
+    $('.datatable').mytable({
+        'cols': cols,
+        'url': "/menu/getMenuByParent/" + id + "/",
+        'param': data
+    });
 }
 
-function showAddMenu(){
+function showAddMenu() {
     $('#menuname').val('');
     $('#url').val('');
-    if(curTreeNode)
+    if (curTreeNode)
         $('#parentId').val(curTreeNode.id)
     else
         $('#parentId').val('');
     $('#iconClass').val('');
     $('#type').val('');
     $('#sortNo').val('');
-    showPopup4Common('添加菜单',function(){
+    showPopup4Common('添加菜单', function() {
         addOrUpdateConstant("/menu/addMenu/");
-    },'400px');
+    }, '400px');
 }
 // var cur_id;
-function addOrUpdateConstant(url){
-    var valid=1;
-    if(!$("#valid").is(':checked')) valid=0;
-    var param ={
+function addOrUpdateConstant(url) {
+    var valid = 1;
+    if (!$("#valid").is(':checked')) valid = 0;
+    var param = {
         // 'id':cur_id,
-        'menuname':$('#menuname').val(),
-        'url':$('#url').val(),
-        'parentId':$('#parentId').val(),
-        'iconClass':$('#iconClass').val(),
-        'type':$('#type').val(),
-        'sortNo':$('#sortNo').val()
+        'menuname': $('#menuname').val(),
+        'url': $('#url').val(),
+        'parentId': $('#parentId').val(),
+        'iconClass': $('#iconClass').val(),
+        'type': $('#type').val(),
+        'sortNo': $('#sortNo').val()
     };
-    addOrUpdateItem4Common(param,url,refresh);
+    addOrUpdateItem4Common(param, url, refresh);
 }
 
-function showEditMenu(id){
+function showEditMenu(id) {
     // cur_id='';
-    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
-    if(rowData) {
+    var rowData = getItemByIdFromArr(id, $('.datatable').mytable('getTableData'));
+    if (rowData) {
         // cur_id = rowData.id;
         $('#menuname').val(rowData.menuname);
         $('#url').val(rowData.url);
@@ -214,12 +223,12 @@ function showEditMenu(id){
         // }else{
         //     $("#valid").attr('checked','false');
         // }
-        showPopup4Common('修改菜单',function(){
-            addOrUpdateConstant("/menu/updateMenu/"+id);
-        },'400px');
+        showPopup4Common('修改菜单', function() {
+            addOrUpdateConstant("/menu/updateMenu/" + id);
+        }, '400px');
     }
 }
 
-function deleteMenu(id){
-    deleteItem4Common(id,"/menu/deleteMenu/"+id+"",refresh);
+function deleteMenu(id) {
+    deleteItem4Common(id, "/menu/deleteMenu/" + id + "", refresh);
 }

+ 1 - 1
VisualInspection/js/statistics/assess_ranking.js

@@ -192,7 +192,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
                 html = "";
                 if (hasRole(ROLE_JICHA_ADMIN) || hasRole(ROLE_ADMIN) || hasRole(ROLE_ROAD_MANAGER)) {
                     isshownumber = true;
-                    if (hasRole(ROLE_JICHA_ADMIN)) {
+                    if (hasRole(ROLE_JICHA_ADMIN) || hasRole(ROLE_ADMIN)) {
                         html += "<button id=\"user_" + data[i].user.id + "\" onClick='addTask(" + data[i].user.id + ",\"" + data[i].user.truename + "\",\"" + data[i].user.fee_station_name + "\",\"" + data[i].checked_num + "\",\"" + param.start_date + "\",\"" + param.end_date + "\")'  class=\"btn\" style='margin-left: 10px;padding: 0px;border: 0;background: none;' type=\"button\"><i class=\"icon icon-plus-sign\"></i></button>"
                     }
                 }

+ 6 - 2
VisualInspection/js/statistics/check_workload_statistics.js

@@ -87,7 +87,7 @@ $(function() {
             { width: 60, height: 60, text: '考核部门', flex: true, colClass: 'text-center', field: 'feeStationName' },
             { width: 40, height: 60, text: '扣分数', flex: true, colClass: 'text-center', field: 'score' },
             { width: 60, height: 60, text: '考核类型', flex: true, colClass: 'text-center', field: 'parent_name' },
-            { width: 60, height: 60, text: '考核完成时间', flex: true, colClass: 'text-center', field: 'update_time' },
+            { width: 60, height: 60, text: '考核提交时间', flex: true, colClass: 'text-center', field: 'update_time' },
             { width: 100, height: 60, text: '考核项', flex: true, colClass: 'text-center', field: 'name' },
             { width: 200, height: 60, text: '扣分凭证', type: 'imagedd', flex: true, field: 'pics' },
         ];
@@ -241,7 +241,11 @@ function jumptodetail(id) {
         $.zui.store.set('store_param_' + current_url, pdata);
 
         url = "/view/mytask/taskDetail.html"
-        changePage(url);
+
+        post_common_service("/checkAppeal/getByTaskId", { "task_id": id }, function(data) {
+            $.checkTask.appeal = data;
+            changePage(url);
+        });
     }, function(error) {
 
     });

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

@@ -4,7 +4,7 @@ $(document).ready(function() {
 
     //获取屏幕高
 
-    var bg_width = window.innerWidth * 0.25;
+    var bg_width = window.innerWidth * 0.22;
     var bg_height = bg_width;
     $("#bg").css("height", bg_height);
     $("#bg").css("width", bg_width);

+ 3 - 3
VisualInspection/view/common/head.html

@@ -1,11 +1,11 @@
 <div class="navbar-header navbar-inverse" style="width:100%;">
     <div class="container-fluid">
         <ul class="nav navbar-nav navbar-left">
-            <li>
+            <!-- <li>
                 <img src="/images/logo.png" />
-            </li>
+            </li> -->
             <li>
-                <img src="/images/logo_name.png" />
+                <img src="/images/logo_name1.png" />
             </li>
         </ul>
 

+ 3 - 3
VisualInspection/view/common/login_head.html

@@ -1,11 +1,11 @@
 <div class="navbar-header navbar-inverse" style="width:100%;background:none;">
     <div class="container-fluid">
         <ul class="nav navbar-nav navbar-left">
-            <li>
+            <!-- <li>
                 <img src="/images/logo.png" />
-            </li>
+            </li> -->
             <li>
-                <img src="/images/logo_name.png" />
+                <img src="/images/logo_name1.png" />
             </li>
         </ul>
 

+ 2 - 2
VisualInspection/view/statistics/check_workload_statistics.html

@@ -10,7 +10,7 @@
             <div class="name1" style="width:70px;"><span>稽查人员:</span></div>
             <div class="div-select"><select id="select-personal"></select></button>
             </div>
-            <div class="name1" style="width:70px;"><span>考核时间:</span></div>
+            <div class="name1" style="width:90px;"><span>考核提交时间:</span></div>
             <div class="div-start" style='margin-left:0px'><input placeholder="请选择考核开始时间"></input>
             </div>
             <div class="div-to"><label>-</label></div>
@@ -35,7 +35,7 @@
                 <td>总稽查时长</td>
                 <td>稽查扣分次数</td>
                 <td>考核人员数量</td>
-                <td>考核人员扣分数量</td>
+                <td>扣分人员数量</td>
                 <td>总扣分数</td>
             </tr>
             <tr>

+ 1 - 1
VisualInspection/view/user/login.html

@@ -31,7 +31,7 @@
                         <input id="password" type="password" class="form-control input_login" placeholder="密码">
                     </div>
                 </div>-->
-                <div class="row" style="text-align: center; margin-bottom: 39px;margin-top: 10px;font-size: 22px;">
+                <div class="row" style="text-align: center; margin-bottom: 30px;margin-top: 0px;font-size: 22px;">
                     <label style="    letter-spacing: 8px;">用户登录</label>
 
                 </div>

+ 4 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -535,6 +535,10 @@
 			<if test="score_flag!=null and score_flag == 0">
 				AND cs.check_item_score IS  NULL  
 			</if>
+
+         <if test="queryType!=null and queryType==1">
+            ORDER  BY cst.update_time desc
+         </if>
      </select>
      
       <select id="selectCheckManInfo" parameterType="com.xintong.visualinspection.bean.CheckmanStatisticsBean" resultType="com.xintong.visualinspection.bean.CheckmanStatisticsBean">