m

youxiw2000
1 parent 94deb252
Showing 65 changed files with 1708 additions and 609 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/TaskController.java
trash-activiti/src/main/java/com/trash/activiti/domain/dto/ActTaskDTO.java
trash-activiti/src/main/java/com/trash/activiti/mapper/ActReDeploymentMapper.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/myTaskService.java
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-activiti/src/main/resources/mapper/activiti/ActWorkflowFormDataMapper.xml
trash-admin/src/main/java/com/trash/web/controller/system/SysLoginController.java
trash-admin/src/main/resources/application-dev.yml
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-system/src/main/resources/mapper/system/SysMenuMapper.xml
trash-ui/src/api/business/driver.js
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/dayWorkReport.js
trash-ui/src/api/driver_credit.js
trash-ui/src/api/three_step.js
trash-ui/src/api/truck_active.js
@@ -52,11 +52,16 @@ public class TaskController extends BaseController {
         	}
         }
-        
         TableDataInfo tableDataInfo = getDataTable(hashMaps);
         int pageNum = pageDomain.getPageNum();
         int pageSize = pageDomain.getPageSize();
+
+        tableDataInfo.setNames(names);
+        
+        if(tableDataInfo.getRows().size() <= pageSize){
+        	return tableDataInfo;
+        }
         if(tableDataInfo.getRows().size() > (pageNum)*pageSize){
         	tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, (pageNum)*pageSize));
@@ -64,7 +69,6 @@ public class TaskController extends BaseController {
         	tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, tableDataInfo.getRows().size()));
         }
-        tableDataInfo.setNames(names);
         return tableDataInfo;
     }
@@ -51,77 +51,110 @@ public class ActTaskDTO
     private String checkStatus;
+    private String createBy;
+    private String time;
+    
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdDate;
     private String instanceName;
     private String definitionKey;
     private String businessKey;
+    
+
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    SimpleDateFormat timeSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     public ActTaskDTO() {
 	}
