获取当前用户

VisualInspection/css/user/login.css

@@ -3,7 +3,7 @@
 }
 
 .panel {
-    margin-top: 150px;
+    margin-top: 120px;
     padding: 20px;
 }
 

VisualInspection/js/appeal_management/appeal_list.js

@@ -28,7 +28,7 @@ $(document).ready(function(){
                         {width: 80, text: '状态', type: 'string', flex: false, colClass: '',field:'code_name'},
                         {width: 120, text: '上次稽查时间', type: 'string', flex: false, colClass: '',field:'start_time'},
                         {width: 100, text: '操作',  flex: false, colClass: '',field:'id',field_other:'task_id',oper:[
-                            {func:'seeCheckAudit',text:'查看稽查结果',col_class:''},{func:'distributionAgain',text:'在分配',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
+                            {func:'seeCheckAudit',text:'查看稽查结果',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
                         ]},
                     ] ;
         
@@ -62,7 +62,12 @@ $(document).ready(function(){
 })
 //查看稽查结果
 function seeCheckAudit(id,task_id){
-    alert("task_id:"+task_id+"---id:"+id)
+    // alert("task_id:"+task_id+"---id:"+id)
+    // function showTaskDetail1(id){
+    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    $.checkTask = rowData;
+    changePage("/view/mytask/taskDetail.html");
+// }
 }
 //再分配
 function distributionAgain(id,task_id){

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://192.168.68.126:8081/";
+var base_server_url = "http://192.168.68.126:8089/";
+var base_image_server_url = "http://192.168.68.126:8080/";
 
 // var base_ui_url = "http://192.168.31.233:8080/";
 // var base_server_url = "http://192.168.31.233:8089/";

VisualInspection/js/mytask/unchecked.js

@@ -53,7 +53,7 @@ function queryUnexaminedTask(){
                 {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
                 {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
                     oper:[
-                        {func:'showApplyDetail',text:'详情',icon_class:'icon-edit'}
+                        {func:'showApplyDetail',text:'处理',icon_class:'icon-edit'}
                     ]
                 }
             ];
@@ -71,7 +71,7 @@ function showApplyDetail(id){
     layer.open({
         type: 1,
         area: ['400px','500px'],
-        title: '申请详情',
+        title: '申请处理',
         closeBtn: 1,
         shadeClose: true,
         skin: 'layui-layer-lan',

VisualInspection/js/user/userManager.js

@@ -210,6 +210,7 @@
              zdataItem["value"] = m.id;
              zdataItem["pId"] = null;
              zdataItem["name"] = m.organname;
+             zdataItem["open"] = true;
              zdataItem["children"] = addobj(m);
              zdata.push(zdataItem);
          }
@@ -232,6 +233,7 @@
              zdataItem["value"] = m.id;
              zdataItem["pId"] = data.id;
              zdataItem["icon"] = "";
+             zdataItem["open"] = true;
              zdataItem["name"] = m.organname;
              zdataItem["children"] = addobj(m);
              zdata.push(zdataItem);

VisualInspection/js/util/service.js

@@ -204,7 +204,7 @@ function get_common_service(url, param, success, fail) {
 
 // 上传文件
 function uploadFile(file, name, successfunc, errorfunc) {
-    var dataurl = "http://localhost:8080/fileServer" + FILE_UPLOAD
+    var dataurl = base_image_server_url+"/fileServer" + FILE_UPLOAD
     var form = new FormData();
     form.append(name, file);
     form.append('parantPath','tt');

VisualInspection/view/common/head.html

@@ -1,11 +1,11 @@
-<div class="navbar-header navbar-inverse" style="width:100%">
+<div class="navbar-header navbar-inverse" style="width:100%;background:none;">
     <div class="container-fluid">
         <ul class="nav navbar-nav navbar-left">
             <li>
                 <img src="/images/logo.png" />
             </li>
             <li>
-                <p class="header_font">江苏沿海高速视频稽查考核管理系统</p>
+                <img src="/images/logo_name.png" />
             </li>
         </ul>
 

VisualInspection/view/user/login.html

@@ -13,7 +13,7 @@
 
     <div id="main" class="container-fluid main">
         <div class="row">
-            <div class="col-md-4"></div>
+            <div class="col-md-5"></div>
             <div class="col-md-4">
                 <div class="panel">
                     <div class="panel-heading">
@@ -38,7 +38,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-4"></div>
+            <div class="col-md-3"></div>
 
         </div>
 

VisualInspection_server/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>com.xintong.visualInspection</groupId>
 	<artifactId>visualInspection</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 
 	<name>VisualInspection</name>
 	<description>视屏稽查</description>

VisualInspection_server/src/main/java/com/xintong/visualinspection/TaskAutoGen.java

@@ -1,5 +0,0 @@
-package com.xintong.visualinspection;
-
-public class TaskAutoGen {
-
-}

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

@@ -26,6 +26,7 @@ import com.xintong.system.err.ErrorCode;
 import com.xintong.system.securityTools.JwtTokenUtil;
 import com.xintong.system.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.util.CacheUtil;
 
 /**
  * 文件名：TestController
@@ -176,7 +177,8 @@ public class BaseController {
     	String username = jwtTokenUtil.getUsernameFromToken(authToken);
 		if (username != null) {
 			UserDetails u = redisCacheUtil.getUserByUserName(username);
-			return (User)u;
+			User user = CacheUtil.userMap.get(new Long(((User)u).getId()));
+			return user;
 		}
 		return null;
     }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/UserService.java

@@ -19,4 +19,5 @@ public interface UserService extends UserDetailsService {
     public void update(User user);
     public void delete(Integer id);
     public UserDetails loadUserByUsername(String username);
+    public int queryCountByJob(User user);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserServiceImpl.java

@@ -124,5 +124,9 @@ public class UserServiceImpl extends BaseService implements UserService {
 
     }
 
-
+	@Override
+	public int queryCountByJob(User user) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
 }