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

VisualInspection/css/user/addUser.css

@@ -1,10 +1,11 @@
-.ll{
+.ll {
     width: 120px;
 }
 
-.lll{
+.lll {
     padding-right: 0px;
 }
+
 .cc {
     padding-left: 20px;
 }

VisualInspection/js/main.js

@@ -1,7 +1,8 @@
 var MENU;
+
 //计算左面的
 $(document).ready(function() {
-
+    initUserinfo();
 
     setletftime();
     getServerTime();
@@ -48,6 +49,13 @@ $(document).ready(function() {
         });
     });
 
+    $("#update_user").on("click", function() {
+        edittype = "update"
+        user = $.zui.store.get("user")
+        loadUserData(user)
+        $('#updateUserModal').modal('show')
+    })
+
 
 
     MenuGetAll(function(data) {
@@ -105,6 +113,71 @@ $(document).ready(function() {
 
 });
 
+
+var roles = [];
+var zdata = [];
+
+function initUserinfo() {
+
+    getJob();
+
+    RoleGetALLNoData(function(data) {
+
+        roles = [];
+        for (var i = 0; i < data.length; i++) {
+            var m = data[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["title"] = m.des;
+            roles.push(zdataItem);
+        }
+    }, function(error) {
+
+    });
+
+    DeptGetAll(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.organname;
+            zdataItem["open"] = true;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+        }
+        // dept_tree = $.fn.zTree.init($("#department_tree"), setting, zdata)
+    }, function(error) {
+
+    });
+
+}
+
+function addobj(data) {
+    var zdata = [];
+    if (typeof(data.childs) != "undefined" && 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["open"] = true;
+            zdataItem["name"] = m.organname;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+        }
+        return zdata;
+    } else {
+        return [];
+    }
+}
+
+
 function chageToPageUI(menu) {
     $('#treeMenu').tree('expand', $("#" + menu.parentId).parent());
     $('#treeMenu li.active').removeClass('active');
@@ -170,10 +243,10 @@ function changePage(url, tableObj) {
     // console.log(pre_param);
     if (typeof(url) != "undefined") {
         //记住表格当前页
-        if(tableObj){
-            var data_param = $.zui.store.get('store_param_'+current_url);
-            if(data_param) data_param.currentpage=tableObj.options.pager.p_cur;
-            $.zui.store.set('store_param_'+current_url,data_param);
+        if (tableObj) {
+            var data_param = $.zui.store.get('store_param_' + current_url);
+            if (data_param) data_param.currentpage = tableObj.options.pager.p_cur;
+            $.zui.store.set('store_param_' + current_url, data_param);
         }
 
         CURRENT_PAGE_URL = url;

VisualInspection/js/statistics/appeal.js

@@ -242,7 +242,12 @@ 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) {
 
     });

VisualInspection/js/statistics/personal_data_statistics.js

@@ -98,15 +98,15 @@ $(function() {
                 if (p_c.fee_station_ranking != undefined && p_l.fee_station_ranking != undefined) {
                     var dept_r = p_c.fee_station_ranking - p_l.fee_station_ranking;
                     if (dept_r != 0) {
-                        $("#c_dept_ranking").html($("#c_dept_ranking").html() + "<i style='margin-left:10px;color:" + (dept_r > 0 ? "red" : "green") + "' class='icon icon-long-arrow-" + (dept_r > 0 ? "down" : "up") + "'>" + Math.abs(dept_r) + "</i>");
+                        $("#c_dept_ranking").html($("#c_dept_ranking").html() + "<i style='margin-left:10px;color:" + (dept_r > 0 ? "red" : "#08a208") + "' class='icon icon-long-arrow-" + (dept_r > 0 ? "down" : "up") + "'>" + Math.abs(dept_r) + "</i>");
                     }
                     var com_r = p_c.company_ranking - p_l.company_ranking;
                     if (com_r != 0) {
-                        $("#c_com_ranking").html($("#c_com_ranking").html() + "<i style='margin-left:10px;color:" + (com_r > 0 ? "red" : "green") + "' class='icon icon-long-arrow-" + (com_r > 0 ? "down" : "up") + "'>" + Math.abs(com_r) + "</i>");
+                        $("#c_com_ranking").html($("#c_com_ranking").html() + "<i style='margin-left:10px;color:" + (com_r > 0 ? "red" : "#08a208") + "' class='icon icon-long-arrow-" + (com_r > 0 ? "down" : "up") + "'>" + Math.abs(com_r) + "</i>");
                     }
                     var road_r = p_c.center_ranking - p_l.center_ranking;
                     if (road_r != 0) {
-                        $("#c_road_ranking").html($("#c_road_ranking").html() + "<i style='margin-left:10px;color:" + (road_r > 0 ? "red" : "green") + "' class='icon icon-long-arrow-" + (road_r > 0 ? "down" : "up") + "'>" + Math.abs(road_r) + "</i>");
+                        $("#c_road_ranking").html($("#c_road_ranking").html() + "<i style='margin-left:10px;color:" + (road_r > 0 ? "red" : "#08a208") + "' class='icon icon-long-arrow-" + (road_r > 0 ? "down" : "up") + "'>" + Math.abs(road_r) + "</i>");
                     }
                 }
             }

VisualInspection/js/statistics/road_manage_statistics.js

@@ -1195,8 +1195,10 @@ $(function() {
                                     if (name == '行为') {
                                         name = '工作纪律及行为举止';
                                     }
+                                    var v = t_map_p.get(name);
+                                    if (isNaN(v)) v = 0;
+                                    return '上月\n' + v;
 
-                                    return '上月\n' + t_map_p.get(name);
                                 },
                                 textStyle: {
                                     color: 'blue'
@@ -1238,8 +1240,10 @@ $(function() {
                                     if (name == '行为') {
                                         name = '工作纪律及行为举止';
                                     }
+                                    var v = t_map_p.get(name);
+                                    if (isNaN(v)) v = 0;
+                                    return '上月\n' + v;
 
-                                    return '上月\n' + t_map_p.get(name);
                                 },
                                 textStyle: {
                                     color: 'blue'
@@ -1284,8 +1288,10 @@ $(function() {
                                     if (name == '行为') {
                                         name = '工作纪律及行为举止';
                                     }
+                                    var v = t_map_c.get(name);
+                                    if (isNaN(v)) v = 0;
+                                    return '本月\n' + v;
 
-                                    return '本月\n' + t_map_c.get(name);
                                 },
                                 textStyle: {
                                     color: 'red'
@@ -1320,6 +1326,19 @@ $(function() {
                                 show: true,
                                 position: 'top',
                                 formatter: '本月',
+                                formatter: function(params) {
+                                    var name = params.name
+                                    if (name == '仪表') {
+                                        name = '仪容仪表着装';
+                                    }
+                                    if (name == '行为') {
+                                        name = '工作纪律及行为举止';
+                                    }
+                                    var v = t_map_c.get(name);
+                                    if (isNaN(v)) v = 0;
+                                    return '本月\n' + v;
+
+                                },
                                 textStyle: {
                                     color: 'red'
                                 }
@@ -1331,7 +1350,13 @@ $(function() {
             }
         }
 
-
+        var maxvaluedata = 0;
+        t_map_c.forEach(function(value, key) {
+            if (value > maxvaluedata) maxvaluedata = value;
+        })
+        t_map_p.forEach(function(value, key) {
+            if (value > maxvaluedata) maxvaluedata = value;
+        })
 
 
         var namelist = new Array();
@@ -1396,7 +1421,8 @@ $(function() {
                 data: namelist
             }],
             yAxis: [{
-                type: 'value'
+                type: 'value',
+                max: (maxvaluedata + 200)
             }],
             series: sdata
         };

VisualInspection/js/statistics/total_company_statistics.js

@@ -1007,6 +1007,7 @@ $(function() {
         var t_map_p = new HashMap();
         var t_map_c = new HashMap();
 
+
         var sdata = new Array();
 
         for (var j = 0; j < array_all_deptname.length; j++) {
@@ -1048,7 +1049,9 @@ $(function() {
                                         name = '工作纪律及行为举止';
                                     }
 
-                                    return '上月\n' + t_map_p.get(name);
+                                    var v = t_map_p.get(name);
+                                    if (isNaN(v)) v = 0;
+                                    return '上月\n' + v;
                                 },
                                 textStyle: {
                                     color: 'blue'
@@ -1090,8 +1093,9 @@ $(function() {
                                     if (name == '行为') {
                                         name = '工作纪律及行为举止';
                                     }
-
-                                    return '上月\n' + t_map_p.get(name);
+                                    var v = t_map_p.get(name);
+                                    if (isNaN(v)) v = 0;
+                                    return '上月\n' + v;
                                 },
                                 textStyle: {
                                     color: 'blue'
@@ -1137,7 +1141,9 @@ $(function() {
                                         name = '工作纪律及行为举止';
                                     }
 
-                                    return '本月\n' + t_map_c.get(name);
+                                    var v = t_map_c.get(name);
+                                    if (isNaN(v)) v = 0;
+                                    return '本月\n' + v;
                                 },
                                 textStyle: {
                                     color: 'red'
@@ -1178,8 +1184,10 @@ $(function() {
                                     if (name == '行为') {
                                         name = '工作纪律及行为举止';
                                     }
+                                    var v = t_map_c.get(name);
+                                    if (isNaN(v)) v = 0;
 
-                                    return '本月\n' + t_map_c.get(name);
+                                    return '本月\n' + v;
                                 },
                                 textStyle: {
                                     color: 'red'
@@ -1192,6 +1200,15 @@ $(function() {
             }
         }
 
+        var maxvaluedata = 0;
+        t_map_c.forEach(function(value, key) {
+            if (value > maxvaluedata) maxvaluedata = value;
+        })
+        t_map_p.forEach(function(value, key) {
+            if (value > maxvaluedata) maxvaluedata = value;
+        })
+
+
 
         var namelist = new Array();
         for (var i = 0; i < array_all_name.length; i++) {
@@ -1255,7 +1272,8 @@ $(function() {
                 data: namelist
             }],
             yAxis: [{
-                type: 'value'
+                type: 'value',
+                max: (maxvaluedata + 200)
             }],
             series: sdata
         };

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -523,7 +523,7 @@
                   for (var i = 0; i < data.length; i++) {
                       var ct = data[i].class_type;
                       $(".tr-" + ct).data("cache", data[i]);
-                      $(".tr-" + ct).append("<td vertical-align='middle' align='center' style='width:140px;'><span style='font-weight:bold;'>" + classCode[ct].class_name + "<br></span><span>" + classCode[ct].start_time + "</span> - <span>" + classCode[ct].end_time + "</span></td>");
+                      $(".tr-" + ct).append("<td vertical-align='middle' align='center' style='width:140px;background:#F8F8F8;'><span style='font-weight:bold;'>" + classCode[ct].class_name + "<br></span><span>" + classCode[ct].start_time + "</span> - <span>" + classCode[ct].end_time + "</span></td>");
 
 
 

VisualInspection/js/user/addUser.js

@@ -20,7 +20,7 @@ function loadUserData(nodedata) {
 
     $(".ComboTreeItemChlid").find("input").prop('checked', false);
 
-    if (edittype == "edit") {
+    if (edittype == "edit" || edittype == "update") {
         usertemp = nodedata;
         pnode = [{ "id": usertemp.organid }]
         initUserInfo()
@@ -208,14 +208,23 @@ function addUser() {
 
 
 
-    if (edittype == "edit") {
+    if (edittype == "edit" || edittype == "update") {
         parm["id"] = usertemp.id;
         UserUpdate(parm, function(data) {
             layer.msg('修改成功！', {
                 time: 2000, //20s后自动关闭
             }, function() {
-                $('#addUserModal').modal('hide')
-                updateUser(dept_selectinput.value)
+                if (edittype == "edit") {
+                    updateUser(dept_selectinput.value)
+                    $('#addUserModal').modal('hide')
+                }
+                if (edittype == "update") {
+                    $('#updateUserModal').modal('hide')
+                    GetUserInfo(function(data) {
+                        var html = "<i class=\"icon icon-user\"></i>  " + data.truename + " " + data.organname + ",欢迎您"
+                        $("#user").html(html);
+                    }, function(error) {})
+                }
             });
         }, function(error) {
 

VisualInspection/js/user/userManager.js

@@ -358,13 +358,4 @@
  function stringlimit(string, linmit) {
      if (string.length < linmit) return string;
      return string.substr(0, linmit / 2) + "..." + string.substr(string.length - linmit / 2, linmit / 2)
- }
-
- var job_array = new Array();
-
- function getJob() {
-     post_common_service("/job/getList", {}, function(data) {
-         job_array = data;
-         console.log(data)
-     }, function(error) {});
  }

VisualInspection/js/util/service.js

@@ -14,6 +14,28 @@ function UserLogin(body, success, fail) {
         fail("网络错误");
     });
 }
+
+function GetUserInfo(success, fail) {
+
+    var url = base_server_url + "/user/getUserInfo"
+    ajaxGet(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            //存储token
+            var user = $.zui.store.get("user");
+            data.result_data.token = user.token;
+            $.zui.store.set("user", data.result_data);
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+
+}
+
+
 function UserLoginOUT(success, fail) {
     var url = base_server_url + USER_LOGOUT
     ajaxGet(url, "", function(response) {
@@ -117,7 +139,7 @@ function PermisionGetAll(success, fail) {
     });
 }
 
-function PermisionRoleAdd(data,success, fail) {
+function PermisionRoleAdd(data, success, fail) {
     var url = base_server_url + PERMISION_ROLE_ADD
     ajaxPost(url, data, function(response) {
         var data = response;
@@ -131,7 +153,7 @@ function PermisionRoleAdd(data,success, fail) {
     });
 }
 
-function PermisionRoleEDIT(data,success, fail) {
+function PermisionRoleEDIT(data, success, fail) {
     var url = base_server_url + PERMISION_ROLE_EDIT
     ajaxPut(url, data, function(response) {
         var data = response;
@@ -146,7 +168,7 @@ function PermisionRoleEDIT(data,success, fail) {
 }
 
 
-function PermisionRoleDELETE(data,success, fail) {
+function PermisionRoleDELETE(data, success, fail) {
     var url = base_server_url + PERMISION_ROLE_DELETE
     ajaxDelete(url, data, function(response) {
         var data = response;
@@ -163,7 +185,7 @@ function PermisionRoleDELETE(data,success, fail) {
 
 
 
-function PermisionAdd(data,success, fail) {
+function PermisionAdd(data, success, fail) {
     var url = base_server_url + PERMISION_ADD
     ajaxPost(url, data, function(response) {
         var data = response;
@@ -177,8 +199,8 @@ function PermisionAdd(data,success, fail) {
     });
 }
 
-function PermisionEdit(data,success, fail) {
-    var url = base_server_url + PermisionEdit+data.id
+function PermisionEdit(data, success, fail) {
+    var url = base_server_url + PermisionEdit + data.id
     ajaxPut(url, data, function(response) {
         var data = response;
         if (data.result_code == 0) {
@@ -191,8 +213,8 @@ function PermisionEdit(data,success, fail) {
     });
 }
 
-function PermisionDelete(id,success, fail) {
-    var url = base_server_url + PERMISION_DELETE+id;
+function PermisionDelete(id, success, fail) {
+    var url = base_server_url + PERMISION_DELETE + id;
     ajaxDelete(url, "", function(response) {
         var data = response;
         if (data.result_code == 0) {
@@ -281,7 +303,7 @@ function getConstantList(url, param, success, fail) {
 
 
 function VideoGetById(id, success, fail) {
-    var url = base_server_url + VIDEO_GET_ID +id;
+    var url = base_server_url + VIDEO_GET_ID + id;
     ajaxGet(url, "", function(response) {
         var data = response;
         if (data.result_code == 0) {
@@ -300,11 +322,11 @@ function no_return_common_service(url, param, success, fail) {
     ajaxPost(url, param, function(response) {
         var data = response;
         if (data.result_code == 0) {
-            if(success)
+            if (success)
                 success(data.result_desc)
         } else {
             layer.msg(data.result_desc, {
-                time: 2000//20s后自动关闭
+                time: 2000 //20s后自动关闭
             });
         }
     }, function(error) {
@@ -319,13 +341,13 @@ function post_common_service(url, param, success, fail) {
         if (data.result_code == 0) {
             success(data.result_data)
         } else {
-            if(fail)
+            if (fail)
                 fail(data.result_desc);
             else
                 console.log(data.result_desc);
         }
     }, function(error) {
-        if(fail)
+        if (fail)
             fail("网络错误");
         else
             console.log("网络错误");
@@ -363,14 +385,14 @@ function get_common_service_nohead(url, param, success, fail) {
 
 
 // 上传文件
-function uploadFile(file, name, successfunc, errorfunc,parentPath) {
-    var dataurl = base_image_server_url+"/fileServer" + FILE_UPLOAD
+function uploadFile(file, name, successfunc, errorfunc, parentPath) {
+    var dataurl = base_image_server_url + "/fileServer" + FILE_UPLOAD
     var form = new FormData();
     form.append(name, file);
-    if(parentPath)
-        form.append('parentPath',parentPath);
+    if (parentPath)
+        form.append('parentPath', parentPath);
     else
-        form.append('parentPath','head');
+        form.append('parentPath', 'head');
     $.ajax({
         url: dataurl,
         type: "POST",
@@ -407,7 +429,7 @@ function RoleGetALLNoData(success, fail) {
     });
 }
 
-function RoleAdd(data,success, fail) {
+function RoleAdd(data, success, fail) {
     var url = base_server_url + ROLE_ADD;
     ajaxPost(url, data, function(response) {
         var data = response;
@@ -421,8 +443,8 @@ function RoleAdd(data,success, fail) {
     });
 }
 
-function RoleUpdate(data,success, fail) {
-    var url = base_server_url + ROLE_EDIT+data.id;
+function RoleUpdate(data, success, fail) {
+    var url = base_server_url + ROLE_EDIT + data.id;
     ajaxPut(url, data, function(response) {
         var data = response;
         if (data.result_code == 0) {
@@ -435,8 +457,8 @@ function RoleUpdate(data,success, fail) {
     });
 }
 
-function RoleDelete(roleid,success, fail) {
-    var url = base_server_url + ROLE_DELETE +roleid;
+function RoleDelete(roleid, success, fail) {
+    var url = base_server_url + ROLE_DELETE + roleid;
     ajaxDelete(url, "", function(response) {
         var data = response;
         if (data.result_code == 0) {
@@ -454,8 +476,8 @@ function RoleDelete(roleid,success, fail) {
 
 
 
-function RoleGetByPermision(permisionid,success, fail) {
-    var url = base_server_url + ROLE_GET_BY_PERMISION+permisionid;
+function RoleGetByPermision(permisionid, success, fail) {
+    var url = base_server_url + ROLE_GET_BY_PERMISION + permisionid;
     ajaxGet(url, "", function(response) {
         var data = response;
         if (data.result_code == 0) {
@@ -469,8 +491,8 @@ function RoleGetByPermision(permisionid,success, fail) {
 }
 
 
-function RoleGetALL(page,size, success, fail) {
-    var url = base_server_url + ROLE_GET_ALL_DATA+"/"+page+"/"+size;
+function RoleGetALL(page, size, success, fail) {
+    var url = base_server_url + ROLE_GET_ALL_DATA + "/" + page + "/" + size;
     ajaxGet(url, "", function(response) {
         var data = response;
         if (data.result_code == 0) {

VisualInspection/js/util/util.js

@@ -14,7 +14,7 @@ function doajax(method, dataurl, data, sucessCallBack, errorCallBack) {
             dataType: "json",
             async: true,
             data: JSON.stringify(data),
-            success: function(data){
+            success: function(data) {
                 sucessCallBack(data);
             },
             error: function(error) {
@@ -112,11 +112,11 @@ function getItemByIdFromArr(id, curDatas) {
     return rowData;
 }
 
-function showPopup4Common(title, callback, area, divId, offset,btnName) {
+function showPopup4Common(title, callback, area, divId, offset, btnName) {
     if (!area) area = 'auto';
     if (!divId) divId = '#form-div';
     if (!offset) offset = 'auto';
-    if (!btnName) btnName='保存';
+    if (!btnName) btnName = '保存';
     //添加常量页面
     return layer.open({
         type: 1,
@@ -654,4 +654,12 @@ function settime() {
     var height = window.innerHeight - $("#main").height();
     $("#foot").css("bottom", height > 0 ? 0 : height);
     setTimeout(gettime, 1000);
+}
+
+var job_array = new Array();
+
+function getJob() {
+    post_common_service("/job/getList", {}, function(data) {
+        job_array = data;
+    }, function(error) {});
 }

VisualInspection/view/common/head.html

@@ -2,10 +2,10 @@
     <div class="container-fluid">
         <ul class="nav navbar-nav navbar-left">
             <li>
-                <img src="/images/logo.png"/>
+                <img src="/images/logo.png" />
             </li>
             <li>
-                <img src="/images/logo_name.png"/>
+                <img src="/images/logo_name.png" />
             </li>
         </ul>
 
@@ -13,15 +13,45 @@
 
         <ul class="nav navbar-nav navbar-right">
             <li>
-                <p id="user" class="header_font" style="padding-right:20px;cursor:pointer;"></p>
+
+                <div class="btn-group dropdown ">
+
+                    <p id="user" class="header_font" data-toggle="dropdown" style="padding-right:20px;cursor:pointer;"></p>
+
+                    <ul class="dropdown-menu" role="menu">
+                        <li><a href="javascript:void(0)" id="update_user">修改个人信息</a></li>
+                        <!-- <li><a href="###">另一个操作</a></li>
+                        <li class="divider"></li>
+                        <li><a href="###">更多操作</a></li> -->
+                    </ul>
+                </div>
+
+                <!-- <p id="user" class="header_font" style="padding-right:20px;cursor:pointer;"></p> -->
             </li>
             <li>
                 <p id="time_p" class="header_font"></p>
             </li>
 
             <li>
-               <button class="header_font logout_btn " id="login_out_btn"> <i class="icon icon-signout" style="font-size: 24px;"></i> </button>
+                <button class="header_font logout_btn " id="login_out_btn"> <i class="icon icon-signout" style="font-size: 24px;"></i> </button>
             </li>
         </ul>
     </div>
+</div>
+
+<div class="modal fade" id="updateUserModal">
+    <div class="modal-dialog modal-lg">
+        <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/user/addUser.html?__inline">
+            </div>
+            <div class="modal-footer">
+                <button type="button" id="user_add_btn" class="btn btn-primary">保存</button>
+            </div>
+        </div>
+    </div>
 </div>

VisualInspection/view/mytask/taskDetail.html

@@ -1,6 +1,6 @@
 <div class="container-fluid ">
     <div class="row">
-        <h3>考核基本信息</h3>
+        <h3 style="padding-top: 10px;padding-bottom: 15px;">考核基本信息</h3>
         <div>
             <table style="width:100%;">
                 <tr>
@@ -15,20 +15,20 @@
     </div>
     <hr>
     <div class="row">
-        <h3>考核任务流程</h3>
+        <h3 style="padding-top: 10px;padding-bottom: 15px;">考核任务流程</h3>
         <div id="flow_div">
         </div>
     </div>
     <hr>
     <div class="row">
-        <h3>考核详细内容</h3>
+        <h3 style="padding-top: 10px;padding-bottom: 15px;">考核详细内容</h3>
         <div>
             <div id="score_datatable" data-checkable="true" data-sortable="true"></div>
         </div>
     </div>
     <hr>
     <div class="row" id="appeal_div">
-        <h3>申诉基本信息</h3>
+        <h3 style="padding-top: 10px;padding-bottom: 15px;">申诉基本信息</h3>
         <div>
             <table style="width:100%;">
                 <tr>
@@ -83,27 +83,26 @@
     .line {
         text-align: center;
         font-size: 20px;
-        height: 10px;
+        height: 5px;
         margin: 15px 0px;
         width: 100%;
-        background: #516784;
+        background: #1296db;
         overflow: hidden;
     }
     
     .timeline_item_station {
-        left: 50%;
-        margin-left: 60px;
-        margin-top: 50px;
-        width: 40px;
-        height: 40px;
+        left: 45%;
+        /* margin-left: 55px; */
+        margin-top: 31px;
+        width: 25px;
+        height: 25px;
         padding: 15px;
         border-width: 6px;
-        background-color: #516784;
+        background-color: rgb(50, 141, 199);
         position: absolute;
         border-radius: 50%;
         padding: 10px;
         top: 0;
-        left: 10%;
         -webkit-transition: all .3s ease-out;
         transition: all .3s ease-out;
     }
@@ -118,6 +117,8 @@
         $("#checked_person").html($.checkTask.checked_person_name);
         $("#checked_dept").html($.checkTask.checked_dept_name);
 
+
+
         if ($.checkTask.appeal) {
             $("#appeal_div").show();
             $("#appeal_time").html($.checkTask.appeal.appeal_time);
@@ -328,18 +329,40 @@
             if (data) {
                 var flowStr = "";
                 for (var i in data) {
-                    var str = '<div class="col-sm-2" style="text-align:center;padding:0px;">' +
+                    var str = "";
+                    if (i == 0) {
+                        str = '<div class="col-sm-2" style="text-align:center;padding:0px;width: 87px;margin-left:-60px;">' +
+                            '<div class="row" style="    margin-left: 56px;">' +
+                            '   <label>开始</label>' +
+                            '</div>' +
+                            '    <div class="timeline_item_station" style="    margin-left: 25px;"></div>' +
+                            '</div>'
+                    }
+                    str +=
+                        // '<div class="col-sm-2" style="text-align:center;padding:0px;width: 87px;margin-left:-88px;">' +
+
+                        // '   <img src="/images/end.png" style="width: 35px;margin-left: 36px;margin-top: 25px;">' +
+                        // '</div>' +
+
+                        '<div class="col-sm-2" style="text-align:center;padding:0px;    margin-bottom: 33px;">' +
                         '<div class="row">' +
                         '   <label>' + data[i].check_status_name + '</label>' +
                         '</div>' +
-                        '<div class="row">' +
-                        '   <label>' + data[i].update_time + '</label>' +
-                        '</div>' +
                         '<div class="row line">' +
                         '    <div class="timeline_item_station"></div>' +
                         '</div>' +
+                        '<div class="row">' +
+                        '   <label style="    font-weight: 400;">' + data[i].update_time + '</label>' +
+                        '</div>' +
+                        (i == data.length - 1 ? (
+                            '   <img src="/images/end.png" style="width: 35px;right: -11px;position: absolute;top: 26px;">'
+                        ) : "") +
                         '</div>';
+
+
                     flowStr += str;
+
+
                 }
                 $("#flow_div").html(flowStr);
             }

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -61,7 +61,7 @@
 
 
 <div class="modal fade" id="add_fee_station">
-    <div class="modal-dialog modal-lg" style="width:1200px;">
+    <div class="modal-dialog modal-lg" style="width:1200px">
         <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>
@@ -85,7 +85,7 @@
                                     <tr class="tr-3">
 
                                     </tr>
-                                    <tr class="tr-1">
+                                    <tr class="tr-1" style="background:#f1f1f1;">
 
                                     </tr>
                                     <tr class="tr-2">

VisualInspection/view/user/addUser.html

@@ -3,6 +3,7 @@
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/uploader/zui.uploader.min.css">
 <script type="text/javascript" src="/js/user/addUser.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/css/user/addUser.css?__inline">
+<link rel="stylesheet" type="text/css" href="/css/user/userManager.css?__inline">
 
 
 <script type="text/javascript" src="/js/lib/imageupload/js/imgUp.js?__inline"></script>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -174,8 +174,16 @@ public class UserController extends BaseController {
         	throw new BusinessException(20001);
         }
     }
-    
-    
+
+    @RequestMapping(value = "/getUserInfo",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getUserInfo(HttpServletRequest request){
+        User user = getCurrentUser(request);
+        user.setOrganname(CacheUtil.getOrgannameFromMap(new Long(user.getOrganid())));
+        user.setPassword(null);
+        return returnResult(0, "获取成功", user);
+    }
+
+
     @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
     public String getUser(@PathVariable Integer userid){
         User u = userService.getOne(userid);