-    public ActTaskDTO(ProcessInstance processInstance, Map<String, String> map,ActWorkflowFormData from) {
+    public ActTaskDTO(ProcessInstance processInstance, Map<String, Object> map,ActWorkflowFormData from) {
     	this.id = processInstance.getId();
     	this.instanceName = processInstance.getName();
         this.definitionKey= processInstance.getProcessDefinitionKey();
         this.businessKey= processInstance.getBusinessKey();
         this.checkStatus = from.getControlValue().equals("通过") ? "0" : "1";
 		this.createdDate = from.getCreateTime();
-        getData(map);
+		try {
+            this.reason = map.get("reason").toString();;
+            this.type = map.get("type").toString();;
+
+            this.time =  map.get("createTime").toString();
+            this.createBy = map.get("create_by").toString();;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
-    public ActTaskDTO(HistoricProcessInstance processInstance, Map<String, String> map,ActWorkflowFormData from) {
+    public ActTaskDTO(HistoricProcessInstance processInstance, Map<String, Object> map) {
     	this.id = processInstance.getId();
         this.instanceName = processInstance.getName();
         this.definitionKey= processInstance.getProcessDefinitionKey();
         this.businessKey= processInstance.getBusinessKey();
-        this.checkStatus = from.getControlValue().equals("通过") ? "0" : "1";
-		this.createdDate = from.getCreateTime();
-                
-        getData(map);
+		try {
+	        this.checkStatus = map.get("state").toString();;
+			this.createdDate = timeSdf.parse(map.get("createTime").toString());
+            this.reason = map.get("reason").toString();;
+            this.type = map.get("type").toString();;
+            this.createBy = map.get("create_by").toString();;
+            this.time =  map.get("createTime").toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
     }
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-    public ActTaskDTO(Task task, ProcessInstance processInstance,Map<String,String> map) {
+    public ActTaskDTO(Task task, Map<String,Object> map) {
         this.id = task.getId();
         this.name = task.getName();
         this.status = task.getStatus().toString();
         this.createdDate = task.getCreatedDate();
-        this.instanceName = processInstance.getName();
-        this.definitionKey=processInstance.getProcessDefinitionKey();
-        this.businessKey=processInstance.getBusinessKey();
-        
-        getPrevNext(task, processInstance);
-
-        getData(map);
+        try {
+            this.instanceName = map.get("title").toString();
+            this.definitionKey = map.get("id").toString().split(":")[0];
+            this.businessKey = map.get("id").toString();
+            this.reason = map.get("reason").toString();
+            this.type = map.get("type").toString();
+            this.createBy = map.get("create_by").toString();
+            this.time =  map.get("createTime").toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+        getPrevNext(task);
+       
     }
-	private void getPrevNext(Task task, ProcessInstance processInstance) {
+	private void getPrevNext(Task task) {
-		BpmnModel model = SpringUtils.getBean(RepositoryService.class).getBpmnModel(processInstance.getProcessDefinitionId());
-		
+
+        long date = new Date().getTime();
 		RedisCache cache = SpringUtils.getBean(RedisCache.class);
-				
-		List<org.activiti.bpmn.model.Process> processes = model.getProcesses();
-		org.activiti.engine.task.Task et = SpringUtils.getBean(TaskService.class).createTaskQuery().taskId(this.id).singleResult();
+
+		String exeId = cache.getCacheObject(this.id);
+		org.activiti.engine.task.Task et;
+		
+		if(exeId == null){
+			et = SpringUtils.getBean(TaskService.class).createTaskQuery().taskId(this.id).singleResult();
+			exeId = et.getExecutionId();
+			cache.setCacheObject(this.id, exeId);
+		}
-        Map<String, Object> params= cache.getCacheMap(et.getExecutionId());
+        Map<String, Object> params= cache.getCacheMap(exeId);
         if(params == null){
-        	params= SpringUtils.getBean(RuntimeService.class).getVariables(et.getExecutionId());
-        	cache.setCacheMap(et.getExecutionId(), params);
+        	params= SpringUtils.getBean(RuntimeService.class).getVariables(exeId);
+        	cache.setCacheMap(exeId, params);
         }
 		String route = null;
 		String index = null;
-		String key = processInstance.getProcessDefinitionKey();
+		String key = this.businessKey.split(":")[0];
+				
       if(params.get("route")!=null){
           route = params.get("route").toString();
@@ -136,13 +169,17 @@ public class ActTaskDTO
       if(list.size() > 0){
     	  if(list.indexOf(task.getName())>0){
-    		  this.prev = list.get(list.indexOf(et.getName())-1);
+    		  this.prev = list.get(list.indexOf(task.getName())-1);
     	  }
     	  if(list.size() > (list.indexOf(task.getName())+1)){
-    		  this.next = list.get(list.indexOf(et.getName())+1);
+    		  this.next = list.get(list.indexOf(task.getName())+1);
     	  }
     	  return;
       }
+
+
+      BpmnModel model = SpringUtils.getBean(RepositoryService.class).getBpmnModel(task.getProcessDefinitionId());
+		List<org.activiti.bpmn.model.Process> processes = model.getProcesses();
       List<String> modelList = new ArrayList<String>();
@@ -200,14 +237,13 @@ public class ActTaskDTO
 		cache.setCacheList(key, modelList);
-		  if(modelList.indexOf(et.getName())>0){
-    		  this.prev = modelList.get(modelList.indexOf(et.getName())-1);
+		  if(modelList.indexOf(task.getName())>0){
+    		  this.prev = modelList.get(modelList.indexOf(task.getName())-1);
     	  }
-    	  if(modelList.size() > (modelList.indexOf(et.getName())+1)){
-    		  this.next = modelList.get(modelList.indexOf(et.getName())+1);
+    	  if(modelList.size() > (modelList.indexOf(task.getName())+1)){
+    		  this.next = modelList.get(modelList.indexOf(task.getName())+1);
     	  }
-    	  
-		System.out.println(modelList.toString());
+
 //        
 //
@@ -311,14 +347,6 @@ public class ActTaskDTO
 //        }
 	}
-	private void getData(Map<String, String> map) {
-		try {
-            this.reason = map.get("reason");
-            this.type = map.get("type");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 	public String getId() {
@@ -417,7 +445,23 @@ public class ActTaskDTO
 	public void setCheckStatus(String checkStatus) {
 		this.checkStatus = checkStatus;
 	}
-	
-    
+
+	public String getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getTime() {
+		return time;
+	}
+
+	public void setTime(String time) {
+		this.time = time;
+	}
+
+
 }
@@ -18,9 +18,9 @@ public interface ActReDeploymentMapper {
         public List<ActReDeploymentVO> selectActReDeploymentByIds(@Param("ids") Set<String> ids);
-        public  List<Map<String, String>> selectWorkByIds(@Param("ids") Set<String> idString);
+        public  List<Map<String, Object>> selectWorkByIds(@Param("ids") Set<String> idString);
-        public List<Map<String, String>> selectHistoryWorkByPIds(@Param("ids") Set<String> id);
+        public List<Map<String, Object>> selectHistoryWorkByPIds(@Param("ids") Set<String> id);
         public Set<String> selectUnCompleteWorkByUsername(Map map);
@@ -10,7 +10,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import javax.validation.constraints.Null;
@@ -32,6 +34,7 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricProcessInstanceQuery;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.task.IdentityLink;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +60,8 @@ import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.ServletUtils;
 import com.trash.common.utils.spring.SpringUtils;
+import io.jsonwebtoken.lang.Strings;
+
 @Service
 public class ActTaskServiceImpl implements IActTaskService {
@@ -117,78 +122,96 @@ public class ActTaskServiceImpl implements IActTaskService {
 		if(type != null && type.isEmpty()){
 			type = null;
 		}
-		if(name != null && name.isEmpty()){
-			name = null;
-		}
 		if(prev != null && prev.isEmpty()){
 			prev = null;
 		}
-		List<ActTaskDTO> cacheList = null;
-		if(cacheList != null){
-			
-			actTaskDTOS.addAll(cacheList);
+		String[] strings;
+		Set<String> keys = new HashSet<String>();
+		
+		if(type != null && !type.isEmpty()){
+			strings = type.split(",");
+			keys = new HashSet<String>();
+			for(String str:strings ){
+				keys.add(str);
+			}
+		}
+		org.activiti.api.runtime.shared.query.Page<Task> pageTasks;
+		
+		int pageNum = pageDomain.getPageNum();
+		int pageSize = pageDomain.getPageSize();
+		if(prev == null){
+			pageTasks = taskRuntime.tasks(Pageable.of((pageNum-1) * pageSize,pageSize),null,keys,name);
 		}else{
-			org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of(0,999999));
-			
+			pageTasks = taskRuntime.tasks(Pageable.of(0,999999),null,keys,name);
+		}
+		
 			List<Task> tasks = pageTasks.getContent();
 			int totalItems = pageTasks.getTotalItems();
+			list.setTotal(totalItems);
+			
 			if (totalItems != 0) {
+				
+				
 				Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
-
-				List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(processInstanceIdIds).list();
+				ProcessInstanceQuery  query = runtimeService.createProcessInstanceQuery();
+				
+				if(name != null && !name.isEmpty()){
+					query.processInstanceNameLike(name);
+				}
+				if(keys.size()>0){
+					query.processDefinitionKeys(keys);
+				}
+				
+				
+				List<ProcessInstance> processInstanceList = query.processInstanceIds(processInstanceIdIds).list();
+
 				Set<String> idString = new HashSet<String>();
 				for (ProcessInstance pi : processInstanceList) {
 					idString.add(pi.getBusinessKey());
 				}
+				
+				if(idString.size() == 0){
+					return list;
+				}
-				List<Map<String, String>> maps = actMapper.selectWorkByIds(idString);
-				try {
-					
-					
-					for(Task t:tasks){
-						for(ProcessInstance pInstance : processInstanceList){
-							if(pInstance.getId().equals(t.getProcessInstanceId())){
-								for(Map map:maps){
-									if(pInstance.getId().equals(map.get("instance_id"))){
-										ActTaskDTO atc = new ActTaskDTO(t, pInstance, map);
-										
-										actTaskDTOS.add(atc);
-										break;
-									}
-								}
+				List<Map<String, Object>> maps = actMapper.selectWorkByIds(idString);
+				
+					for(Map<String, Object> map:maps){
+						try {
+							ActTaskDTO dto = new ActTaskDTO(tasks.parallelStream().filter(t -> t.getProcessInstanceId().equals(map.get("instance_id"))).findAny().get(),map);
+							
+							if(prev != null && !prev.isEmpty() && (dto.getPrev() == null || !dto.getPrev().contains(prev))){
+								continue;
 							}
+							
+							list.add(dto);
+						} catch (Exception e) {
+							e.printStackTrace();
 						}
 					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-				
-				
-			}
-			
-		}
-		
-		for(ActTaskDTO dto:actTaskDTOS){
-			if(name != null && !name.isEmpty() && !name.equals(dto.getInstanceName())){
-				continue;
-			}
-			if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){
-				continue;
 			}
-			if(prev != null && !prev.isEmpty() && (dto.getPrev() == null || !dto.getPrev().contains(prev))){
-				continue;
+
+			if(prev != null){
+				list.setTotal(list.size());
 			}
-			list.add(dto);
-		}
-		
-		list.setTotal(list.size());
+			
+
+			list.sort(new Comparator<ActTaskDTO>() {
+
+				@Override
+				public int compare(ActTaskDTO o1, ActTaskDTO o2) {
+					// TODO Auto-generated method stub
+					return (int) (o2.getCreatedDate().getTime() - o1.getCreatedDate().getTime());
+				}
+			});
+			
 		return list;
 	}
@@ -215,12 +238,9 @@ public class ActTaskServiceImpl implements IActTaskService {
 		if(name != null)
 			map.put("name", name);
-		List<String> collect = actMapper.selectCompleteWorkByUsername(map);
-		
-		if (collect.size() > 0) {
-			Set<String> set = new HashSet(collect);
+
 			List<HistoricProcessInstance> processInstanceList;
-			HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username).processInstanceIds(set);
+			HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username);
 			if(name != null)
 				query.processInstanceNameLike(name);
@@ -233,16 +253,15 @@ public class ActTaskServiceImpl implements IActTaskService {
 				idString.add(pi.getId());
 			}
-			List<Map<String, String>> maps = actMapper.selectHistoryWorkByPIds(idString);
+			List<Map<String, Object>> maps = actMapper.selectHistoryWorkByPIds(idString);
-			List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
+//			List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
 			if (processInstanceList.size() > 0) {
 				for (HistoricProcessInstance p : processInstanceList) {
 					try {
 						ActTaskDTO dto = new ActTaskDTO(p, 
-								maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get(),
-								dataList.parallelStream().filter(pi ->  p.getBusinessKey().equals(pi.getBusinessKey())).findAny().get());
+								maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
 							if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){
@@ -252,11 +271,11 @@ public class ActTaskServiceImpl implements IActTaskService {
 						list.add(dto);} 
 					catch (Exception e) {
-						// TODO: handle exception
+						e.printStackTrace();
 					}
 				}
-			}
+			
 		}
 		list.sort(new Comparator<ActTaskDTO>() {
@@ -295,11 +314,10 @@ public class ActTaskServiceImpl implements IActTaskService {
 		}
-		Set<String> collect = actMapper.selectUnCompleteWorkByUsername(map);
+		List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().involvedUser(username).list();
-		if (collect.size() > 0) {
+		if (processInstanceList.size() > 0) {
-			List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(collect).list();
 			list.setTotal(processInstanceList.size());
@@ -308,7 +326,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 				idString.add(pi.getBusinessKey());
 			}
-			List<Map<String, String>> maps = actMapper.selectWorkByIds(idString);
+			List<Map<String, Object>> maps = actMapper.selectWorkByIds(idString);
 			List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
 			if (processInstanceList.size() > 0) {
@@ -24,9 +24,12 @@ import org.activiti.api.task.model.payloads.UpdateTaskPayload;
 import org.activiti.api.task.model.payloads.UpdateTaskVariablePayload;
 import org.activiti.api.task.runtime.TaskRuntime;
 import org.activiti.api.task.runtime.conf.TaskRuntimeConfiguration;
+import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.impl.TaskQueryImpl;
 import org.activiti.engine.query.QueryProperty;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.task.IdentityLink;
 import org.activiti.engine.task.IdentityLinkType;
 import org.activiti.engine.task.NativeTaskQuery;
@@ -35,6 +38,7 @@ import org.activiti.runtime.api.impl.TaskRuntimeHelper;
 import org.activiti.runtime.api.model.impl.APITaskConverter;
 import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter;
 import org.activiti.runtime.api.query.impl.PageImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
@@ -44,8 +48,12 @@ import com.trash.common.utils.SecurityUtils;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 @PreAuthorize("hasRole('ACTIVITI_USER')")
 @Service
@@ -64,6 +72,9 @@ public class myTaskServiceImpl implements myTaskService {
     private final SecurityManager securityManager;
     private final TaskRuntimeHelper taskRuntimeHelper;
+    
+    @Autowired
+    RuntimeService runtimeService;
     public myTaskServiceImpl(TaskService taskService,
                            UserGroupManager userGroupManager,
@@ -101,18 +112,15 @@ public class myTaskServiceImpl implements myTaskService {
     @Override
     public Page<Task> tasks(Pageable pageable) {
-            return tasks(pageable,null);
+            return tasks(pageable,null,null,null);
     }
-
     @Override
-    public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload) {
+    public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload,Set<String> defKey,String name) {
+    	
         TaskQuery crossQuery = taskService.createTaskQuery();
         TaskQuery crossQuery1 = taskService.createTaskQuery();
-
-        TaskQuery crossQuery2 = taskService.createTaskQuery();
-        
         TaskQuery userQuery =  taskService.createTaskQuery();
         userQuery.taskAssignee(SecurityUtils.getUsername());
@@ -124,8 +132,7 @@ public class myTaskServiceImpl implements myTaskService {
         List<String> posts = SecurityUtils.getLoginUser().getUser().getPostIds();
         List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
- 
-        
+
         if(posts == null || posts == null){
         	crossQuery.taskCandidateOrAssigned(SecurityUtils.getUsername());
         	crossQuery1.taskCandidateOrAssigned(SecurityUtils.getUsername());
@@ -153,17 +160,38 @@ public class myTaskServiceImpl implements myTaskService {
         	}
         }
+        
         for(org.activiti.engine.task.Task tasks : userQuery.list()){
         	pid.add(tasks.getProcessInstanceId());
         }
+		
+		ProcessInstanceQuery  query = runtimeService.createProcessInstanceQuery();
+		
+		if(name != null && !name.isEmpty()){
+			query.processInstanceNameLike(name);
+		}
+		if(defKey.size()>0){
+			query.processDefinitionKeys(defKey);
+		}
+		
+		if(pid.size()>0){
+			Set<String> idSet = new HashSet<>();
+			
+			for(String str:pid){
+				idSet.add(str);
+			}
+			
+			pid = query.processInstanceIds(idSet).list().parallelStream().map(p->p.getId()).collect(Collectors.toList());
+		}
+		
+       
+        
         if(pid.size() > 0){
     		taskQuery.processInstanceIdIn(pid).orderByTaskCreateTime().desc();
         }else{
         	taskQuery.taskAssignee(SecurityUtils.getUsername()).orderByTaskCreateTime().desc();
         }
-       
-        
         List<Task> tasks = taskConverter.from(taskQuery.listPage(pageable.getStartIndex(),
                 pageable.getMaxItems()));
 package com.trash.activiti.service;
 import java.util.List;
+import java.util.Set;
 import org.activiti.api.model.shared.model.VariableInstance;
 import org.activiti.api.runtime.shared.query.Page;
@@ -46,8 +47,10 @@ public interface myTaskService {
 	     *  - the authenticated user is the actual assignee
 	     *  - the user belongs to a group that is a candidate for the task
 	     */
+	    
+
 	    Page<Task> tasks(Pageable pageable,
-	                     GetTasksPayload getTasksPayload);
+	                     GetTasksPayload getTasksPayload,Set<String> defKey,String name);
 	    /**
 	     * Creates a task based on the following rules
@@ -24,17 +24,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</select>
 	<select id="selectWorkByIds"  parameterType="String" resultType="java.util.Map">
-	   	select start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime from workflow where id in
+	   	select id,title,start_time as startTime,end_time as endTime, reason,type,instance_id,create_time  as createTime,create_by,state from workflow where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
 	</select>
 	<select id="selectHistoryWorkByPIds"  parameterType="String" resultType="java.util.Map">
-	   	select start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime from workflow_hi where instance_id in
+	   	select id,start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime,create_by,state from workflow_hi where instance_id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
+        GROUP BY id ORDER BY create_time
 	</select>
@@ -41,11 +41,13 @@
     <select id="selectActWorkflowFormDataByBusinessKey" parameterType="string" resultMap="ActWorkflowFormDataResult">
         <include refid="selectActWorkflowFormDataVo"/>
         where  business_key = #{businessKey}
+        order by create_time DESC
     </select>
     <select id="selectActWorkFlowFormDataListByUser" parameterType="string" resultMap="ActWorkflowFormDataResult">
-        <include refid="selectActWorkflowFormDataVo"/>
-		where create_by =  #{username} and control_name = "审批" GROUP BY business_key  order by create_time DESC;
+       select * from act_workflow_formdata where id in (
+			select max(id)from act_workflow_formdata
+			where create_by =  #{username} and control_name = "审批" GROUP BY business_key );
     </select>
@@ -132,7 +132,10 @@ public class SysLoginController
         }
 //        // 权限集合
-//        Set<String> permissions = permissionService.getMenuPermission(user);
+        Set<String> ps = permissionService.getMenuPermission(user);
+        
+        permissions.addAll(ps);
+        
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
@@ -10,7 +10,7 @@ trash:
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
 #    profile: E:/trash/uploadPath
-    profile: D:/work/project/Documents/uploadPath/trash
+    profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证
@@ -32,7 +32,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/trash1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                #url: jdbc:mysql://localhost:3306/trash1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: root
             # 从库数据源
@@ -71,6 +71,35 @@ public class RemoteServerUtils {
 	public static String BasevehicleInfo = "/api/gpsservice/cs/basevehicle/";
+
+	public static String ContractList = "/api/siteservice/cs/sitecontract/ledger/list";
+	
+	
+	public static JSONArray getContractList(Map map){
+		JSONArray list=null;
+		Object object = post(ContractList,map);
+		
+		if(object != null){
+			 JSONObject jsonObject = JSON.parseObject(object.toString());
+			 list = jsonObject.getJSONArray("list");
+		}
+		
+		return list;
+	}
+	
+	public static JSONArray getContractList(Map map,String token){
+		JSONArray list=null;
+		Object object = post(ContractList,map,token);
+		
+		if(object != null){
+			 JSONObject jsonObject = JSON.parseObject(object.toString());
+			 list = jsonObject.getJSONArray("list");
+		}
+		
+		return list;
+	}
+	
+	
 	public static JSONArray getEarthSitesList(Map map){
 		JSONArray list=null;
 		Object object = post(EarthSitesList,map);
@@ -450,9 +479,14 @@ public class RemoteServerUtils {
 	                .readTimeout(30, TimeUnit.SECONDS)
 	                .build();
 		}
+		
 		String token = SecurityUtils.getLoginUser().getToken();
-
-    	token = "Bearer auth:token:"+ token;
+		
+		if(token.contains("durable:")){
+	    	token = token.replace("durable:", "Bearer durable:auth:token:");
+		}else{
+	    	token = "Bearer auth:token:"+ token;
+		}
     	String param = JSON.toJSON(obj).toString();
@@ -492,9 +526,14 @@ public class RemoteServerUtils {
 		}
 		String token = SecurityUtils.getLoginUser().getToken();
-	
-    	
-    	token = "Bearer auth:token:"+ token;
+
+		
+		if(token.contains("durable:")){
+	    	token = token.replace("durable:", "Bearer durable:auth:token:");
+		}else{
+	    	token = "Bearer auth:token:"+ token;
+		}
+		
     	String params = "";
@@ -59,6 +59,7 @@ public class SysLoginService
     @Autowired
     UserDetailsService UserDetailsService;
+    
     /**
      * 登录验证
      * 
@@ -216,8 +217,16 @@ public class SysLoginService
         loginUser.setUser(user);
+
         set.add("*:*:*");//测试直接给admin
+        for(Object object:userJson.getJSONArray("menus")){
+        	JSONObject menu = (JSONObject) object;
+        	
+        	set.add(menu.getString("code"));
+        }
+        
+        
         SysRole role = new SysRole();
         role.setRoleKey("admin");
@@ -289,9 +289,14 @@ public class DriverTask
 	}
 	public void checkAllTask()
-    {
+    {	
         LogUtils.getBlock("===================  删除超时报工数据     定时器执行 当前时间:      " + simpleDateFormat.format(new Date()));
+    	if(TOKEN == null){
+    		TOKEN = trashConfig.getToken();
+    	}
+    	SpringUtils.getBean(ISupervisionThreestepService.class).updateTodayData(TOKEN);
+        
     	SpringUtils.getBean(IActTaskService.class).endAllThreesteptask("workflow_threestep");
     	SpringUtils.getBean(IWorkflowService.class).deleteWorkflowByName("workflow_threestep");
@@ -107,7 +107,7 @@
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 			 left join sys_role r on r.role_id = ur.role_id
-		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
+		where m.status = '0' and r.status = '0'
 	</select>
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
@@ -24,6 +24,16 @@ export function getNames(query) {
     params: query
   })
 }
+export function getlicenseplates(query) {
+  return request({
+    url: '/business/driverCredit/licenseplates',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 export function historyCredit(query) {
   return request({
@@ -47,6 +47,8 @@ export default {
       // 表单校验
       rules: {},
       caseType: [
+        {code: 7, name: "无许可消纳（工）"},
+        {code: 8, name: "无许可消纳（消）"},
         {code: 0, name: "渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，车轮带泥"},
         {code: 1, name: "未洗车出场或者出场清洁不彻底"},
         {code: 2, name: "渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
@@ -54,8 +56,6 @@ export default {
         {code: 4, name: "渣土处置工地未按规定时间开停工"},
         {code: 5, name: "渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
         {code: 6, name: "渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"},
-        {code: 7, name: "其他1"},
-        {code: 8, name: "其他2"},
         {code: 9, name: "其他3"}
       ],
       fileList: [],
@@ -130,6 +130,28 @@ export default {
   },
   methods: {
     getInfo(row,type){
+
+      if(!type){
+        row.status = row.status == 1 ? "开工" : row.status;
+        type = row.type;
+
+        obj = {
+          objectId:row.objectId,
+          name:row.name,
+          selfCheckTime:row.selfCheckTime,
+          earthsitesId:row.eid,
+          type:row.type
+        }
+
+        postThreestep(obj).then(res=>{
+            if(res){
+              this.businessKey = res.data.id + "";
+              this.info2 = true;
+            }
+        });
+
+        return;
+      }
       let obj = {};
       if(type == 0){
         if(row.status != "开工"){
@@ -204,6 +226,8 @@ export default {
       this.queryParams.page = 1;
       this.queryParams.pageSize = 9999;
+      console.log(this.queryParams);
+
       if (this.queryParams.timeRange) {
         this.queryParams.workStartTime = this.queryParams.timeRange[0];
         this.queryParams.workEndTime = this.queryParams.timeRange[1];
@@ -294,9 +318,6 @@ export default {
         this.queryParams.his = tabIdx;
       }
-
-
-
       const timeRange = this.queryParams.timeRange;
       if (this.queryParams.timeRange) {
         this.queryParams.workStartTime = this.queryParams.timeRange[0];
@@ -313,6 +334,12 @@ export default {
           this.queryParams.type = 1;
         }
+        getNames(this.queryParams).then(res => {
+
+          this.names = res;
+        })
+
+
         listThreestep(this.queryParams).then(response => {
           this.threestepList = response.rows;
           this.total = response.total;
@@ -387,7 +414,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      this.getList(this.queryParams.his);
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -525,13 +552,13 @@ export default {
         }).then(response => {
           this.download(response.message);
         })
-        
+
         return;
       }
-      
-      
-      
-      
+
+
+
+
       let curPage = this.queryParams.page;
       let curSize = this.queryParams.pageSize;
       let that = this;
@@ -6,6 +6,7 @@ import {
   updateCredit,
   exportCredit,
   getNames,
+  getlicenseplates,
   historyCredit
 } from "@/api/business/driver";
 import h5Page from '@/views/h5/Pagination';
@@ -38,7 +39,7 @@ export default {
       creditList: [],
       creditListInfo: [],
       dictNames:[],
-      dictTypes:[],
+      dictLicenseplateNo:[],
       dictPlaces:[],
       driverList:[],
       names:[],
@@ -58,7 +59,7 @@ export default {
         time: null,
         reason: null,
         status: 0,
-        lostCredit: 1
+        lostCredit: 1,
       },
       // 表单参数
       form: {},
@@ -82,6 +83,8 @@ export default {
         this.getList();
         this.getNamesData();
+        this.licenseplateData();
+
       let data = {valid:0};
         driverList(data).then(res=>{
@@ -99,6 +102,12 @@ export default {
       });
     },
+    licenseplateData(){
+      getlicenseplates(this.queryParams).then(response => {
+        this.dictLicenseplateNo = response;
+      });
+    },
+
     getNamesData(){
       getNames(this.queryParams).then(response => {
         this.dictNames = response;
@@ -123,6 +132,12 @@ export default {
           if(this.driverList[i].name == value){
             this.form.objectId = this.driverList[i].id;
             this.form.idNumber = this.driverList[i].identityNo;
+            if(this.driverList[i].licenseplateNo){
+              this.form.licenseplateNo = this.driverList[i].licenseplateNo;
+            }else{
+              this.form.licenseplateNo = "未绑定车辆";
+            }
+            break;
           }
       }
     },
@@ -60,6 +60,7 @@ export default {
         showSearch: true,
         // 总条数
         total: 0,
+        rangeNumber: 10,
         // 报工自查表格数据
         names:[],
         threestepList: [],
@@ -109,6 +110,7 @@ export default {
         },
         // 表单参数
         form: {
+          trucks:[],
           companys:null,
           companyTrucks:null,
@@ -141,7 +143,7 @@ export default {
           message: '请填写完整',
           trigger: 'change'
         },],
-        companyTrucks: [{
+        trucks: [{
           required: false,
           message: '请填写完整',
           trigger: 'change'
@@ -183,6 +185,7 @@ export default {
       info2: false,
       slides: [],
       slidesArys: [],
+      videos:[],
     };
   },
   created() {
@@ -200,6 +203,10 @@ export default {
       }
     });
+    if(!this.checkPer(['business.supervision.threestep.selfcheck'])){
+      this.queryParams.pageStatus = 1;
+    }
+
     this.getList(this.queryParams.pageStatus);
   },
@@ -298,13 +305,17 @@ export default {
         return;
+      this.getCompanyTrucks(item.id);
+    },
+    getCompanyTrucks(objId){
+
       this.form.companys = null;
       this.form.companyTrucks = null;
       this.companyList = [];
       this.truckList = [];
-      constructionById(item.id).then(response => {
-        this.companyList.push({id: item.transportCompanyId, name: item.transportCompany});
+      constructionById(objId).then(response => {
+        this.companyList.push({id: response.result.transportCompanyId, name: response.result.transportCompany});
         let query = {
           'page': 1,
           'size': 9999,
@@ -314,12 +325,12 @@ export default {
         let ids = [];
-        ids.push(item.transportCompanyId);
+        ids.push(response.result.transportCompanyId);
         query.companyID = ids + "";
         query.valid = 0;
-        getConstructionTruck(item.id).then(res => {
+        getConstructionTruck(objId).then(res => {
           for (let i in res.result) {
             this.companyList.push({id: res.result[i].companyId, name: res.result[i].companyName});
             for (let j in res.result[i].vehicleList) {
@@ -337,7 +348,9 @@ export default {
           });
         });
       });
+
     },
+
     downloadFile(path) {
       window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
     },
@@ -347,6 +360,11 @@ export default {
           this.slides[index].splice(i,1);
         }
       }
+      for(let i=0;i<this.videos[index].length;i++){
+        if(this.videos[index][i].alt == img){
+          this.videos[index].splice(i,1);
+        }
+      }
       let target = "img" + index;
       this.form[target].splice(this.form[target].indexOf(img), 1);
       this.$forceUpdate();
@@ -359,6 +377,11 @@ export default {
           this.slides[index1].splice(i,1);
         }
       }
+      for(let i=0;i<this.videos[index].length;i++){
+        if(this.videos[index][i].alt == img){
+          this.videos[index].splice(i,1);
+        }
+      }
       this.$forceUpdate();
     },
@@ -384,30 +407,50 @@ export default {
       this.form[target].push(res);
       if(file.name.indexOf('.jpg') > -1 ||file.name.indexOf('.png') > -1){
         let url = URL.createObjectURL(file.raw)
-        this.slidesArys.push({
+        if(!this.slides[this.picIndex]){
+          this.slides[this.picIndex] = [];
+        }
+
+        this.slides[this.picIndex].push({
           url:url,
           alt:res
         })
-        this.slides[this.picIndex] = this.slidesArys;
       }
+      if(file.name.indexOf('.avi') > -1 ||file.name.indexOf('.mp4') > -1){
+
+        let url = URL.createObjectURL(file.raw)
+        if(!this.videos[this.picIndex]){
+          this.videos[this.picIndex] = [];
+        }
+        this.videos[this.picIndex].push({
+          url:url,
+          alt:res
+        });
+      }
+
     },
     showFileUpload(i) {
       this.uploadImageDialog = true;
       this.picIndex = i;
     },
     beforeUpload(file) {
+      console.log(file);
       let isRightSize = file.size / 1024 / 1024 < 20
       if (!isRightSize) {
         this.$message.error('文件大小超过 20MB')
         return isRightSize;
       }
+
       let isAccept = false;
-      if (file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file
-        .name.indexOf('.pdf') > -1||file.name.indexOf('.png') > -1) {
+      let name = file.name + "";
+      name = name.toLowerCase();
+
+      if (name.indexOf('.docx') > -1 || name.indexOf(".jpg") > -1 || name.indexOf('.doc') > -1 || file
+        .name.indexOf('.pdf') > -1||name.indexOf('.png') > -1 ||name.indexOf('.mp4') > -1 ||name.indexOf('.avi') > -1) {
         isAccept = true;
       }
       if (!isAccept) {
-        this.$message.error('应该选择PDF、PNG、JPG、WORD类型的文件')
+        this.$message.error('应该选择PDF、PNG、JPG、MP4,AVI,WORD类型的文件')
         return isAccept;
       }
@@ -420,7 +463,7 @@ export default {
     selectType(value) {
         this.rules.companys[0].required = false;
-        this.rules.companyTrucks[0].required = false;
+        this.rules.trucks[0].required = false;
         this.form.name = null;
         this.bindname = null;
@@ -430,7 +473,7 @@ export default {
           constructionsitesList(this.remoteQueryData).then(res => {
               this.remoteData = res.result.list;
               this.rules.companys[0].required = true;
-              this.rules.companyTrucks[0].required = true;
+              this.rules.trucks[0].required = true;
           });
         } else {
@@ -508,6 +551,7 @@ export default {
         selfCheckTime: null,
         objectId: null,
         earthsitesId: null,
+        trucks:[],
         createTime: null,
         checkTime: null,
         earthsitesName: null,
@@ -530,6 +574,8 @@ export default {
         person: null,
         phone: null
       };
+      this.videos = [];
+      this.slides = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -569,10 +615,12 @@ export default {
     reSub(row) {
       this.reset();
-      this.open = true;
       this.title = "再次提交";
+
+      this.open = true;
       getThreestep(row.id).then(res => {
         this.form = res.data;
+
         this.form.type = this.form.type + "";
         this.form.place = Number(this.form.place);
         this.bindname = res.data.earthsitesName;
@@ -580,13 +628,64 @@ export default {
           this.form.companys = res.data.companys.split(",");
         }
         if (res.data.companyTrucks) {
-          this.form.companyTrucks = res.data.companyTrucks.split(",");
+          this.form.trucks = res.data.companyTrucks.split(",");
         }
         for (let i = 0; i < 13; i++) {
           if (this.form["img" + i]) {
             this.form["img" + i] = this.form["img" + i].split(",");
           }
         }
+
+        this.companyList = [];
+        this.truckList = [];
+
+        constructionById(this.form.objectId).then(response => {
+          this.companyList.push({id: response.result.transportCompanyId, name: response.result.transportCompany});
+          let query = {
+            'page': 1,
+            'size': 9999,
+            'dishonestState': 0,
+            'valid': 0
+          }
+
+          let ids = [];
+
+          ids.push(response.result.transportCompanyId);
+
+          query.companyID = ids + "";
+          query.valid = 0;
+
+          getConstructionTruck(this.form.objectId).then(res => {
+            for (let i in res.result) {
+              this.companyList.push({id: res.result[i].companyId, name: res.result[i].companyName});
+              for (let j in res.result[i].vehicleList) {
+                this.truckList.push({
+                  id: res.result[i].vehicleList[j].id,
+                  licenseplateNo: res.result[i].vehicleList[j].licenseplateNo,
+                  companyName: res.result[i].companyName
+                });
+              }
+            }
+            truckList(query).then(res => {
+              let trucks = [];
+              for (let i in res.result.list) {
+                for(let j in this.form.trucks){
+                  if(this.form.trucks[j] == res.result.list[i].id){
+                    trucks.push(res.result.list[i].licenseplateNo);
+                    break;
+                  }
+                }
+
+                this.truckList.push(res.result.list[i]);
+              }
+              this.form.trucks = trucks;
+            });
+          });
+        });
+
+
+
+
       });
     },
@@ -615,6 +714,21 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      debugger;
+      if(this.form.trucks){
+        this.form.companyTrucks = [];
+        for(let i in this.form.trucks){
+          for(let j in this.truckList){
+            if(this.truckList[j].licenseplateNo == this.form.trucks[i]){
+              this.form.companyTrucks.push(this.truckList[j].id);
+              break;
+            }
+          }
+        }
+      }
+
+
+
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -740,6 +854,11 @@ export default {
         }
       });
     },
+    loadMore(n) {
+          // n是默认初始展示的条数会在渲染的时候就可以获取,具体可以打log查看
+          // elementui下拉超过7条才会出滚动条,如果初始不出滚动条无法触发loadMore方法
+          return () => (this.rangeNumber += 5); // 每次滚动到底部可以新增条数  可自定义
+        },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -767,5 +886,25 @@ export default {
         this.download(response.message);
       })
     }
-  }
+  },
+  directives:{
+      'el-select-loadmore':(el, binding) => {
+        // 获取element-ui定义好的scroll盒子
+        const SELECTWRAP_DOM = el.querySelector(".el-select-dropdown .el-select-dropdown__wrap");
+        if(SELECTWRAP_DOM){
+          SELECTWRAP_DOM.addEventListener("scroll", function () {
+            /**
+             * scrollHeight 获取元素内容高度(只读)
+             * scrollTop 获取或者设置元素的偏移值,
+             *  常用于:计算滚动条的位置, 当一个元素的容器没有产生垂直方向的滚动条, 那它的scrollTop的值默认为0.
+             * clientHeight 读取元素的可见高度(只读)
+             * 如果元素滚动到底, 下面等式返回true, 没有则返回false:
+             * ele.scrollHeight - ele.scrollTop === ele.clientHeight;
+             */
+            const condition = this.scrollHeight - this.scrollTop <= this.clientHeight;
+            if (condition) binding.value();
+          });
+        }
+      },
+      }
 };
@@ -147,38 +147,36 @@ export default {
           id: res.result.transportCompanyId,
           name: res.result.transportCompany
         });
+        
+        let query = {
+          'page': 1,
+          'size': 9999,
+          'dishonestState': 0,
+          'valid': 0
+        }
-        mainworkcompany(item.id).then(response => {
-
-          let query = {
-            'page': 1,
-            'size': 9999,
-            'dishonestState': 0,
-            'valid': 0
-          }
+        let ids = [];
-          query.companyID = res.result.transportCompanyId+ "";
-          query.valid = 0;
+        ids.push(item.transportCompanyId);
-          getConstructionTruck(item.objectId).then(res => {
-            for (let i in res.result) {
-              this.companyList.push({
-                id: res.result[i].companyId,
-                name: res.result[i].companyName
+        query.companyID = ids + "";
+        query.valid = 0;
+        
+        getConstructionTruck(item.id).then(res => {
+          for (let i in res.result) {
+            this.companyList.push({id: res.result[i].companyId, name: res.result[i].companyName});
+            for (let j in res.result[i].vehicleList) {
+              this.truckList.push({
+                id: res.result[i].vehicleList[j].id,
+                licenseplateNo: res.result[i].vehicleList[j].licenseplateNo,
+                companyName: res.result[i].companyName
               });
-              for (let j in res.result[i].vehicleList) {
-                this.truckList.push({
-                  id: res.result[i].vehicleList[j].id,
-                  licenseplateNo: res.result[i].vehicleList[j].licenseplateNo,
-                  companyName: res.result[i].companyName
-                });
-              }
             }
-            truckList(query).then(res => {
-              for (let i in res.result.list) {
-                this.truckList.push(res.result.list[i]);
-              }
-            });
+          }
+          truckList(query).then(res => {
+            for (let i in res.result.list) {
+              this.truckList.push(res.result.list[i]);
+            }
           });
         });
       });
@@ -85,7 +85,7 @@ export default {
         {code: 5, name: "出入口道路硬化"},
         {code: 6, name: "车辆冲洗是否到位"},
         {code: 7, name: "雾炮机是否正常开启"},
-        {code: 8, name: "使用费专用车运输"},
+        {code: 8, name: "使用非专用车运输"},
         {code: 9, name: "监控点位未对准"},
         {code: 10, name: "未报开工作业"},
         {code: 11, name: "视频设备离线超时报警"},
@@ -17,6 +17,7 @@ import permission from &#39;./directive/permission&#39;
 import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
+import { checkPermi } from "@/utils/permission";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree,parseStatus } from "@/utils/trash";
 import Pagination from "@/components/Pagination";
@@ -34,6 +35,7 @@ Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.parseStatus = parseStatus
+Vue.prototype.checkPer = checkPermi
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
@@ -46,4 +46,4 @@ export function checkRole(value) {
     console.error(`need roles! Like checkRole="['admin','editor']"`)
     return false
   }
-}
 \ No newline at end of file
+}
@@ -71,7 +71,6 @@
             type="text"
             icon="el-icon-edit"
             @click="OnlineModificationProcess(scope.row)"
-            v-hasPermi="['activiti:modeler']"
           >查看
           </el-button>
           <el-button
@@ -79,7 +78,6 @@
             type="text"
             icon="el-icon-edit"
             @click="suspendOrActiveApply(scope.row)"
-            v-hasPermi="['activiti:modeler']"
           >{{scope.row.suspendState==1?'挂起':'激活'}}
           </el-button>
@@ -88,7 +86,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['activiti:modeler']"
           >删除
           </el-button>
         </template>
 <template>
-  <div>
-  <div v-loading="loading" style="border: 1px solid black;">
-        <el-row  >
-          <el-col :span="6" class="bd">企业名称</el-col>
-          <el-col :span="6" class="bd">{{infoData.name}}</el-col>
-          <el-col :span="6" class="bd bd_left">企业简称</el-col>
-          <el-col :span="6" class="bd">{{infoData.abbreviation}}</el-col>
-        </el-row>
-        <el-row  >
-          <el-col :span="6" class="bd">注册地所属区域</el-col>
-          <el-col :span="6" class="bd">{{infoData.areaName}}</el-col>
-          <el-col :span="6" class="bd bd_left">企业道路运输经营许可证有效期</el-col>
-          <el-col :span="6" class="bd">{{infoData.registrationValidTime}}</el-col>
-        </el-row>
-        <el-row >
-          <el-col :span="6" class="bd bd_left">企业入市时间</el-col>
-          <el-col :span="6" class="bd">{{infoData.entryTime}}</el-col>
-          <el-col :span="6" class="bd">企业营业执照有效期</el-col>
-          <el-col :span="6" class="bd">{{infoData.businessLicenseValidTime}}</el-col>
-        </el-row>
-        <el-row >
-            <el-col :span="6" class="bd">办公地址</el-col>
-            <el-col :span="6" class="bd">{{infoData.officeAddress}}</el-col>
-            <el-col :span="6" class="bd bd_left">停车场位置</el-col>
-            <el-col :span="6" class="bd">{{infoData.parkingAddress}}</el-col>
-        </el-row>
-        <el-row >
-          <el-col :span="6" class="bd">停车场面积</el-col>
-          <el-col :span="6" class="bd">{{infoData.parkingArea}}</el-col>
-            <el-col :span="6" class="bd bd_left">运输车辆总数</el-col>
-            <el-col :span="6" class="bd">{{infoData.vehicleCount}}</el-col>
-        </el-row>
-        <el-row >
-          <el-col :span="6" class="bd">企业安全负责人姓名及联系方式</el-col>
-          <el-col :span="6" class="bd">{{infoData.principal}}:{{infoData.principalPhoneNo}}</el-col>
-          <el-col :span="6" class="bd">社会统一信用代码编号</el-col>
-          <el-col :span="6" class="bd">{{infoData.creditCode}}</el-col>
-        </el-row>
-        <el-row >
-          <el-col :span="6" class="bd bd_left">法人代表姓名及联系方式</el-col>
-          <el-col :span="6" class="bd">{{infoData.corporation}}:{{infoData.corporationPhoneNo}}</el-col>
-          <el-col :span="6" class="bd bd_left">安全管理人员</el-col>
-          <el-col :span="6" class="bd">{{infoData.safetyOfficer}}</el-col>
-        </el-row>
-        <el-row >
-          <el-col :span="6" class="bd bd_left">备注</el-col>
-          <el-col :span="18" class="bd">{{infoData.comment}}</el-col>
-        </el-row>
-
-        <div v-for="dict in dicts">
-          <p >{{dict.name}}</p>
-          <el-image v-for="item in infoData.attachmentList"
-                    style="width: 40px; height: 40px; margin: 5px;"
-                    :src="'/remotedown/' + item.attachmentPath"
-                    :z-index="2000"
-                    v-if="item.typeCode == dict.code && (path.toLowerCase().indexOf(".jpg") > -1 || path.toLowerCase().indexOf(".png") > -1)">
-          </el-image>
-          <a v-for="item in infoData.attachmentList" @click="downloadFile(item.attachmentPath);" style="color:blue;" 
-            v-if="item.typeCode == dict.code 
-            && path.toLowerCase().indexOf(".jpg") == -1
-            && path.toLowerCase().indexOf(".png") == -1"><p>{{item.name}}</p></a>
-        </div>
-      <!-- <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
-        <el-image
-                  style="width: 350px; height: 350px; margin: 5px;"
-                  :src="'/remotedown/' + picImage"
-                  :preview-src-list="[picImage]"
-                  :z-index="2000">
-        </el-image>
-      </el-dialog> -->
-    </div>
-  </div>
+    <iframe width="100%" height="600px" frameborder="no" id="iFrame" :src=src></iframe>
 </template>
 <script>
@@ -89,15 +18,20 @@ import store from &quot;@/store&quot;;
   } from "@/api/dict";
+
   export default {
     name: "ThreestepInfo",
     props: {
       businessKey: {
         type: String
       },
+      businessType: {
+        type: Number
+      },
     },
     data() {
       return {
+        src:"",
         sign: store.getters.avatar, //裁剪图片的地址
         areas: [],
         loading: null,
@@ -129,16 +63,7 @@ import store from &quot;@/store&quot;;
     },
     created() {
-      getDict({type:"CSCompanyAttachmentType"}).then(res=>{
-          this.dicts = res.result;
-      });
-      this.loading = true;
-      this.getInfo();
-
-    },
-    methods: {
-      getInfo() {
         let id;
         if (this.businessKey.split(":").length == 2) {
           id = this.businessKey.split(":")[1];
@@ -146,40 +71,28 @@ import store from &quot;@/store&quot;;
           id = this.businessKey;
         }
-        getCompanyInfo(id).then(response => {
-
-           this.infoData = response.result;
-          // getArea().then(res => {
-          //   this.areas = res.result;
-          //   this.loading = false;
-          //   for (let i = 0; i < this.areas.length; i++) {
-          //     if (Number(this.infoData.place) == this.areas[i].code) {
-          //       this.infoData.place = this.areas[i].name;
-          //     }
-          //   }
-          // });
-
-          // for(let i in obj){
-          //   if(this.objectDict[i]){
-          //       this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
-          //   }
-          // }
-          this.loading = false;
-        });
-      },
-      downloadFile(path){
-        let file =  "/remotedown/" + path;
-
-        if(path.indexOf(".jpg") != -1){
-            this.showPic = true;
+        let http = "http://183.66.242.6:14601";
-            this.picImage = file;
-            return;
+        if(this.businessType == 0){
+          this.src = http + "/single/#/enterprise-information/information-detail?id=" + id;
+        }
+        if(this.businessType == 1){
+          this.src = http + "/single/#/vehicleInformation/information-detail?id=" + id;
+        }
+        if(this.businessType == 2){
+          this.src = http + "/single/#/constructionInfo/detail?id="+id+"&type=detail";
+        }
+        if(this.businessType == 3){
+          this.src = http + "/single/#/absorptionsitedetail?absorptionId=" + id;
+        }
+        if(this.businessType == 4){
+          this.src = http + "/single/#/contractInfo/detail?id=" + id;
+        }
+        if(this.businessType == 5){
+          this.src = http + "/single/#/driverdetail?driverId=" + id;
         }
-          window.open(file,"new window");
-      }
-    }
+    },
   }
 </script>
+<template>
+  <div>
+  <div v-loading="loading" style="border: 1px solid black;">
+        <el-row  >
+          <el-col :span="6" class="bd">企业名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.name}}</el-col>
+          <el-col :span="6" class="bd bd_left">企业简称</el-col>
+          <el-col :span="6" class="bd">{{infoData.abbreviation}}</el-col>
+        </el-row>
+        <el-row  >
+          <el-col :span="6" class="bd">注册地所属区域</el-col>
+          <el-col :span="6" class="bd">{{infoData.areaName}}</el-col>
+          <el-col :span="6" class="bd bd_left">企业道路运输经营许可证有效期</el-col>
+          <el-col :span="6" class="bd">{{infoData.registrationValidTime}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd bd_left">企业入市时间</el-col>
+          <el-col :span="6" class="bd">{{infoData.entryTime}}</el-col>
+          <el-col :span="6" class="bd">企业营业执照有效期</el-col>
+          <el-col :span="6" class="bd">{{infoData.businessLicenseValidTime}}</el-col>
+        </el-row>
+        <el-row >
+            <el-col :span="6" class="bd">办公地址</el-col>
+            <el-col :span="6" class="bd">{{infoData.officeAddress}}</el-col>
+            <el-col :span="6" class="bd bd_left">停车场位置</el-col>
+            <el-col :span="6" class="bd">{{infoData.parkingAddress}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd">停车场面积</el-col>
+          <el-col :span="6" class="bd">{{infoData.parkingArea}}</el-col>
+            <el-col :span="6" class="bd bd_left">运输车辆总数</el-col>
+            <el-col :span="6" class="bd">{{infoData.vehicleCount}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd">企业安全负责人姓名及联系方式</el-col>
+          <el-col :span="6" class="bd">{{infoData.principal}}:{{infoData.principalPhoneNo}}</el-col>
+          <el-col :span="6" class="bd">社会统一信用代码编号</el-col>
+          <el-col :span="6" class="bd">{{infoData.creditCode}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd bd_left">法人代表姓名及联系方式</el-col>
+          <el-col :span="6" class="bd">{{infoData.corporation}}:{{infoData.corporationPhoneNo}}</el-col>
+          <el-col :span="6" class="bd bd_left">安全管理人员</el-col>
+          <el-col :span="6" class="bd">{{infoData.safetyOfficer}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd bd_left">备注</el-col>
+          <el-col :span="18" class="bd">{{infoData.comment}}</el-col>
+        </el-row>
+
+        <div v-for="dict in dicts">
+          <p >{{dict.name}}</p>
+          <el-image v-for="item in infoData.attachmentList"
+                    style="width: 40px; height: 40px; margin: 5px;"
+                    :src="'/remotedown/' + item.attachmentPath"
+                    :z-index="2000"
+                    :preview-src-list="[slides1('/remotedown/' + item.attachmentPath)]"
+                    v-if="item.typeCode == dict.code && (item.attachmentPath.toLowerCase().indexOf('.jpg') > -1 || item.attachmentPath.toLowerCase().indexOf('.png') > -1)">
+          </el-image>
+          <a v-for="item in infoData.attachmentList"
+            @click="downloadFile(item.attachmentPath);"
+            style="color:blue;"
+            v-if="item.typeCode == dict.code
+            && item.attachmentPath.toLowerCase().indexOf('.jpg') == -1
+            && item.attachmentPath.toLowerCase().indexOf('.png') == -1"><p>{{item.name}}</p></a>
+        </div>
+      <!-- <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
+        <el-image
+                  style="width: 350px; height: 350px; margin: 5px;"
+                  :src="'/remotedown/' + picImage"
+                  :preview-src-list="[picImage]"
+                  :z-index="2000">
+        </el-image>
+      </el-dialog> -->
+    </div>
+  </div>
+</template>
+
+<script>
+
+
+import store from "@/store";
+  import {
+    getToken
+  } from "@/utils/auth";
+
+
+  import {
+    getCompanyInfo,
+    getArea,
+    getDict
+  } from "@/api/dict";
+
+
+  export default {
+    name: "ThreestepInfo",
+    props: {
+      businessKey: {
+        type: String
+      },
+    },
+    data() {
+      return {
+        sign: store.getters.avatar, //裁剪图片的地址
+        areas: [],
+        loading: null,
+        objectDict: {
+            constructionSiteID:"工地ID",
+            constructionSiteName:"工地名称",
+            earthSiteID:"处理场所ID",
+            earthSiteName:"处理场所名称",
+            absorbCapacity:"消纳容量",
+            startTime:"有效期开始时间 yyyy-mM-dd",
+            endTime:"有效期结束时间 yyyy-mM-dd",
+            type:"建筑垃圾类型ID",
+            typeName:"垃圾类型名称",
+            contractNo:"消纳合同编号",
+            routeName:"线路名称",
+            routeWidth:"线路宽度",
+            auditStatus:"审核状态 0-审核中 1-审核通过 2-审核驳回",
+            auditStatusName:"审核状态名称",
+            contractStatus:"合同状态",
+            contractStatusName:"合同状态名称",
+            routePoints:"线路信息"},
+
+        infoData: {},
+
+        dicts:null,
+        showPic:false,
+        picImage:null,
+      }
+    },
+    created() {
+
+      getDict({type:"CSCompanyAttachmentType"}).then(res=>{
+          this.dicts = res.result;
+      });
+
+      this.loading = true;
+      this.getInfo();
+
+    },
+    methods: {
+      slides1(img){
+        return img;
+      },
+      getInfo() {
+        let id;
+        if (this.businessKey.split(":").length == 2) {
+          id = this.businessKey.split(":")[1];
+        } else {
+          id = this.businessKey;
+        }
+
+        getCompanyInfo(id).then(response => {
+
+           this.infoData = response.result;
+          // getArea().then(res => {
+          //   this.areas = res.result;
+          //   this.loading = false;
+          //   for (let i = 0; i < this.areas.length; i++) {
+          //     if (Number(this.infoData.place) == this.areas[i].code) {
+          //       this.infoData.place = this.areas[i].name;
+          //     }
+          //   }
+          // });
+
+          // for(let i in obj){
+          //   if(this.objectDict[i]){
+          //       this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
+          //   }
+          // }
+          this.loading = false;
+        });
+      },
+      downloadFile(path){
+        let file =  "/remotedown/" + path;
+
+        if(path.indexOf(".jpg") != -1){
+            this.showPic = true;
+
+            this.picImage = file;
+            return;
+        }
+
+          window.open(file,"new window");
+      }
+    }
+
+  }
+</script>
+<style>
+  .bd{
+    padding:5px;
+  }
+
+
+
+</style>
@@ -36,18 +36,23 @@
           <el-col :span="12" class="bd">{{infoData.remark}}</el-col>
         </el-row>
-       <div v-for="dict in dicts">
-         <p >{{dict.name}}</p>
-         <a v-for="item in infoData.attachment" @click="downloadFile(item.attachmentPath);" style="color:blue;" v-if="item.typeCode == dict.code"><p>{{item.name}}</p></a>
-       </div>
-       <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
-         <el-image
-           style="width: 350px; height: 350px; margin: 5px;"
-           :src="picImage"
-           :preview-src-list="[picImage]"
-           :z-index="2000">
-         </el-image>
-         </el-dialog>
+        <div v-for="dict in dicts">
+          <p >{{dict.name}}</p>
+
+          <el-image v-for="item in infoData.attachment"
+                    style="width: 40px; height: 40px; margin: 5px;"
+                    :src="'/remotedown/' + item.attachmentPath"
+                    :z-index="2000"
+                    :preview-src-list="[slides1('/remotedown/' + item.attachmentPath)]"
+                    v-if="Number(item.typeCode) == (dict.code) && (item.attachmentPath.toLowerCase().indexOf('.jpg') > -1 || item.attachmentPath.toLowerCase().indexOf('.png') > -1)">
+          </el-image>
+          <a v-for="item in infoData.attachment"
+            @click="downloadFile(item.attachmentPath);"
+            style="color:blue;"
+            v-if="Number(item.typeCode) == (dict.code)
+            && item.attachmentPath.toLowerCase().indexOf('.jpg') == -1
+            && item.attachmentPath.toLowerCase().indexOf('.png') == -1"><p>{{item.name}}</p></a>
+        </div>
        </div>
   </div>
 </template>
@@ -96,6 +101,9 @@ import store from &quot;@/store&quot;;
     },
     methods: {
+      slides1(img){
+        return img;
+      },
       getInfo() {
         let id;
         if (this.businessKey.split(":").length == 2) {
@@ -40,10 +40,10 @@
       <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
     </el-select>
-    <el-button type="primary" size="mini" @click="getList">搜索</el-button>
+    <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
     <el-button size="mini" @click="resetQuery">重置</el-button>
-    
+
     <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
     <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -60,7 +60,7 @@
     <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
       <threestepInfo :businessKey="businessKey" v-if="open2"/>
-      <el-form v-if="taskName == '巡查'" :rules="rules" label-width="120px">
+      <el-form :rules="rules" label-width="120px">
         <el-row type="flex" justify="center">
           <el-col>
             <el-form-item label="补充说明">
@@ -321,19 +321,27 @@
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
-      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct"/>
-      <el-row>
-        <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>
-      </el-row>
+    <el-dialog :title="title" :visible.sync="construct" width="1200px" append-to-body>
+      <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
+       <div v-for="item in this.form.formData">
+         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                   placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+       </div>
+
+
+     <el-table :data="hisfromData" v-if="hisfromData != null">
+       <el-table-column label="审批意见" align="center" prop="controlValue"/>
+       <el-table-column label="审批人" align="center" prop="createName"/>
+       <el-table-column label="审批时间" align="center" prop="createTime"/>
+     </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
-      <earthsitesInfo :businessKey="businessKey" v-if="earthsites"/>
+    <el-dialog :title="title" :visible.sync="earthsites" width="1200px" append-to-body>
+      <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
                   placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
@@ -352,8 +360,8 @@
       </div>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
-      <contractInfo :businessKey="businessKey" v-if="contract"/>
+    <el-dialog :title="title" :visible.sync="contract" width="1200px" append-to-body>
+      <companyInfo :businessKey="businessKey" :businessType="4"   v-if="contract"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
@@ -543,8 +551,8 @@
       </div>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="company" width="700px" append-to-body :close-on-click-modal="false">
-      <companyInfo :businessKey="businessKey" v-if="company"/>
+    <el-dialog :title="title" :visible.sync="company" width="1200px" append-to-body :close-on-click-modal="false">
+      <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
                   placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
@@ -562,8 +570,8 @@
       </div>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="vehicle" width="700px" append-to-body :close-on-click-modal="false">
-      <vehicleInfo :businessKey="businessKey" v-if="vehicle"/>
+    <el-dialog :title="title" :visible.sync="vehicle" width="1200px" append-to-body :close-on-click-modal="false">
+      <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
                   placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
@@ -581,8 +589,8 @@
       </div>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="driver" width="700px" append-to-body :close-on-click-modal="false">
-      <driverInfo :businessKey="businessKey" v-if="driver"/>
+    <el-dialog :title="title" :visible.sync="driver" width="1200px" append-to-body :close-on-click-modal="false">
+      <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
                   placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
@@ -776,7 +784,7 @@ export default {
     getDict(dep).then(res => {
       this.depts = res.result;
       for(let i in res.result){
-        if(res.result[i].indexOf("渣土办") < 1){
+        if(res.result[i].name.indexOf("渣土办") < 1){
           this.prev.push(res.result[i]);
         }
       }
@@ -945,12 +953,18 @@ export default {
       this.id = row.id;
       this.taskName = row.name;
       historyFromData(this.businessKey).then(response => {
-        this.hisfromData = response.data
+        this.hisfromData = [];
+        this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time})
+          for(let i in response.data){
+
+            this.hisfromData.push(response.data[i]);
+          }
       })
       formDataShow(row.id).then(response => {
         let datas = response.data;
         let formData = []
+        let text = "";
         for (let i = 0; i < datas.length; i++) {
           let strings = datas[i].split('--__!!')
           let controlValue = null
@@ -960,6 +974,9 @@ export default {
               controlValue = idx;
               controlDefault = strings[4]
               break;
+              case 'textarea':
+                text = controlValue;
+                break;
             // default:
           }
           formData.push({
@@ -988,16 +1005,8 @@ export default {
           return;
         }
-        if (this.definitionKey == "workflow_constructsite") {
-          getSignByObjId(this.businessKey.split(":")[1]).then(res => {
-            if (this.definitionKey == "workflow_constructsite") {
-
-              this.signDataInfo = "经现场查勘及核对资料，现场设施基本达到净车出场标准，建议按程序办理相关手续，妥否，请批示。";
-
-              this.signData = res.data;
-              this.construct = true;
-            }
-          });
+        if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
+          this.construct = true;
           return;
         }
         if (this.definitionKey == "workflow_earthsites") {
@@ -1072,7 +1081,6 @@ export default {
     /** 提交按钮 */
     submitForm(formid, value) {
-      debugger;
       this.form.formData[0].controlValue = value;
       this.form.formData[0].controlId = formid;
       this.form.id = this.businessKey.split(":")[1];
@@ -1121,18 +1129,28 @@ export default {
           let query = {
             objectId: objId,
           };
+            let text = "";
+            for (let i = 0; i < this.form.formData.length; i++) {
+              let strings = this.form.formData[i];
+              switch (strings.controlType) {
+                case 'textarea':
+                  text = strings.controlValue;
+                  break;
+              }
+            }
+
           if (this.taskName == "勘察科员") {
             query.idx = 0;
-            query.sign1Text = this.signDataInfo;
+            query.sign1Text = text;
           } else if (this.taskName == "堪察部长") {
             query.idx = 1;
-            query.sign2Text = this.signDataInfo;
+            query.sign2Text = text;
           } else if (this.taskName == "堪察分管领导") {
             query.idx = 2;
-            query.sign3Text = this.signDataInfo;
+            query.sign3Text = text
           } else if (this.taskName == "中心负责人") {
             query.idx = 3;
-            query.sign4Text = this.signDataInfo;
+            query.sign4Text = text;
           }
           addSign(query).then(res => {
@@ -1291,7 +1309,8 @@ export default {
       }
       if (this.definitionKey == "workflow_company" ||
         this.definitionKey == "workflow_driver" ||
-        this.definitionKey == "workflow_vehicle") {
+        this.definitionKey == "workflow_vehicle" ||
+        this.definitionKey == "workflow_constructsite_edit") {
         formDataSave(this.id, this.form.formData).then(response => {
           this.msgSuccess("审批成功");
           this.cancel();
@@ -4,10 +4,10 @@
     <el-button @click="printBody" :style="{'display':hide}">打印</el-button>
     <div id="printItem">
-      <h2 style="text-align:center;">长沙市建筑垃圾处置技术勘察意见表</h2>
+      <h2 style="text-align:center;">长沙市建筑垃圾处置技术勘查意见表</h2>
     <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
       <el-col :span="1" class="bd_padding">
-        勘察人员填写
+        勘查人员填写
         </el-col>
       <el-col :span="23" class="bd_left">
         <el-row class="bd_bottom" >
 <template>
   <el-card class="box-card">
     <div
-      :class="{card_status:true,notcheck:!task.checkStatus,dismiss:task.checkStatus=='1',agree:task.checkStatus=='0'}">
-      {{task.checkStatus? task.checkStatus=="0"?"已同意":"已拒绝" : "待审批"}}</div>
+      :class="{card_status:true,notcheck:!task.checkStatus,dismiss:task.checkStatus=='2',agree:task.checkStatus=='1'}">
+      {{task.checkStatus? task.checkStatus=="1"?"已同意":"已拒绝" : "待审批"}}</div>
     <el-row class="card_row">
       <el-col :span="20" class="card_grid">
         <div class="card_title">{{task.instanceName}}</div>
@@ -50,10 +50,22 @@
           <el-col :span="18" class="bd">{{infoData.comment}}</el-col>
         </el-row>
-        <div v-for="dict in dicts">
-          <p >{{dict.name}}</p>
-          <a v-for="item in infoData.attachmentList" @click="downloadFile(item.attachmentPath);" style="color:blue;" v-if="item.typeCode == dict.code"><p>{{item.name}}</p></a>
-        </div>
+       <div v-for="dict in dicts">
+         <p >{{dict.name}}</p>
+         <el-image v-for="item in infoData.attachmentList"
+                   style="width: 40px; height: 40px; margin: 5px;"
+                   :src="'/remotedown/' + item.attachmentPath"
+                   :z-index="2000"
+                    :preview-src-list="[slides1('/remotedown/' + item.attachmentPath)]"
+                   v-if="item.typeCode == dict.code && (item.attachmentPath.toLowerCase().indexOf('.jpg') > -1 || item.attachmentPath.toLowerCase().indexOf('.png') > -1)">
+         </el-image>
+         <a v-for="item in infoData.attachmentList"
+           @click="downloadFile(item.attachmentPath);"
+           style="color:blue;"
+           v-if="item.typeCode == dict.code
+           && item.attachmentPath.toLowerCase().indexOf('.jpg') == -1
+           && item.attachmentPath.toLowerCase().indexOf('.png') == -1"><p>{{item.name}}</p></a>
+       </div>
   </div>
@@ -114,6 +126,9 @@ import store from &quot;@/store&quot;;
     },
     methods: {
+      slides1(img){
+        return img;
+      },
       getInfo() {
         let id;
         if (this.businessKey.split(":").length == 2) {
@@ -43,12 +43,17 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
       <threestepInfo :businessKey="businessKey" v-if="open2"/>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
-      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct"/>
+    <el-dialog :title="title" :visible.sync="construct" width="1200px" append-to-body>
+        <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
       <el-table :data="hisfromData" v-if="hisfromData != null">
-
         <el-table-column label="审批意见" align="center" prop="controlValue"/>
         <el-table-column label="审批人" align="center" prop="createName"/>
         <el-table-column label="审批时间" align="center" prop="createTime"/>
@@ -65,18 +70,17 @@
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
-      <earthsitesInfo :businessKey="businessKey" v-if="earthsites"/>
+    <el-dialog :title="title" :visible.sync="earthsites" width="1200px" append-to-body>
+      <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
       <el-table :data="hisfromData" v-if="hisfromData != null">
-
         <el-table-column label="审批意见" align="center" prop="controlValue"/>
         <el-table-column label="审批人" align="center" prop="createName"/>
         <el-table-column label="审批时间" align="center" prop="createTime"/>
       </el-table>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
-      <contractInfo :businessKey="businessKey" v-if="contract"/>
+    <el-dialog :title="title" :visible.sync="contract" width="1200px" append-to-body>
+      <companyInfo :businessKey="businessKey" :businessType="4"   v-if="contract"/>
       <el-table :data="hisfromData" v-if="hisfromData != null">
         <el-table-column label="审批意见" align="center" prop="controlValue"/>
@@ -127,8 +131,8 @@
       </el-table>
     </el-dialog>
-      <el-dialog :title="title" :visible.sync="company" width="850px" append-to-body :close-on-click-modal="false">
-        <companyInfo :businessKey="businessKey" v-if="company"/>
+      <el-dialog :title="title" :visible.sync="company" width="1200px" append-to-body :close-on-click-modal="false">
+      <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
         <el-table :data="hisfromData" v-if="hisfromData != null">
           <el-table-column label="审批意见" align="center" prop="controlValue"/>
@@ -138,7 +142,7 @@
       </el-dialog>
       <el-dialog :title="title" :visible.sync="vehicle" width="850px" append-to-body :close-on-click-modal="false">
-        <vehicleInfo :businessKey="businessKey" v-if="vehicle"/>
+      <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
         <el-table :data="hisfromData" v-if="hisfromData != null">
           <el-table-column label="审批意见" align="center" prop="controlValue"/>
@@ -148,7 +152,7 @@
       </el-dialog>
       <el-dialog :title="title" :visible.sync="driver" width="850px" append-to-body :close-on-click-modal="false">
-        <driverInfo :businessKey="businessKey" v-if="driver"/>
+      <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
         <el-table :data="hisfromData" v-if="hisfromData != null">
           <el-table-column label="审批意见" align="center" prop="controlValue"/>
@@ -167,6 +171,8 @@ import {
   formDataShow
 } from "@/api/activiti/taskhistory";
+import {historyFromData} from '@/api/activiti/historyFormdata'
+
 import {getSignByObjId, addSign, updateSign} from "@/api/sign/sign";
 import taskCard from "@/views/activiti/task/taskCard";
 import earthSitesForm from "@/views/workflow/earthSitesForm";
@@ -317,7 +323,7 @@ export default {
           this.taskList = response.rows;
           this.total = response.total;
           this.loading = false;
-          
+
           if(!this.names)
             this.names = response.names;
         });
@@ -358,7 +364,14 @@ export default {
       this.id = row.id;
       historyFromData(this.businessKey).then(response => {
-        this.hisfromData = response.data
+
+        this.hisfromData = [];
+
+          this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time});
+          for(let i in response.data){
+
+            this.hisfromData.push(response.data[i]);
+          }
       })
@@ -408,12 +421,10 @@ export default {
         this.leaveApplicationOpen = true;
         return;
       }
+      if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
+
-      if (this.definitionKey == "workflow_constructsite") {
-        getSignByObjId(this.businessKey.split(":")[1]).then(res => {
-          this.signData = res;
           this.construct = true;
-        });
         return;
       }
       if (this.definitionKey == "workflow_earthsites") {
@@ -61,7 +61,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['Company:credit:add']"  v-if="queryParams.status==0">新增</el-button>
+        <el-button type="primary"  size="mini" @click="handleAdd"  v-if="queryParams.status==0 && checkPer(['businessmanage.credit.CompanyCredit.add'])">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button  size="mini" @click="handleExport" v-hasPermi="['Company:credit:export']">导出</el-button>
@@ -88,7 +88,8 @@
       <el-table-column label="失信原因" align="center" prop="reason" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0 &&
+           checkPer(['businessmanage.credit.CompanyCredit.revoke'])">撤销失信</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">查看</el-button>
         </template>
       </el-table-column>
@@ -168,4 +169,3 @@
 <script src="../../../api/company_credit.js" />
-
@@ -56,7 +56,8 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:ConstructionCredit:add']"
-          v-if="queryParams.status==0">新增</el-button>
+          v-if="queryParams.status==0 &&
+           checkPer(['businessmanage.credit.ConstructionCredit.add'])">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button size="mini" @click="handleExport" v-hasPermi="['business:ConstructionCredit:export']">导出</el-button>
@@ -86,7 +87,8 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:ConstructionCredit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
+            v-hasPermi="['business:ConstructionCredit:edit']" v-if="queryParams.status==0&&
+           checkPer(['businessmanage.credit.ConstructionCredit.revoke'])">撤销失信</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)"
             v-if="queryParams.status==1">查看</el-button>
         </template>
@@ -12,8 +12,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <el-row type="flex" justify="center">
         <el-col>
-          <el-form-item label="驾驶员姓名" prop="name"
-                        style="float:right;">
+          <el-form-item label="驾驶员姓名" prop="name">
             <el-select v-model="queryParams.name"
                        filterable
@@ -29,7 +28,24 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col>
+          <el-form-item label="车牌号" prop="licenseplateNo">
+            <el-select v-model="queryParams.licenseplateNo"
+                       filterable
+
+                       reserve-keyword
+                       placeholder="车牌号"
+                       size="small"
+                       :loading="loading">
+              <el-option
+                v-for="item in dictLicenseplateNo"
+                :label="item"
+                :value="item">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          </el-col>
         <el-col>
         <el-form-item label="失信日期" prop="time" v-show="queryParams.status==0">
           <el-date-picker  size="small" style="width: 200px" v-model="queryParams.time" type="date"
@@ -43,7 +59,9 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['driver:credit:add']"  v-if="queryParams.status==0">新增</el-button>
+        <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['driver:credit:add']"  v-if="queryParams.status==0
+        && checkPer(['businessmanage.credit.DriverCredit.add'])">新增</el-button>
+
       </el-col>
       <el-col :span="1.5">
         <el-button  size="mini" @click="handleExport" v-hasPermi="['driver:credit:export']">导出</el-button>
@@ -62,6 +80,7 @@
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="驾驶员姓名" align="center" prop="name" />
       <el-table-column label="证件号码" align="center" prop="idNumber" />
+      <el-table-column label="车牌号" align="center" prop="licenseplateNo" />
       <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
@@ -70,7 +89,8 @@
       <el-table-column label="失信原因" align="center" prop="reason" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['driver:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['driver:credit:edit']" v-if="queryParams.status==0&&
+           checkPer(['businessmanage.credit.DriverCredit.revoke'])">撤销失信</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">查看</el-button>
         </template>
       </el-table-column>
@@ -102,6 +122,9 @@
         <el-form-item label="证件号码" prop="idNumber">
           <el-input v-model="form.idNumber" placeholder="证件号码" disabled/>
         </el-form-item>
+        <el-form-item label="车牌号" prop="licenseplateNo">
+          <el-input v-model="form.licenseplateNo" placeholder="车牌号" disabled/>
+        </el-form-item>
         <el-form-item label="失信原因" prop="reason">
           <el-input v-model="form.reason" placeholder="失信原因" />
         </el-form-item>
@@ -54,7 +54,8 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['EarthSites:credit:add']"  v-if="queryParams.status==0">新增</el-button>
+        <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['EarthSites:credit:add']"  v-if="queryParams.status==0&&
+           checkPer(['businessmanage.credit.EarthSitesCredi.add'])">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button  size="mini" @click="handleExport" v-hasPermi="['EarthSites:credit:export']">导出</el-button>
@@ -82,7 +83,8 @@
       <el-table-column label="失信原因" align="center" prop="reason" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['EarthSites:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['EarthSites:credit:edit']" v-if="queryParams.status==0&&
+           checkPer(['businessmanage.credit.EarthSitesCredi.revoke'])">撤销失信</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">查看</el-button>
         </template>
       </el-table-column>
@@ -50,7 +50,8 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['truck:credit:add']"
-          v-if="queryParams.status==0">新增</el-button>
+          v-if="queryParams.status==0&&
+           checkPer(['businessmanage.credit.TruckCredit.add'])">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button size="mini" @click="handleExport" v-hasPermi="['truck:credit:export']">导出</el-button>
@@ -79,7 +80,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['truck:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
+            v-hasPermi="['truck:credit:edit']" v-if="queryParams.status==0&& checkPer(['businessmanage.credit.TruckCredit.revoke'])">撤销失信</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)"
             v-if="queryParams.status==1">查看</el-button>
         </template>
@@ -18,7 +18,7 @@
     </el-row>
     <el-form :model="queryParams" ref="queryForm" label-width="100px">
-      <el-row>
+      <el-row v-if="this.queryParams.his < 2">
         <el-col :span="6">
           <el-form-item label="工地名称" >
             <!-- <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small" /> -->
@@ -52,6 +52,25 @@
       </el-form-item>
       </el-col>
       </el-row>
+      <el-row v-if="this.queryParams.his > 1">
+             <el-col :span="6">
+               <el-form-item label="名称" >
+                 <!-- <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small" /> -->
+
+                 <el-select v-model="queryParams.name" placeholder="请输入工地名称 " filterable  size="small">
+                   <el-option v-for="item in names" :label="item" :value="item" />
+                 </el-select>
+               </el-form-item>
+           </el-col>
+
+             <el-col :span="6">
+           <el-form-item label="区属" >
+             <el-select v-model="queryParams.place" placeholder="工地所属区域 "  size="small">
+               <el-option v-for="item in areas" :label="item.name" :value="item.code" />
+             </el-select>
+           </el-form-item>
+      </el-col>
+           </el-row>
       <el-row>
         <el-col :span="6">
       <el-form-item label="开始时间" v-if="this.queryParams.his > 0">
@@ -78,7 +97,7 @@
       <el-col :span="1.5">
         <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList(queryParams.his)"></right-toolbar>
     </el-row>
     <el-table :data="threestepList" @selection-change="handleSelectionChange" v-if="!queryParams.his || queryParams.his == 1">
@@ -130,7 +149,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="getInfo(scope.row,0);"  v-hasPermi="['business:threestep:edit']">查看详情</el-button>
+          <el-button size="mini" type="text" @click="getInfo(scope.row);"  v-hasPermi="['business:threestep:edit']">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -3,11 +3,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini"
-          @click="getList(0);">报工自查</el-button>
+          @click="getList(0);" v-if="checkPer(['business.supervision.threestep.selfcheck'])">报工自查</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini"
-          @click="getList(1);">报工抽查</el-button>
+          @click="getList(1);" v-if="checkPer(['business.supervision.threestep.spotcheck'])">报工抽查</el-button>
       </el-col>
     </el-row>
@@ -48,10 +48,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:threestep:add']" v-if="this.queryParams.pageStatus==0 && new Date().getHours() > 7 && new Date().getHours() < 24">新增</el-button>
+        <el-button type="primary" size="mini" @click="handleAdd"  v-if="this.queryParams.pageStatus==0 && new Date().getHours() > 7 && new Date().getHours() < 24
+        && checkPer(['business.supervision.threestep.add'])">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
+        <el-button size="mini" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -87,17 +88,16 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row,0)"
-            v-hasPermi="['business:threestep:edit']" v-if="queryParams.pageStatus==1 && scope.row.status==1 && scope.row.checkEndTime == null">抽查</el-button>
+             v-if="queryParams.pageStatus==1 && scope.row.status==1 && scope.row.checkEndTime == null
+             && checkPer(['business.supervision.threestep.spot'])">抽查</el-button>
             <el-button size="mini" type="text" icon="el-icon-edit" @click="reSub(scope.row)"
-              v-hasPermi="['business:threestep:add']" v-if="scope.row.status==2">被驳回</el-button>
-
-          <el-button size="mini" type="text" @click="handleUpdate(scope.row,1)"  v-hasPermi="['business:threestep:edit']">查看详情</el-button>
+               v-if="scope.row.status==2 && checkPer(['business.supervision.threestep.add'])">被驳回</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row,1)">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body v-loading="loading">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px" v-if="open">
@@ -122,38 +122,16 @@
         <el-row type="flex" justify="center" v-if="form.type != null">
           <el-col >
             <el-form-item :label="labelName" prop="name">
-              <el-select v-model="form.name" filterable  reserve-keyword @change="getObjId">
-                <el-option v-for="item in remoteData" :label="item.name"
+              <el-select v-model="form.name" filterable  reserve-keyword @change="getObjId" v-el-select-loadmore="loadMore(rangeNumber)">
+                <el-option v-for="item in remoteData.slice(0, rangeNumber)" :label="item.name"
                   :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item :label="labelName2" prop="place">
-              <el-select v-model="bindname" filterable  reserve-keyword @change="getEarthsiteId">
-                <el-option  v-if="item.show"
-                  v-for="item in bindData"
-                  :label="item.name"
-                  :value="item.name"
-                  :key="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
         </el-row>
-        <!-- <el-row type="flex" justify="center"  v-if="form.type != null">
-          <el-col>
-            <el-form-item label="消纳合同" prop="contract">
-              <el-select v-model="form.contract" filterable  reserve-keyword  @change="conractCheck">
-                <el-option v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row type="flex" justify="center" v-if="form.type == 0" >
-          <el-col :span="12" >
+          <el-col :span="24" >
             <el-form-item label="运输企业" prop="companys">
               <el-select v-model="form.companys" filterable multiple @change="checkCompany" >
                 <el-option  v-for="item in companyList" :label="item.name" :value="item.name" :key="item.id"
@@ -161,12 +139,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" >
-            <el-form-item label="运输车辆" prop="companyTrucks" >
-              <el-select v-model="form.companyTrucks" filterable multiple  reserve-keyword >
-                <el-option v-for="item in truckList" :label="item.licenseplateNo" :value="item.id" :key="item.id"
-                v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"></el-option>
-              </el-select>
+        </el-row>
+
+        <el-row type="flex" justify="center" v-if="form.type == 0" >
+          <el-col :span="24" >
+            <el-form-item label="运输车辆" prop="trucks" >
+              <el-checkbox-group v-model="form.trucks" style="max-height: 200px;overflow: auto;">
+                <el-checkbox :label="item.licenseplateNo" v-for="item in truckList"  v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"/>
+              </el-checkbox-group>
             </el-form-item>
           </el-col>
         </el-row>
@@ -196,6 +176,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[0]">
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img0" type="hidden"></el-input>
             <p v-for="(img,index) in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p>
           </el-col>
@@ -208,6 +192,11 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[1]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
+
             <el-input v-model="form.img1" type="hidden"></el-input>
             <p v-for="(img,index) in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p>
           </el-col>
@@ -220,6 +209,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[2]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img2" type="hidden"></el-input>
             <p v-for="(img,index) in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p>
           </el-col>
@@ -232,6 +225,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[3]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img3" type="hidden"></el-input>
             <p v-for="(img,index) in form.img3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(3,img)" style="color:red"> x</a></p>
           </el-col>
@@ -246,6 +243,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[4]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img4" type="hidden"></el-input>
             <p v-for="(img,index) in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p>
           </el-col>
@@ -258,6 +259,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[5]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img5" type="hidden"></el-input>
             <p v-for="(img,index) in form.img5">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(5,img)" style="color:red"> x</a></p>
           </el-col>
@@ -270,6 +275,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[6]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img6" type="hidden"></el-input>
             <p v-for="(img,index) in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p>
           </el-col>
@@ -282,6 +291,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[7]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img7" type="hidden"></el-input>
             <p v-for="(img,index) in form.img7">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(7,img)" style="color:red"> x</a></p>
           </el-col>
@@ -296,6 +309,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[8]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img8" type="hidden"></el-input>
             <p v-for="(img,index) in form.img8">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(8,img)" style="color:red"> x</a></p>
           </el-col>
@@ -308,6 +325,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[9]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img9" type="hidden"></el-input>
             <p v-for="(img,index) in form.img9">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(9,img)" style="color:red"> x</a></p>
           </el-col>
@@ -320,6 +341,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[10]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img10" type="hidden"></el-input>
             <p v-for="(img,index) in form.img10">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(10,img)" style="color:red"> x</a></p>
           </el-col>
@@ -332,6 +357,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[11]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img11" type="hidden"></el-input>
             <p v-for="(img,index) in form.img11">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(11,img)" style="color:red"> x</a></p>
           </el-col>
@@ -344,6 +373,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[12]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img12" type="hidden"></el-input>
             <p v-for="(img,index) in form.img12">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(12,img)" style="color:red"> x</a></p>
           </el-col>
@@ -378,6 +411,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[91]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.attchItem1" type="hidden"></el-input>
             <p v-for="(img,index) in form.attchItem1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(1,img,91)" style="color:red"> x</a></p>
           </el-col>
@@ -390,6 +427,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[92]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.attchItem2" type="hidden"></el-input>
             <p v-for="(img,index) in form.attchItem2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(2,img,92)" style="color:red"> x</a></p>
           </el-col>
@@ -402,6 +443,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[93]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.attchItem3" type="hidden"></el-input>
             <p v-for="(img,index) in form.attchItem3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(3,img,93)" style="color:red"> x</a></p>
           </el-col>
@@ -424,7 +469,7 @@
       <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
         :on-success="uploadSuccess" :before-upload="beforeUpload">
         <el-button size="small" type="primary">选择附件</el-button>
-        <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg、png、pdf、word文件</div>
+        <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg、png、pdf、mp4,avi,word文件</div>
       </el-upload>
       <div style="height: 40px;width:100%;">
         <el-button type="primary" style="margin-top: 20px;float:right;" @click="handleClose">关闭</el-button>
@@ -79,6 +79,11 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
           <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
         </el-col>
@@ -94,6 +99,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
           <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
         </el-col>
@@ -109,6 +118,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
           <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
         </el-col>
@@ -124,6 +137,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
             <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
           </el-col>
@@ -139,6 +156,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
               <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
             </el-col>
@@ -154,6 +175,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
            <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
          </el-col>
@@ -169,6 +194,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
             <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
           </el-col>
@@ -184,6 +213,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
             <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
           </el-col>
@@ -199,6 +232,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
             <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
           </el-col>
@@ -214,6 +251,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
              </el-col>
@@ -229,6 +270,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
             <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
           </el-col>
@@ -244,6 +289,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
              <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
            </el-col>
@@ -259,6 +308,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
              <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
            </el-col>
@@ -307,6 +360,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
              <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
            </el-col>
@@ -322,6 +379,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
              <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
            </el-col>
@@ -337,6 +398,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
              <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
            </el-col>
@@ -352,6 +417,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
              </el-col>
@@ -367,6 +436,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                  <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
                </el-col>
@@ -382,6 +455,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
               <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
             </el-col>
@@ -397,6 +474,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
              </el-col>
@@ -412,6 +493,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
              </el-col>
@@ -427,6 +512,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
              </el-col>
@@ -442,6 +531,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                   <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
                 </el-col>
@@ -457,6 +550,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
              </el-col>
@@ -472,6 +569,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
               </el-col>
@@ -487,6 +588,10 @@
                     :preview-src-list="[slides1(img)]"
                     :z-index="2000">
           </el-image>
+          <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+            v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+            <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+          </div>
           <br/>
                 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
               </el-col>
@@ -45,7 +45,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          v-if="this.queryParams.status==0"
+          v-if="this.queryParams.status==0 && checkPer(['business.supervision.truckActivate.active'])"
           type="primary"
           size="mini"
           @click="handleAdd"
@@ -33,6 +33,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['caseOffline:caseOffline:add']"
+          v-if="checkPer(['intelligencecontrols.messagemanage.add'])"
         >新增
         </el-button>
       </el-col>
@@ -96,7 +97,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
-          <el-select v-model="form.siteName" placeholder="请选择类型">
+          <el-select v-model="form.siteName" placeholder="请选择类型" allow-create  filterable>
             <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name"
                        @native.click="getSite(item)"/>
           </el-select>
@@ -124,8 +125,8 @@
             <video width="100%" controls="controls" height="100%" :src="item.url"></video>
           </div>
           <el-input v-model="form.attach" type="hidden"></el-input>
-          <div style="color: blue;" v-for="(img,index) in form.attach">{{ img.split("/")[img.split("/").length - 1] }}<a
-            @click="removeAttchItem(index,img)" style="color:red;">X</a></div>
+          <div style="color: blue;" v-for="(img,index) in form.attach">{{ img.split("/")[img.split("/").length - 1] }}
+          <a  @click="removeAttchItem(index,img)" style="color:red;">X</a></div>
         </el-form-item>
       </el-form>
@@ -54,6 +54,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['casefile:violationCaseFile:add']"
+          
+          v-if="checkPer(['intelligencecontrols.messagemanage.enter'])"
         >违规案卷录入</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
@@ -46,6 +46,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['casefile:violationWarningInformation:add']"
+
+          v-if="checkPer(['taskrun.messagetask.add'])"
         >预警信息录入</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
@@ -95,7 +95,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
-          <el-select v-model="form.siteName" placeholder="请选择类型">
+          <el-select v-model="form.siteName" placeholder="请选择类型" allow-create  filterable>
               <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" @native.click="getSite(item)"/>
           </el-select>
         </el-form-item>
 <template>
   <div class="app-container" >
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini"
-          @click="getList(0);">报工记录</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini"
-          @click="getList(1);">历史报工记录</el-button>
-      </el-col>
-    </el-row>
+         <el-col :span="1.5">
+           <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini" @click="getList(0);">有效报工记录</el-button>
+         </el-col>
+         <el-col :span="1.5">
+           <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini" @click="getList(1);">历史报工记录</el-button>
+         </el-col>
+
+         <el-col :span="1.5">
+           <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==2}" size="mini" @click="getList(2);">工地报工记录</el-button>
+         </el-col>
+         <el-col :span="1.5">
+           <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==3}" size="mini" @click="getList(3);">处理场所报工记录</el-button>
+         </el-col>
+
+       </el-row>
+
+       <el-form :model="queryParams" ref="queryForm" label-width="100px">
+         <el-row v-if="this.queryParams.his < 2">
+             <el-form-item label="工地名称" >
+               <!-- <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small" /> -->
+
+               <el-select v-model="queryParams.name" placeholder="请输入工地名称 " filterable  size="small">
+                 <el-option v-for="item in names" :label="item" :value="item" />
+               </el-select>
+             </el-form-item>
+             <el-form-item label="处理场所名称" >
+               <!-- <el-input v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称"  size="small"  />-->
+
+                  <el-select v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称 " filterable   size="small">
+                    <el-option v-for="item in enames" :label="item" :value="item" />
+                  </el-select>
+             </el-form-item>
+         <el-form-item label="工地区属" >
+           <el-select v-model="queryParams.place" placeholder="工地所属区域 "  size="small">
+             <el-option v-for="item in areas" :label="item.name" :value="item.code" />
+           </el-select>
+         </el-form-item>
+         <el-form-item label="处理场所区属" >
+           <el-select v-model="queryParams.subReason" placeholder="工地所属区域 "  size="small">
+             <el-option v-for="item in areas" :label="item.name" :value="item.name" />
+           </el-select>
+         </el-form-item>
+         </el-row>
+         <el-row v-if="this.queryParams.his > 1">
+                  <el-form-item label="名称" >
+                    <!-- <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small" /> -->
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="工地名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small"
-           />
-      </el-form-item>
-      <el-form-item label="处理场所名称" prop="earthsitesName">
-        <el-input v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称"  size="small"
-           />
-      </el-form-item>
-      <el-form-item label="工地区属" prop="place">
-        <el-select v-model="queryParams.place" placeholder="工地所属区域 "  size="small">
-          <el-option v-for="item in areas" :label="item.name" :value="item.code" />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="处理场所区属" prop="subReason">
-        <el-select v-model="queryParams.subReason" placeholder="工地所属区域 "  size="small">
-          <el-option v-for="item in areas" :label="item.name" :value="item.name" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="开始时间" prop="workStartTime" v-if="this.queryParams.his==1">
-        <el-date-picker  size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date"
-          value-format="yyyy-MM-dd" placeholder="开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="workEndTime" v-if="this.queryParams.his==1">
-        <el-date-picker  size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date"
-          value-format="yyyy-MM-dd" placeholder="结束时间">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-
-    <p> {{dayWorkCount}}</p>
+                    <el-select v-model="queryParams.name" placeholder="请输入工地名称 " filterable  size="small">
+                      <el-option v-for="item in names" :label="item" :value="item" />
+                    </el-select>
+                  </el-form-item>
+
+              <el-form-item label="区属" >
+                <el-select v-model="queryParams.place" placeholder="工地所属区域 "  size="small">
+                  <el-option v-for="item in areas" :label="item.name" :value="item.code" />
+                </el-select>
+              </el-form-item>
+              </el-row>
+         <el-row>
+         <el-form-item label="开始时间" v-if="this.queryParams.his > 0">
+               <el-date-picker
+                 v-model="queryParams.timeRange"
+                 value-format="yyyy-MM-dd HH:mm:ss"
+                 type="datetimerange"
+                 range-separator="至"
+                 start-placeholder="开始日期"
+                 end-placeholder="结束日期">
+               </el-date-picker>
+         </el-form-item>
+         </el-row>
+         <el-form-item>
+           <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
+           <el-button size="mini" @click="resetQuery">重置</el-button>
+         </el-form-item>
+       </el-form>
+
+       <p v-if="queryParams.his < 2"> {{dayWorkCount}}</p>
     <el-row :gutter="10" class="mb8">
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-card class="box-card" v-for="item in threestepList" style="margin-bottom: 10px;">
+    <el-card class="box-card" v-for="item in threestepList" style="margin-bottom: 10px;"  v-if="!queryParams.his || queryParams.his == 1">
       <p>{{item.createTime}} {{item.descript}}</p>
        <el-row class="card_row">
          <el-col :span="24" class="card_grid">
@@ -94,6 +122,27 @@
            <div>申请报工时间:{{item.eselfCheckTime}}</div>
          </el-col>
        </el-row>
+     </el-card>
+
+     <el-card class="box-card" v-for="item in threestepList" style="margin-bottom: 10px;"   v-if="queryParams.his > 1">
+       <el-row class="card_row">
+         <el-col :span="24" class="card_grid">
+          <div class="card_title" style="font-weight: bold;">名称:{{item.name}}</div>
+         </el-col>
+       </el-row>
+       <el-row class="card_row">
+         <el-col :span="24" class="card_grid">
+          <div class="card_title" style="font-weight: bold;">类型:{{ item.type==0?"工地":"处理场所"}}</div>
+         </el-col>
+       </el-row>
+       <el-row class="card_row">
+          <el-col :span="24" class="card_grid" >
+            <span >所属区:{{item.place}}</span>
+          </el-col>
+         <el-col :span="24" class="card_grid" >
+           <span >申请报工时间:{{item.selfCheckTime}}</span>
+         </el-col>
+       </el-row>
      </el-card>
+<template>
+    <iframe width="100%" height="600px" frameborder="no" id="iFrame" :src=src></iframe>
+</template>
+
+<script>
+
+
+import store from "@/store";
+  import {
+    getToken
+  } from "@/utils/auth";
+
+
+  import {
+    getCompanyInfo,
+    getArea,
+    getDict
+  } from "@/api/dict";
+
+
+
+  export default {
+    name: "ThreestepInfo",
+    props: {
+      businessKey: {
+        type: String
+      },
+      businessType: {
+        type: Number
+      },
+    },
+    data() {
+      return {
+        src:"",
+        sign: store.getters.avatar, //裁剪图片的地址
+        areas: [],
+        loading: null,
+        objectDict: {
+            constructionSiteID:"工地ID",
+            constructionSiteName:"工地名称",
+            earthSiteID:"处理场所ID",
+            earthSiteName:"处理场所名称",
+            absorbCapacity:"消纳容量",
+            startTime:"有效期开始时间 yyyy-mM-dd",
+            endTime:"有效期结束时间 yyyy-mM-dd",
+            type:"建筑垃圾类型ID",
+            typeName:"垃圾类型名称",
+            contractNo:"消纳合同编号",
+            routeName:"线路名称",
+            routeWidth:"线路宽度",
+            auditStatus:"审核状态 0-审核中 1-审核通过 2-审核驳回",
+            auditStatusName:"审核状态名称",
+            contractStatus:"合同状态",
+            contractStatusName:"合同状态名称",
+            routePoints:"线路信息"},
+
+        infoData: {},
+
+        dicts:null,
+        showPic:false,
+        picImage:null,
+      }
+    },
+    created() {
+
+
+        let id;
+        if (this.businessKey.split(":").length == 2) {
+          id = this.businessKey.split(":")[1];
+        } else {
+          id = this.businessKey;
+        }
+
+        let http = "http://183.66.242.6:14601";
+
+        if(this.businessType == 0){
+          this.src = http + "/single/#/enterprise-information/information-detail?id=" + id;
+        }
+        if(this.businessType == 1){
+          this.src = http + "/single/#/vehicleInformation/information-detail?id=" + id;
+        }
+        if(this.businessType == 2){
+          this.src = http + "/single/#/constructionInfo/detail?id="+id+"&type=detail";
+        }
+        if(this.businessType == 3){
+          this.src = http + "/single/#/absorptionsitedetail?absorptionId=" + id;
+        }
+        if(this.businessType == 4){
+          this.src = http + "/single/#/contractInfo/detail?id=" + id;
+        }
+        if(this.businessType == 5){
+          this.src = http + "/single/#/driverdetail?driverId=" + id;
+        }
+
+    },
+
+  }
+</script>
+<style>
+  .bd{
+    padding:5px;
+  }
+
+
+
+</style>
@@ -19,7 +19,6 @@
     <!-- 审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" v-if="open" width="300px" append-to-body>
-
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
@@ -28,7 +27,7 @@
     <el-dialog :title="title" :visible.sync="open2" width="400px" append-to-body>
       <threestepInfo :businessKey="businessKey" v-if="open2" />
-      <el-form v-if="taskName == '巡查'" :rules="rules" label-width="100px">
+      <el-form  :rules="rules" label-width="100px">
         <el-row >
             <el-form-item label="补充说明">
               <el-input type="textarea" v-model="form.subReason" />
@@ -194,11 +193,17 @@
     <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body>
-      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
-      <el-row>
+      <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
+        <div v-for="item in this.form.formData">
+          <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                    placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+        </div>
-      <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>
-      </el-row>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
       <div slot="footer" class="dialog-footer">
           <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
           <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
@@ -207,7 +212,18 @@
     <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body>
-      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
       <div slot="footer" class="dialog-footer">
           <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
           <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
@@ -215,7 +231,19 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body>
-      <contractInfo :businessKey="businessKey"  v-if="contract" />
+      <companyInfo :businessKey="businessKey" :businessType="4"   v-if="contract"/>
+
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
       <div slot="footer" class="dialog-footer">
           <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
           <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
@@ -340,7 +368,18 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false">
-      <companyInfo :businessKey="businessKey" v-if="company"/>
+     <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
+     <div v-for="item in this.form.formData">
+       <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                 placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+     </div>
+     
+     <el-table :data="hisfromData" v-if="hisfromData != null">
+     
+       <el-table-column label="审批意见" align="center" prop="controlValue"/>
+       <el-table-column label="审批人" align="center" prop="createName"/>
+       <el-table-column label="审批时间" align="center" prop="createTime"/>
+     </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
@@ -348,7 +387,18 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false">
-      <vehicleInfo :businessKey="businessKey" v-if="vehicle"/>
+      <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
@@ -356,7 +406,18 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false">
-      <driverInfo :businessKey="businessKey" v-if="driver"/>
+     <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
+     <div v-for="item in this.form.formData">
+       <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                 placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+     </div>
+
+     <el-table :data="hisfromData" v-if="hisfromData != null">
+
+       <el-table-column label="审批意见" align="center" prop="controlValue"/>
+       <el-table-column label="审批人" align="center" prop="createName"/>
+       <el-table-column label="审批时间" align="center" prop="createTime"/>
+     </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
@@ -672,8 +733,7 @@ export default {
           this.leaveApplicationOpen = true;
           return;
         }
-
-        if (this.definitionKey == "workflow_constructsite") {
+        if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
               this.construct = true;
           return;
@@ -980,7 +1040,8 @@ export default {
       }
       if(this.definitionKey  == "workflow_company" ||
         this.definitionKey  == "workflow_driver" ||
-        this.definitionKey  == "workflow_vehicle" ){
+        this.definitionKey  == "workflow_vehicle" ||
+        this.definitionKey == "workflow_constructsite_edit"){
         formDataSave(this.id, this.form.formData).then(response => {
           this.msgSuccess("审批成功");
           this.cancel();
@@ -2,10 +2,10 @@
   <div v-loading="loading">
     <div id="printItem">
-      <h2 style="text-align:center;">长沙市建筑垃圾处置技术勘察意见表</h2>
+      <h2 style="text-align:center;">长沙市建筑垃圾处置技术勘查意见表</h2>
     <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
       <el-col :span="2" class="bd_padding">
-        勘察人员填写
+        勘查人员填写
         </el-col>
       <el-col :span="22" class="bd_left">
         <el-row class="bd_bottom" >
@@ -81,6 +81,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
         </el-col>
@@ -98,6 +102,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
         </el-col>
@@ -115,6 +123,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -133,6 +145,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -151,6 +167,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -169,6 +189,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -187,6 +211,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -205,6 +233,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -223,6 +255,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -241,6 +277,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -259,6 +299,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -277,8 +321,12 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
-
+            
           </el-row>
         </el-col>
       </el-row>
@@ -295,6 +343,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -340,6 +392,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -358,6 +414,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -376,6 +436,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -394,6 +458,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -412,6 +480,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -430,6 +502,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -448,6 +524,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -466,6 +546,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -484,6 +568,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -502,6 +590,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -520,6 +612,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -538,6 +634,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -556,6 +656,10 @@
                       :preview-src-list="[slides1(img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
           </el-row>
@@ -589,6 +693,10 @@
                       :preview-src-list="[slides1(sub_img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(sub_img);" style="color: blue;">附件1 - {{ index + 1 }}</a>
           </el-row>
@@ -607,6 +715,10 @@
                       :preview-src-list="[slides1(sub_img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(sub_img);" style="color: blue;">附件2 - {{ index + 1 }}</a>
           </el-row>
@@ -625,6 +737,10 @@
                       :preview-src-list="[slides1(sub_img)]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
+              <video  width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
+            </div>
             <a @click="downloadFile(sub_img);" style="color: blue;">附件3 - {{ index + 1 }}</a>
           </el-row>
@@ -11,7 +11,13 @@
       </el-dialog>
     <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body>
-      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
+      <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
     </el-dialog>
     <!--  会议管理  -->
     <el-dialog :title="title" :visible.sync="conferenceOpen" width="300px" append-to-body>
@@ -25,11 +31,27 @@
     <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body>
-      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
+
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body>
-      <contractInfo :businessKey="businessKey"  v-if="contract" />
+     <companyInfo :businessKey="businessKey" :businessType="4"   v-if="contract"/>
+
+
+     <el-table :data="hisfromData" v-if="hisfromData != null">
+
+       <el-table-column label="审批意见" align="center" prop="controlValue"/>
+       <el-table-column label="审批人" align="center" prop="createName"/>
+       <el-table-column label="审批时间" align="center" prop="createTime"/>
+     </el-table>
     </el-dialog>
@@ -67,15 +89,36 @@
       <supervisionInfo :infoData="supervisionData"/>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false">
-      <companyInfo :businessKey="businessKey" v-if="company"/>
+      <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
+      
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+      
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false">
-      <vehicleInfo :businessKey="businessKey" v-if="vehicle"/>
+      <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false">
-      <driverInfo :businessKey="businessKey" v-if="driver"/>
+      <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
     </el-dialog>
   </div>
@@ -319,12 +362,9 @@
           this.leaveApplicationOpen = true;
           return;
         }
+        if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
-        if(this.definitionKey == "workflow_constructsite"){
-          getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
-              this.signData = res;
               this.construct = true;
-          });
           return;
         }
           if(this.definitionKey == "workflow_earthsites"){
@@ -91,30 +91,13 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="labelName" prop="name" v-if="form.type!=null">
-              <el-select v-model="form.name" filterable  reserve-keyword @change="getObjId">
-                <el-option v-for="item in remoteData" :label="item.name"
+              <el-select v-model="form.name" filterable  reserve-keyword @change="getObjId" v-el-select-loadmore="loadMore(rangeNumber)">
+                <el-option v-for="item in remoteData.slice(0, rangeNumber)" :label="item.name"
                   :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label="labelName2" prop="place" v-if="form.type!=null">
-             <el-select v-model="bindname" filterable  reserve-keyword @change="getEarthsiteId">
-               <el-option  v-if="item.show"
-                 v-for="item in bindData"
-                 :label="item.name"
-                 :value="item.name"
-                 :key="item.id">
-               </el-option>
-             </el-select>
-            </el-form-item>
-
-            <el-form-item label="消纳合同" prop="contract" v-if="form.type!=null">
-               <el-select v-model="form.contract" filterable  reserve-keyword  @change="conractCheck">
-                 <el-option v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">
-                 </el-option>
-               </el-select>
-            </el-form-item>
             <el-form-item label="运输企业" prop="companys" v-if="form.type==0">
               <el-select v-model="form.companys" filterable multiple @change="checkCompany" >
@@ -123,12 +106,11 @@
               </el-select>
             </el-form-item>
-            <el-form-item label="运输车辆" prop="companyTrucks" v-if="form.type==0">
-              <el-select v-model="form.companyTrucks" filterable multiple  reserve-keyword >
-                <el-option v-for="item in truckList" :label="item.licenseplateNo" :value="item.id" :key="item.id"
-                v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"></el-option>
-              </el-select>
-            </el-form-item>
+           <el-form-item label="运输车辆" prop="trucks" >
+             <el-checkbox-group v-model="form.trucks" style="max-height: 200px;overflow: auto;">
+               <el-checkbox :label="item.licenseplateNo" v-for="item in truckList"  v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"/>
+             </el-checkbox-group>
+           </el-form-item>
             <el-form-item label="现场负责人" prop="person" v-if="form.type!=null">
               <el-input v-model="form.person" :maxlength="20" show-word-limit  />
@@ -149,6 +131,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[0]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img0" type="hidden"></el-input>
             <p v-for="(img,index) in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p>
           </el-col>
@@ -160,6 +146,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[1]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img1" type="hidden"></el-input>
             <p v-for="(img,index) in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p>
           </el-col>
@@ -173,6 +163,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[2]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img2" type="hidden"></el-input>
             <p v-for="(img,index) in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p>
           </el-col>
@@ -184,6 +178,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[3]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img3" type="hidden"></el-input>
             <p v-for="(img,index) in form.img3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(3,img)" style="color:red"> x</a></p>
           </el-col>
@@ -197,6 +195,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[4]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img4" type="hidden"></el-input>
             <p v-for="(img,index) in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p>
           </el-col>
@@ -208,6 +210,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[5]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img5" type="hidden"></el-input>
             <p v-for="(img,index) in form.img5">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(5,img)" style="color:red"> x</a></p>
           </el-col>
@@ -221,6 +227,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[6]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img6" type="hidden"></el-input>
             <p v-for="(img,index) in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p>
           </el-col>
@@ -232,6 +242,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[7]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img7" type="hidden"></el-input>
             <p v-for="(img,index) in form.img7">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(7,img)" style="color:red"> x</a></p>
           </el-col>
@@ -245,6 +259,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[8]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img8" type="hidden"></el-input>
             <p v-for="(img,index) in form.img8">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(8,img)" style="color:red"> x</a></p>
           </el-col>
@@ -256,6 +274,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[9]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img9" type="hidden"></el-input>
             <p v-for="(img,index) in form.img9">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(9,img)" style="color:red"> x</a></p>
           </el-col>
@@ -269,6 +291,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[10]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img10" type="hidden"></el-input>
             <p v-for="(img,index) in form.img10">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(10,img)" style="color:red"> x</a></p>
           </el-col>
@@ -280,6 +306,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[11]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img11" type="hidden"></el-input>
             <p v-for="(img,index) in form.img11">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(11,img)" style="color:red"> x</a></p>
           </el-col>
@@ -293,6 +323,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[12]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.img12" type="hidden"></el-input>
             <p v-for="(img,index) in form.img12">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(12,img)" style="color:red"> x</a></p>
           </el-col>
@@ -326,6 +360,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[91]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.attchItem1" type="hidden"></el-input>
             <p v-for="(img,index) in form.attchItem1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(1,img,91)" style="color:red"> x</a></p>
           </el-col>
@@ -337,6 +375,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[92]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.attchItem2" type="hidden"></el-input>
             <p v-for="(img,index) in form.attchItem2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(2,img,92)" style="color:red"> x</a></p>
           </el-col>
@@ -348,6 +390,10 @@
                       :preview-src-list="[item.url]"
                       :z-index="2000">
             </el-image>
+            <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+              v-for="item in videos[93]" >
+              <video  width="100%" controls="controls" height="100%" :src="item.url"></video>
+            </div>
             <el-input v-model="form.attchItem3" type="hidden"></el-input>
             <p v-for="(img,index) in form.attchItem3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(3,img,93)" style="color:red"> x</a></p>
           </el-col>
@@ -47,7 +47,6 @@ public class CompanyCreditController extends BaseController
         return getDataTable(list);
     }
-    @PreAuthorize("@ss.hasPermi('business:credit:list')")
     @GetMapping("/historyCredit")
     public TableDataInfo historyCredit(CompanyCredit companyCredit)
     {
@@ -75,7 +74,6 @@ public class CompanyCreditController extends BaseController
     /**
      * 导出企业失信列表
      */
-    @PreAuthorize("@ss.hasPermi('Company:credit:export')")
     @Log(title = "企业失信", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CompanyCredit companyCredit)
@@ -109,7 +107,6 @@ public class CompanyCreditController extends BaseController
     /**
      * 获取企业失信详细信息
      */
-    @PreAuthorize("@ss.hasPermi('Company:credit:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -119,7 +116,6 @@ public class CompanyCreditController extends BaseController
     /**
      * 新增企业失信
      */
-    @PreAuthorize("@ss.hasPermi('Company:credit:add')")
     @Log(title = "企业失信", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CompanyCredit companyCredit)
@@ -134,7 +130,6 @@ public class CompanyCreditController extends BaseController
     /**
      * 修改企业失信
      */
-    @PreAuthorize("@ss.hasPermi('Company:credit:edit')")
     @Log(title = "企业失信", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CompanyCredit companyCredit)
@@ -149,7 +144,6 @@ public class CompanyCreditController extends BaseController
     /**
      * 删除企业失信
      */
-    @PreAuthorize("@ss.hasPermi('Company:credit:remove')")
     @Log(title = "企业失信", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -47,7 +47,6 @@ public class ConstructionCreditController extends BaseController
         return getDataTable(list);
     }
-    @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:list')")
     @GetMapping("/historyCredit")
     public TableDataInfo historyCredit(ConstructionCredit constructionCredit)
     {
@@ -60,7 +59,6 @@ public class ConstructionCreditController extends BaseController
     /**
      * 导出工地失信列表
      */
-    @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:export')")
     @Log(title = "工地失信", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(ConstructionCredit constructionCredit)
@@ -86,7 +84,6 @@ public class ConstructionCreditController extends BaseController
     /**
      * 获取工地失信详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -96,7 +93,6 @@ public class ConstructionCreditController extends BaseController
     /**
      * 新增工地失信
      */
-    @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:add')")
     @Log(title = "工地失信", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ConstructionCredit constructionCredit)
@@ -107,7 +103,6 @@ public class ConstructionCreditController extends BaseController
     /**
      * 修改工地失信
      */
-    @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:edit')")
     @Log(title = "工地失信", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ConstructionCredit constructionCredit)
@@ -143,7 +138,6 @@ public class ConstructionCreditController extends BaseController
     /**
      * 删除工地失信
      */
-    @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:remove')")
     @Log(title = "工地失信", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -36,7 +36,6 @@ public class ConstructionSignController extends BaseController
     /**
      * 查询sign列表
      */
-    @PreAuthorize("@ss.hasPermi('sign:sign:list')")
     @GetMapping("/list")
     public TableDataInfo list(ConstructionSign constructionSign)
     {
@@ -48,7 +47,6 @@ public class ConstructionSignController extends BaseController
     /**
      * 导出sign列表
      */
-    @PreAuthorize("@ss.hasPermi('sign:sign:export')")
     @Log(title = "sign", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(ConstructionSign constructionSign)
@@ -62,10 +60,6 @@ public class ConstructionSignController extends BaseController
         return util.exportExcel(list, "sign");
     }
-    /**
-     * 获取sign详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('sign:sign:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -86,7 +80,6 @@ public class ConstructionSignController extends BaseController
     /**
      * 新增sign
      */
-    @PreAuthorize("@ss.hasPermi('sign:sign:add')")
     @Log(title = "sign", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ConstructionSign constructionSign)
@@ -94,10 +87,6 @@ public class ConstructionSignController extends BaseController
         return toAjax(constructionSignService.insertConstructionSign(constructionSign));
     }
-    /**
-     * 修改sign
-     */
-    @PreAuthorize("@ss.hasPermi('sign:sign:edit')")
     @Log(title = "sign", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ConstructionSign constructionSign)
@@ -108,7 +97,6 @@ public class ConstructionSignController extends BaseController
     /**
      * 删除sign
      */
-    @PreAuthorize("@ss.hasPermi('sign:sign:remove')")
     @Log(title = "sign", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -19,6 +19,7 @@ import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
 import com.trash.business.domain.DriverCredit;
+import com.trash.business.mapper.DriverCreditMapper;
 import com.trash.business.service.IDriverCreditService;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
@@ -35,6 +36,9 @@ public class DriverCreditController extends BaseController
 {
     @Autowired
     private IDriverCreditService driverCreditService;
+    
+    @Autowired
+    private DriverCreditMapper mapper;
     /**
      * 查询驾驶员失信列表
@@ -47,7 +51,6 @@ public class DriverCreditController extends BaseController
         return getDataTable(list);
     }
-    @PreAuthorize("@ss.hasPermi('driver:credit:list')")
     @GetMapping("/historyCredit")
     public TableDataInfo historyCredit(DriverCredit driverCredit)
     {
@@ -63,13 +66,22 @@ public class DriverCreditController extends BaseController
     	if(credit.getStatus() == 1){
     		credit.setStatus(null);
     	}
-        return driverCreditService.getNames(credit);
+        return mapper.getNames(credit);
+    }
+
+    @GetMapping("/licenseplates")
+    public List<String> getLicenseplates(DriverCredit credit)
+    {
+    	
+    	if(credit.getStatus() == 1){
+    		credit.setStatus(null);
+    	}
+        return mapper.getLicenseplate(credit);
     }
     /**
      * 导出驾驶员失信列表
      */
-    @PreAuthorize("@ss.hasPermi('driver:credit:export')")
     @Log(title = "驾驶员失信", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(DriverCredit driverCredit)
@@ -96,7 +108,6 @@ public class DriverCreditController extends BaseController
     /**
      * 获取驾驶员失信详细信息
      */
-    @PreAuthorize("@ss.hasPermi('driver:credit:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -106,7 +117,6 @@ public class DriverCreditController extends BaseController
     /**
      * 新增驾驶员失信
      */
-    @PreAuthorize("@ss.hasPermi('driver:credit:add')")
     @Log(title = "驾驶员失信", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DriverCredit driverCredit)
@@ -117,7 +127,6 @@ public class DriverCreditController extends BaseController
     /**
      * 修改驾驶员失信
      */
-    @PreAuthorize("@ss.hasPermi('driver:credit:edit')")
     @Log(title = "驾驶员失信", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DriverCredit driverCredit)
@@ -128,7 +137,6 @@ public class DriverCreditController extends BaseController
     /**
      * 删除驾驶员失信
      */
-    @PreAuthorize("@ss.hasPermi('driver:credit:remove')")
     @Log(title = "驾驶员失信", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -50,7 +50,7 @@ public class EarthsitesCreditController extends BaseController
     /**
      * 导出消纳场失信列表
      */
-    @PreAuthorize("@ss.hasPermi('EarthSites:credit:export')")
+
     @Log(title = "消纳场失信", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
@@ -77,7 +77,6 @@ public class EarthsitesCreditController extends BaseController
     /**
      * 获取消纳场失信详细信息
      */
-    @PreAuthorize("@ss.hasPermi('EarthSites:credit:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -87,7 +86,6 @@ public class EarthsitesCreditController extends BaseController
     /**
      * 新增消纳场失信
      */
-    @PreAuthorize("@ss.hasPermi('EarthSites:credit:add')")
     @Log(title = "消纳场失信", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EarthsitesCredit earthsitesCredit)
@@ -98,7 +96,6 @@ public class EarthsitesCreditController extends BaseController
     /**
      * 修改消纳场失信
      */
-    @PreAuthorize("@ss.hasPermi('EarthSites:credit:edit')")
     @Log(title = "消纳场失信", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EarthsitesCredit earthsitesCredit)
@@ -109,7 +106,6 @@ public class EarthsitesCreditController extends BaseController
     /**
      * 删除消纳场失信
      */
-    @PreAuthorize("@ss.hasPermi('EarthSites:credit:remove')")
     @Log(title = "消纳场失信", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -117,7 +113,6 @@ public class EarthsitesCreditController extends BaseController
         return toAjax(earthsitesCreditService.deleteEarthsitesCreditByIds(ids));
     }
-    @PreAuthorize("@ss.hasPermi('EarthSites:credit:list')")
     @GetMapping("/historyCredit")
     public TableDataInfo historyCredit(EarthsitesCredit earthsitesCredit)
     {
@@ -36,7 +36,6 @@ public class SupervisionSpecialController extends BaseController
     /**
      * 查询专项督察列表
      */
-    @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:list')")
     @GetMapping("/list")
     public TableDataInfo list(SupervisionSpecial supervisionSpecial)
     {
@@ -48,7 +47,6 @@ public class SupervisionSpecialController extends BaseController
     /**
      * 导出专项督察列表
      */
-    @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:export')")
     @Log(title = "专项督察", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(SupervisionSpecial supervisionSpecial)
@@ -65,7 +63,6 @@ public class SupervisionSpecialController extends BaseController
     /**
      * 获取专项督察详细信息
      */
-    @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -75,7 +72,6 @@ public class SupervisionSpecialController extends BaseController
     /**
      * 新增专项督察
      */
-    @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:add')")
     @Log(title = "专项督察", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SupervisionSpecial supervisionSpecial)
@@ -86,7 +82,6 @@ public class SupervisionSpecialController extends BaseController
     /**
      * 修改专项督察
      */
-    @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:edit')")
     @Log(title = "专项督察", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SupervisionSpecial supervisionSpecial)
@@ -97,7 +92,6 @@ public class SupervisionSpecialController extends BaseController
     /**
      * 删除专项督察
      */
-    @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:remove')")
     @Log(title = "专项督察", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
@@ -62,7 +62,6 @@ public class SupervisionThreestepController extends BaseController
     /**
      * 查询三查机制列表
      */
-    @PreAuthorize("@ss.hasPermi('business:threestep:list')")
     @GetMapping("/list")
     public TableDataInfo list(SupervisionThreestep supervisionThreestep)
     {
@@ -115,7 +114,6 @@ public class SupervisionThreestepController extends BaseController
         return getDataTable(list);
     }
-    @PreAuthorize("@ss.hasPermi('business:threestep:list')")
     @PostMapping("/list")
     public AjaxResult postList(@RequestBody SupervisionThreestep supervisionThreestep)
     {
@@ -130,7 +128,6 @@ public class SupervisionThreestepController extends BaseController
     /**
      * 查询三查机制列表
      */
-    @PreAuthorize("@ss.hasPermi('business:threestep:list')")
     @GetMapping("/dayWorkList")
     public TableDataInfo dayWorkList(SupervisionThreestep supervisionThreestep)
     {
@@ -276,7 +273,6 @@ public class SupervisionThreestepController extends BaseController
     /**
      * 导出三查机制列表
      */
-    @PreAuthorize("@ss.hasPermi('business:threestep:export')")
     @Log(title = "三查机制", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(SupervisionThreestep supervisionThreestep)
@@ -329,7 +325,6 @@ public class SupervisionThreestepController extends BaseController
     /**
      * 新增三查机制
      */
-    @PreAuthorize("@ss.hasPermi('business:threestep:add')")
     @Log(title = "三查机制", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SupervisionThreestep supervisionThreestep)
@@ -347,7 +342,6 @@ public class SupervisionThreestepController extends BaseController
     /**
      * 修改三查机制
      */
-    @PreAuthorize("@ss.hasPermi('business:threestep:edit')")
     @Log(title = "三查机制", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SupervisionThreestep supervisionThreestep)
@@ -355,7 +349,6 @@ public class SupervisionThreestepController extends BaseController
         return toAjax(supervisionThreestepService.updateSupervisionThreestep(supervisionThreestep));
     }
-    @PreAuthorize("@ss.hasPermi('business:threestep:edit')")
     @Log(title = "三查机制", businessType = BusinessType.UPDATE)
     @PostMapping(value="/active")
     public AjaxResult active(@RequestBody SupervisionThreestep supervisionThreestep)
@@ -368,7 +361,6 @@ public class SupervisionThreestepController extends BaseController
     /**
      * 删除三查机制
      */
-    @PreAuthorize("@ss.hasPermi('business:threestep:remove')")
     @Log(title = "三查机制", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -40,7 +40,6 @@ public class TruckActivateController extends BaseController
     /**
      * 查询车辆激活列表
      */
-    @PreAuthorize("@ss.hasPermi('business:truckActivate:list')")
     @GetMapping("/list")
     public TableDataInfo list(TruckActivate truckActivate)
     {
@@ -52,7 +51,6 @@ public class TruckActivateController extends BaseController
     /**
      * 导出车辆激活列表
      */
-    @PreAuthorize("@ss.hasPermi('business:truckActivate:export')")
     @Log(title = "车辆激活", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TruckActivate truckActivate)
@@ -81,7 +79,6 @@ public class TruckActivateController extends BaseController
     /**
      * 获取车辆激活详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:truckActivate:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -91,7 +88,6 @@ public class TruckActivateController extends BaseController
     /**
      * 新增车辆激活
      */
-    @PreAuthorize("@ss.hasPermi('business:truckActivate:add')")
     @Log(title = "车辆激活", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TruckActivate truckActivate)
@@ -128,7 +124,6 @@ public class TruckActivateController extends BaseController
     /**
      * 修改车辆激活
      */
-    @PreAuthorize("@ss.hasPermi('business:truckActivate:edit')")
     @Log(title = "车辆激活", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TruckActivate truckActivate)
@@ -155,7 +150,6 @@ public class TruckActivateController extends BaseController
     /**
      * 删除车辆激活
      */
-    @PreAuthorize("@ss.hasPermi('business:truckActivate:remove')")
     @Log(title = "车辆激活", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -47,7 +47,6 @@ public class TruckCreditController extends BaseController
         return getDataTable(list);
     }
-    @PreAuthorize("@ss.hasPermi('business:credit:list')")
     @GetMapping("/historyCredit")
     public TableDataInfo historyCredit(TruckCredit truckCredit)
     {
@@ -76,7 +75,6 @@ public class TruckCreditController extends BaseController
     /**
      * 导出车辆失信列表
      */
-    @PreAuthorize("@ss.hasPermi('truck:credit:export')")
     @Log(title = "车辆失信", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TruckCredit truckCredit)
@@ -103,7 +101,6 @@ public class TruckCreditController extends BaseController
     /**
      * 获取车辆失信详细信息
      */
-    @PreAuthorize("@ss.hasPermi('truck:credit:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -113,7 +110,6 @@ public class TruckCreditController extends BaseController
     /**
      * 新增车辆失信
      */
-    @PreAuthorize("@ss.hasPermi('truck:credit:add')")
     @Log(title = "车辆失信", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TruckCredit truckCredit)
@@ -124,7 +120,6 @@ public class TruckCreditController extends BaseController
     /**
      * 修改车辆失信
      */
-    @PreAuthorize("@ss.hasPermi('truck:credit:edit')")
     @Log(title = "车辆失信", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TruckCredit truckCredit)
@@ -135,7 +130,6 @@ public class TruckCreditController extends BaseController
     /**
      * 删除车辆失信
      */
-    @PreAuthorize("@ss.hasPermi('truck:credit:remove')")
     @Log(title = "车辆失信", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -28,6 +28,10 @@ public class DriverCredit extends BaseEntity
     /** 证件号码 */
     @Excel(name = "证件号码")
     private String idNumber;
+    
+    @Excel(name = "车牌号")
+    private String licenseplateNo;
+    
     /** 失信时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -50,7 +54,15 @@ public class DriverCredit extends BaseEntity
-    public void setId(Long id)
+    public String getLicenseplateNo() {
+		return licenseplateNo;
+	}
+
+	public void setLicenseplateNo(String licenseplateNo) {
+		this.licenseplateNo = licenseplateNo;
+	}
+
+	public void setId(Long id)
     {
         this.id = id;
     }
@@ -63,4 +63,6 @@ public interface DriverCreditMapper
     List<String> getNames(DriverCredit driverCredit);
     List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit);
+
+	List<String> getLicenseplate(DriverCredit credit);
 }
 \ No newline at end of file
@@ -81,6 +81,8 @@ public interface ISupervisionThreestepService
 	public List<String> getNames(SupervisionThreestep supervisionThreestep);
 	public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep);
+
+	void updateTodayData(String token);
 }