Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection/js/lib/mytable.js
#	VisualInspection/js/mytask/check.js
#	VisualInspection/js/util/util.js

VisualInspection/js/appeal_management/appeal_list.js

@@ -24,11 +24,11 @@ $(document).ready(function(){
                         {width: 80, text: '考核人员',  flex: false, colClass: '',field:'appeal_man_name'},
                         {width: 100, text: '考核部门',  flex: false, colClass: '',sort: 'down',field:'appeal_dept_name'},
                         {width: 80, text: '稽查人员', type: 'string', flex: false, colClass: '',field:'verify_person_name'},
-                        {width: 120, text: '稽查时间段', type: 'string',custom:' 00:00-24:00', flex: false, colClass: '',field:'start_time'},
+                        {width: 120, text: '稽查时间段', type: 'string',custom:'-24:00', flex: false, colClass: '',field:'start_time'},
                         {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:'seeCheckAudit',text:'查看稽查结果',col_class:''},{func:'distributionAgain',text:'在分配',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
                         ]},
                     ] ;
         
@@ -69,3 +69,8 @@ function distributionAgain(id,task_id){
     alert("task_id:"+task_id+"---id:"+id)
 }
 
+//详情
+function seeDetail(id,task_id){
+    alert("task_id:"+task_id+"---id:"+id)
+}
+

VisualInspection/js/lib/mytable.js

@@ -129,10 +129,14 @@
                             }else{
                                 dArr.push(timeStamp2String(obj[cols[i].field],cols[i].date_type));
                             }
-                        }else if(obj[cols[i].field]){
-                            dArr.push(obj[cols[i].field]);
                         
-                        }else {
+                        }else if(obj[cols[i].field]){
+                            if(cols[i].custom){
+                                dArr.push(obj[cols[i].field] + cols[i].custom);
+                            }else{
+                                dArr.push(obj[cols[i].field]);
+                            }
+                        }else{ 
                             dArr.push('0');
                         }
                     }

VisualInspection/js/user/login.js

@@ -31,4 +31,5 @@ $(document).ready(function() {
 
 
     });
-});
+});
+

VisualInspection/js/user/userManager.js

@@ -48,7 +48,6 @@
      colClass: 'text-center'
  }];
  $(document).ready(function() {
-     alert("asdsa")
 
      $("#main_content_title").html("用户管理")
 

VisualInspection_server/src/main/resources/application.properties

@@ -91,8 +91,8 @@ jwt.tokenHead=XinTong
 
 # File path
 storage.file.path=/Users/wenhongquan/Desktop/file/
-spring.http.multipart.maxFileSize=500MB
-spring.http.multipart.maxRequestSize=50MB
+spring.http.multipart.maxFileSize=1000MB
+spring.http.multipart.maxRequestSize=1000MB
 
 
 management.shell.auth.simple.user.name=wen