m

youxiw2000
1 parent 9c06308f
Showing 54 changed files with 1542 additions and 834 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/TaskController.java
trash-activiti/src/main/java/com/trash/activiti/controller/TaskHistoryController.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/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-admin/src/main/resources/application-dev.yml
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/dist.rar
trash-ui/src/api/activiti/task.js
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/caseoffline.js
trash-ui/src/api/dayWorkReport.js
trash-ui/src/api/dict.js
trash-ui/src/api/three_step.js
trash-ui/src/api/truck_active.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/api/warningInfo.js
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
  
  
 @RestController
@@ -41,7 +42,7 @@ public class TaskController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Page<ActTaskDTO> hashMaps = actTaskService.selectProcessDefinitionList(pageDomain);
  
-        List<String> allNames =  actReDeploymentMapper.selectTitles();
+        List<String> allNames =  actReDeploymentMapper.selectTitles(null);
         List<String> names =  new ArrayList<String>();
  
         for(String str:allNames){
@@ -77,6 +78,14 @@ public class TaskController extends BaseController {
     public String taskHistory() {
          return "taskHistory";
     }
+    
+
+    @PostMapping(value = "/getNames")
+    public AjaxResult getNames(@RequestBody Map<String,String> map){
+    	String name=map.get("name");
+    	
+        return AjaxResult.success(actReDeploymentMapper.selectTitles(name));
+    }
  
  
  
@@ -39,7 +39,7 @@ public class TaskHistoryController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Page<ActTaskDTO> hashMaps = actTaskService.selectRuntimeTaskHistoryDefinitionList(pageDomain);
  
-        List<String> allNames =  actReDeploymentMapper.selectTitles();
+        List<String> allNames =  actReDeploymentMapper.selectTitles(null);
  
         List<ActTaskDTO> list = hashMaps.getResult();
         List<String> names =  new ArrayList<String>();
@@ -68,7 +68,7 @@ public class TaskHistoryController extends BaseController {
     public TableDataInfo getEndTasks() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Page<ActTaskDTO> hashMaps = actTaskService.selectTaskEndHistoryDefinitionList(pageDomain);
-        List<String> allNames =  actReDeploymentMapper.selectHistTitles();
+        List<String> allNames =  actReDeploymentMapper.selectHistTitles(null);
         List<String> names =  new ArrayList<String>();
  
         List<ActTaskDTO> list = hashMaps.getResult();
@@ -8,8 +8,10 @@ import com.trash.common.utils.spring.SpringUtils;
  
 import org.activiti.api.task.model.Task;
 import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.bpmn.model.EndEvent;
 import org.activiti.bpmn.model.FlowElement;
 import org.activiti.bpmn.model.FlowNode;
+import org.activiti.bpmn.model.FormProperty;
 import org.activiti.bpmn.model.Gateway;
 import org.activiti.bpmn.model.SequenceFlow;
 import org.activiti.bpmn.model.StartEvent;
@@ -145,7 +147,7 @@ public class ActTaskDTO
  
         Map<String, Object> params= cache.getCacheMap(exeId);
  
-        if(params == null){
+        if(params == null || params.size() == 0){
         	params= SpringUtils.getBean(RuntimeService.class).getVariables(exeId);
         	cache.setCacheMap(exeId, params);
         }
@@ -181,53 +183,19 @@ public class ActTaskDTO
       BpmnModel model = SpringUtils.getBean(RepositoryService.class).getBpmnModel(task.getProcessDefinitionId());
 		List<org.activiti.bpmn.model.Process> processes = model.getProcesses();
  
-      List<String> modelList = new ArrayList<String>();
-      
+		List<String> modelList = null;
  
 		for(org.activiti.bpmn.model.Process p:processes){
 			Collection<FlowElement> flows = p.getFlowElements();
  
 			for(FlowElement f:flows){
-				
-				if(f instanceof org.activiti.bpmn.model.UserTask){
+				if(f instanceof StartEvent){
+					
  
-					List<SequenceFlow> flowList = ((org.activiti.bpmn.model.UserTask) f).getIncomingFlows();
+					modelList = getRouteList((StartEvent)f,route,index);
  
-					for(SequenceFlow sec:flowList){
-						if(route != null && sec.getConditionExpression() != null){
-							if(sec.getConditionExpression().contains("route") && !sec.getConditionExpression().contains("route==" + route)){
-								continue;
-							}
-						}
-						if(index != null && sec.getConditionExpression() != null){
-							if(sec.getConditionExpression().contains("index") && !sec.getConditionExpression().contains("index==" + index)){
-								continue;
-							}
-						}
-						
-						if(sec.getConditionExpression() != null){
-							String[] condis = sec.getConditionExpression().split("&&");
-							
-							if(condis.length == 0 && condis[0].contains("==1")){
-								continue;
-							}
-							
-							for(String cond:condis){
-								if(cond.contains("index") || cond.contains("route")){
-									continue;
-								}
-								
-								if(cond.contains("==1")){
-									continue;
-								}
-								modelList.add(f.getName());
-							}
-						}else{
-
-							modelList.add(f.getName());
-						}
-					}
  
+					break;
  
 				}
  
@@ -244,110 +212,119 @@ public class ActTaskDTO
     		  this.next = modelList.get(modelList.indexOf(task.getName())+1);
     	  }
  
-//        
-//
+	}
  
-//        
-//        FlowNode node = (FlowNode) model.getFlowElement(task.getFormKey());
-//        
-//        List<SequenceFlow> list = node.getIncomingFlows();
-//        
-//        for(SequenceFlow sec:list){
-//        	FlowNode flow = (FlowNode) model.getMainProcess().getFlowElement(sec.getSourceRef());
-//        	if (flow instanceof StartEvent) {
-//        		this.setPrev(null);
-//				break;
-//			}else if(flow instanceof Gateway) {
-////					for(SequenceFlow ssf:flow.getIncomingFlows()){
-//						if(route != null && sec.getConditionExpression() != null){
-//							if(sec.getConditionExpression().contains("route") && !sec.getConditionExpression().contains("route==" + route)){
-//								continue;
-//							}
-//						}
-//						if(index != null && sec.getConditionExpression() != null){
-//							if(sec.getConditionExpression().contains("index") && !sec.getConditionExpression().contains("index==" + index)){
-//								continue;
-//							}
-//						}
-//						
-//						if(sec.getConditionExpression() != null){
-//							String[] condis = sec.getConditionExpression().split("&&");
-//							
-//							if(condis.length == 0 && condis[0].contains("==1")){
-//								continue;
-//							}
-//							
-//							for(String cond:condis){
-//								if(cond.contains("index") || cond.contains("route")){
-//									continue;
-//								}
-//								
-//								if(cond.contains("==1")){
-//									continue;
-//								}
-//								for(SequenceFlow ssf:flow.getIncomingFlows()){
-//									if(ssf.getSourceFlowElement().getName() == null)
-//										continue;
-//									this.setPrev(ssf.getSourceFlowElement().getName());
-//									break;
-//								}
-//								
-//								
-//							}
-//						}
-//			}
-//        }
-//        
-//        List<SequenceFlow> list1 = node.getOutgoingFlows();
-//        
-//        for(SequenceFlow sec:list1){
-//        	        	
-//        	FlowNode flow = (FlowNode) model.getMainProcess().getFlowElement(sec.getTargetRef());
-//        	
-//        	if (flow instanceof StartEvent) {
-//				break;
-//			}else if(flow instanceof Gateway) {
-//				for(SequenceFlow ssf:flow.getOutgoingFlows()){
-//					if(route != null && ssf.getConditionExpression() != null){
-//						if(ssf.getConditionExpression().contains("route") && !ssf.getConditionExpression().contains("route==" + route)){
-//							continue;
-//						}
+
+
+	private List<String> getRouteList(StartEvent f, String route, String index) {
+		
+		List<String> modelList = new ArrayList<String>();
+		
+	    SequenceFlow firstFlow =  f.getOutgoingFlows().get(0);
+	    FlowElement firstElement = firstFlow.getTargetFlowElement();
+	    if(firstElement instanceof Gateway){
+
+	    	getTrueRoute(firstElement,route,index,modelList);
+			
+	    }else if(firstElement instanceof UserTask){
+	    	modelList.add(firstElement.getName());
+	    	
+	    	getTrueRoute(firstElement,route,index,modelList);
+	    }
+		
+//		if(f instanceof org.activiti.bpmn.model.UserTask){
+//			
+//			List<SequenceFlow> flowList = ((org.activiti.bpmn.model.UserTask) f).getIncomingFlows();
+//			
+//			for(SequenceFlow sec:flowList){
+//				if(route != null && sec.getConditionExpression() != null){
+//					if(sec.getConditionExpression().contains("route") && !sec.getConditionExpression().contains("route==" + route)){
+//						continue;
 //					}
-//					if(index != null && ssf.getConditionExpression() != null){
-//						if(ssf.getConditionExpression().contains("index") && !ssf.getConditionExpression().contains("index==" + index)){
-//							continue;
-//						}
+//				}
+//				if(index != null && sec.getConditionExpression() != null){
+//					if(sec.getConditionExpression().contains("index") && !sec.getConditionExpression().contains("index==" + index)){
+//						continue;
 //					}
+//				}
+//				
+//				if(sec.getConditionExpression() != null){
+//					String[] condis = sec.getConditionExpression().split("&&");
 //					
-//					if(ssf.getConditionExpression() != null){
-//						String[] condis = ssf.getConditionExpression().split("&&");
-//						
-//						if(condis.length == 0 && condis[0].contains("==1")){
+//					if(condis.length == 0 && condis[0].contains("==1")){
+//						continue;
+//					}
+//					
+//					for(String cond:condis){
+//						if(cond.contains("index") || cond.contains("route")){
 //							continue;
 //						}
 //						
-//						for(String cond:condis){
-//							if(cond.contains("index") || cond.contains("route")){
-//								continue;
-//							}
-//							
-//							if(cond.contains("==1")){
-//								continue;
-//							}
-//								if(ssf.getTargetFlowElement().getName() == null)
-//									continue;
-//								this.setNext(ssf.getTargetFlowElement().getName());
-//								break;
-//							}
-//							
-//							
+//						if(cond.contains("==1")){
+//							continue;
 //						}
+//						modelList.add(f.getName());
 //					}
+//				}else{
+//
+//					modelList.add(f.getName());
+//				}
 //			}
-//        }
+//			
+//			
+//		}
+		return modelList;
 	}
  
-
+	private void getTrueRoute(FlowElement fe, String route, String index,List<String> modelList) {
+		
+		if(fe instanceof EndEvent){
+			return;
+		}
+		
+		String formString = null;
+		if(fe instanceof UserTask){
+			
+			for(FormProperty fp : ((UserTask) fe).getFormProperties()){
+				String id = fp.getId();
+				if(id.contains("radio")){
+					formString = id.split("--__!!")[0];
+					break;
+				}
+			}
+			
+			fe = ((UserTask) fe).getOutgoingFlows().get(0).getTargetFlowElement();
+			
+		}
+			for(SequenceFlow sf : ((Gateway) fe).getOutgoingFlows()){
+				String exp = sf.getConditionExpression().replace(" ", "");
+				
+				if(formString != null && !exp.contains(formString + "==0")){
+					continue;
+				}
+				if(exp.contains("index!=") && exp.contains("index!=" + index)){
+					continue;
+				}else if(exp.contains("index==") && !exp.contains("index==" + index)){
+					continue;
+				}
+				if(exp.contains("route!=") && exp.contains("route!=" + index)){
+					continue;
+				}else if(exp.contains("route==") &&  !exp.contains("route==" + route)){
+					continue;
+				}
+				
+				if(sf.getTargetFlowElement() instanceof EndEvent){
+					return;
+				}
+				modelList.add(sf.getTargetFlowElement().getName());
+				
+				getTrueRoute(sf.getTargetFlowElement(),route,index,modelList);
+				
+				break;
+			
+			}
+		
+	}
  
 	public String getId() {
         return id;
@@ -28,8 +28,8 @@ public interface ActReDeploymentMapper {
  
 		public Map<String, String> selectHistoryWorkByPId(String id);
  
-		public List<String> selectTitles();
+		public List<String> selectTitles(String name);
  
-		public List<String> selectHistTitles();
+		public List<String> selectHistTitles(String name);
  
 }
@@ -248,16 +248,17 @@ public class ActTaskServiceImpl implements IActTaskService {
  
 			processInstanceList = query.list();
  
-			Set<String> idString = new HashSet<String>();
-			for (HistoricProcessInstance pi : processInstanceList) {
-				idString.add(pi.getId());
-			}
-
-			List<Map<String, Object>> maps = actMapper.selectHistoryWorkByPIds(idString);
-			
 //			List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
  
 			if (processInstanceList.size() > 0) {
+
+				Set<String> idString = new HashSet<String>();
+				for (HistoricProcessInstance pi : processInstanceList) {
+					idString.add(pi.getId());
+				}
+
+				List<Map<String, Object>> maps = actMapper.selectHistoryWorkByPIds(idString);
+				
 				for (HistoricProcessInstance p : processInstanceList) {
 					try {
 						ActTaskDTO dto = new ActTaskDTO(p, 
@@ -170,6 +170,9 @@ public class myTaskServiceImpl implements myTaskService {
  
 		if(name != null && !name.isEmpty()){
 			query.processInstanceNameLike(name);
+
+			List<ProcessInstance> pList = query.list();
+			
 		}
 		if(defKey.size()>0){
 			query.processDefinitionKeys(defKey);
@@ -182,7 +185,9 @@ public class myTaskServiceImpl implements myTaskService {
 				idSet.add(str);
 			}
  
-			pid = query.processInstanceIds(idSet).list().parallelStream().map(p->p.getId()).collect(Collectors.toList());
+			List<ProcessInstance> pList = query.processInstanceIds(idSet).list();
+			
+			pid = pList.parallelStream().map(p->p.getId()).collect(Collectors.toList());
 		}
  
  
@@ -41,7 +41,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  
 	<select id="selectTitles"  parameterType="String" resultType="java.lang.String">
 			select DISTINCT title from workflow
+			<where>
+				<if test="name!=null">and title like concat('%', #{name}, '%')</if>
+			</where>
 	</select>
+	
+	
 		<select id="selectHistTitles"  parameterType="String" resultType="java.lang.String">
 			select DISTINCT title from workflow_hi
 	</select>
@@ -17,7 +17,7 @@ trash:
     captchaType: math
     # 远程服务器地址
     #remotePath: http://175.6.47.84:8008
-    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
     remotePath: http://183.66.242.6:14601
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
  
@@ -32,7 +32,7 @@ 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/trash?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
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
  
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -13,6 +14,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.common.config.trashConfig;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.SecurityUtils;
  
 import okhttp3.MediaType;
@@ -74,7 +76,6 @@ public class RemoteServerUtils {
  
 	public static String ContractList = "/api/siteservice/cs/sitecontract/ledger/list";
  
-	
 	public static JSONArray getContractList(Map map){
 		JSONArray list=null;
 		Object object = post(ContractList,map);
@@ -88,6 +89,7 @@ public class RemoteServerUtils {
 	}
  
 	public static JSONArray getContractList(Map map,String token){
+		
 		JSONArray list=null;
 		Object object = post(ContractList,map,token);
  
@@ -81,7 +81,7 @@ public class DriverTask
 	private void checkTruckActive() {
     	int hour = new Date().getHours();
     	int minute = new Date().getMinutes();
-    	if(hour > 4 && hour < 8 && (hour>3 && minute>55)){
+    	if(hour < 8 && (hour==3 && minute>55)){
     		return;
     	}
  
@@ -120,6 +120,9 @@ public class DriverTask
     	List<SupervisionThreestep> cs = SpringUtils.getBean(SupervisionThreestepMapper.class).selectTodayDataList(param);
  
     	for(SupervisionThreestep c:cs){
+        	if(hour < 8 && (hour==3 && minute>55)){
+        		return;
+        	}
     		try {
      	       SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(c,TOKEN);
 			} catch (Exception e) {
@@ -332,6 +335,19 @@ public class DriverTask
 		JSONArray jsonArray = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
 		redisCache.setCacheObject("companyList",jsonArray);
 	}
+	
+	public void getContractList(){
+		if(RemoteServerUtils.remote == null){
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("size",9999);
+		map.put("page",1);
+		map.put("contractStatus", 1);
+		map.put("auditStatus", 1);
+		JSONArray jsonArray = RemoteServerUtils.getContractList(map, trashConfig.getToken());
+		redisCache.setCacheObject("contractList",jsonArray);
+	}
  
 	/**
 	 * 每分钟更新一次工地列表
@@ -341,7 +357,7 @@ public class DriverTask
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 		}
 		Map<String, Object> map = new HashMap<>();
-		map.put("size",999);
+		map.put("size",9999);
 		map.put("page",1);
 		JSONArray jsonArray = RemoteServerUtils.getConstructionList(map,trashConfig.getToken());
 		redisCache.setCacheObject("constructionList",jsonArray);
@@ -355,7 +371,7 @@ public class DriverTask
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 		}
 		Map<String, Object> map = new HashMap<>();
-		map.put("size",999);
+		map.put("size",9999);
 		map.put("page",1);
 		JSONArray jsonArray = RemoteServerUtils.getEarthSitesList(map,trashConfig.getToken());
 		redisCache.setCacheObject("earthSitesList",jsonArray);
@@ -369,7 +385,7 @@ public class DriverTask
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 		}
 		Map<String, Object> map = new HashMap<>();
-		map.put("size",999);
+		map.put("size",9999);
 		map.put("page",1);
 		JSONArray jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
 		redisCache.setCacheObject("areaList",jsonArray);
@@ -26,6 +26,10 @@ export function formDataSave(taskID,data) {
   })
 }
  
-
-
-
+export function getNames(name) {
+  return request({
+    url: '/task/getNames/',
+    method: 'post',
+    data:{name:name}
+  })
+}
@@ -49,6 +49,7 @@ export default {
       caseType: [
         {code: 7, name: "无许可消纳（工）"},
         {code: 8, name: "无许可消纳（消）"},
+        {code: 9, name: "使用非专用车辆"},
         {code: 0, name: "渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，车轮带泥"},
         {code: 1, name: "未洗车出场或者出场清洁不彻底"},
         {code: 2, name: "渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
@@ -56,7 +57,6 @@ export default {
         {code: 4, name: "渣土处置工地未按规定时间开停工"},
         {code: 5, name: "渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
         {code: 6, name: "渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"},
-        {code: 9, name: "其他3"}
       ],
       fileList: [],
       areas: [],
@@ -67,6 +67,9 @@ export default {
       rules: {
       },
       caseType:[
+        {code: 7, name: "无许可消纳（工）"},
+        {code: 8, name: "无许可消纳（消）"},
+        {code: 9, name: "使用非专用车辆"},
         {code:0,name:"渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，车轮带泥"},
         {code:1,name:"未洗车出场或者出场清洁不彻底"},
         {code:2,name:"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
@@ -74,9 +77,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:[],
       areas: [],
@@ -99,6 +99,10 @@ export default {
       slides:[],
       videoSrc:[],
       businessKey:null,
+      remoteQueryData : {
+        "page": 1,
+        "size": 100
+      }
     };
   },
   created() {
@@ -132,22 +136,37 @@ export default {
  
  
  
-    let remoteQueryData = {
-      "page": 1,
-      "size": 9999
-    }
-
-    constructionsitesList(remoteQueryData).then(res => {
+    constructionsitesList(this.remoteQueryData).then(res => {
        this.data[0]= res.result.list;
     });
  
-    earthsitesList(remoteQueryData).then(res => {
+    earthsitesList(this.remoteQueryData).then(res => {
         this.data[1]= res.result.list;
     });
   },
   methods: {
     getSite(item){
-      this.form.objectId = item.id;
+
+      this.remoteQueryData.name = item;
+
+      constructionsitesList(this.remoteQueryData).then(res => {
+         this.data[0]= res.result.list;
+         for(let i in res.result.list){
+           if(res.result.list[i].name == item){
+             this.form.objectId = res.result.list[i].id;
+           }
+         }
+      });
+
+      earthsitesList(this.remoteQueryData).then(res => {
+          this.data[1]= res.result.list;
+          for(let i in res.result.list){
+            if(res.result.list[i].name == item){
+              this.form.objectId = res.result.list[i].id;
+            }
+          }
+      });
+
     },
     /** 查询线下交办案卷列表 */
     getList() {
@@ -304,13 +304,13 @@ export default {
               });
       // let query = this.queryParams;
  
-      if (tabIdx == 1) {
+      if (this.queryParams.his != tabIdx && tabIdx == 1) {
         this.queryParams.pageNum = 1;
         this.resetQuery();
         this.names = null;
         this.ename = null;
         this.queryParams.his = tabIdx;
-      } else if (tabIdx == 0) {
+      } else if (this.queryParams.his != tabIdx && tabIdx == 0) {
         this.queryParams.pageNum = 1;
         this.resetQuery();
         this.names = null;
 import requestRemote from '@/utils/requestRemote'
  
+export function getTruckList(params) {
+  return requestRemote({
+    url: ' /api/gpsservice/cs/basevehicle/simplelist',
+    method: 'get',
+    params:params
+  });
+}
+
+
 export function constructionById(id) {
   return requestRemote({
     url: '/api/siteservice/cs/constructionsites/'+id,
@@ -31,6 +31,7 @@ import {
   getConstructionTruck,
   constructionById,
   earthsitesById,
+  getTruckList,
 } from "@/api/dict";
  
 export default {
@@ -50,6 +51,7 @@ export default {
         businessKey:null,
         picSample: false,
         uploadImageDialog: false,
+        truckName:null,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -138,16 +140,6 @@ export default {
           message: '请填写完整',
           trigger: 'change'
         },],
-        companys: [{
-          required: false,
-          message: '请填写完整',
-          trigger: 'change'
-        },],
-        trucks: [{
-          required: false,
-          message: '请填写完整',
-          trigger: 'change'
-        },],
         objectId: [{
           required: true,
           message: '请填写完整',
@@ -174,7 +166,7 @@ export default {
       remoteData: [],
       remoteQueryData: {
         "page": 1,
-        "size": 9999,
+        "size": 100,
         "auditStatus": 1,
         "creditStatus": 0,
       },
@@ -287,66 +279,108 @@ export default {
     selectArea(a) {
       this.areaCode = a;
       this.form.name = "";
+      this.remoteQueryData.name = null;
+
+      this.remoteQueryData.areaCode = a;
+
+      this.remoteData = [];
+      this.getRemoteData();
+
     },
-    getObjId(value) {
-      let item;
-      for (let i in this.remoteData) {
-        if (this.remoteData[i].name == value) {
-          item = this.remoteData[i];
-          break;
+    getRemoteData(){
+      if(this.form.type){
+        if (this.form.type == "0") {
+          if(this.remoteQueryData.areaCode)
+            this.remoteQueryData.areaCode = this.remoteQueryData.areaCode + "";
+
+          constructionsitesList(this.remoteQueryData).then(res => {
+            for(let i in  res.result.list){
+              this.remoteData.push(res.result.list[i]);
+
+              if(res.result.list[i].name == this.form.name){
+                let item = this.remoteData[0];
+                this.form.objectId = item.id;
+                this.form.place = Number(item.areaCode);
+                this.getCompanyTrucks(item.id);
+              }
+
+            }
+
+
+              // this.rules.companys[0].required = true;
+              // this.rules.trucks[0].required = true;
+
+          });
+        } else {
+          if(this.remoteQueryData.areaCode)
+            this.remoteQueryData.areaCode = [this.remoteQueryData.areaCode+""];
+            earthsitesList(this.remoteQueryData).then(res => {
+              for(let i in  res.result.list){
+                this.remoteData.push(res.result.list[i]);
+                if(res.result.list[i].name == this.form.name){
+                  let item = this.remoteData[0];
+                  this.form.objectId = item.id;
+                  this.form.place = Number(item.areaCode) ;
+                }
+              }
+            });
         }
       }
+    },
+    getObjId(value) {
+      console.log(value);
+      let item;
  
+      this.remoteQueryData.name = value;
+      this.remoteData = [];
+      this.getRemoteData();
  
-      this.form.objectId = item.id;
-      this.form.place = Number(item.areaCode);
-
-      if(this.form.type == 1)
-        return;
  
  
-      this.getCompanyTrucks(item.id);
     },
     getCompanyTrucks(objId){
-
       this.form.companys = null;
       this.form.companyTrucks = null;
       this.companyList = [];
       this.truckList = [];
  
-      constructionById(objId).then(response => {
-        this.companyList.push({id: response.result.transportCompanyId, name: response.result.transportCompany});
-        let query = {
-          'page': 1,
-          'size': 9999,
-          'dishonestState': 0,
-          'valid': 0
+      constructionById(objId).then(res => {
+        this.companyList.push({
+          id: res.result.transportCompanyId,
+          name: res.result.transportCompany
+        });
+
+        let param = {
+          companyId:res.result.transportCompanyId,
+          auditStatus:1,
+          dishonestState:0
         }
  
-        let ids = [];
+        for(let i in res.result.unitCompanyList){
+            let unit = res.result.unitCompanyList[i];
+
+            let today = new Date().getTime();
+            if(new Date(unit.startTime).getTime() > today || new Date(unit.endTime).getTime() < today){
+               continue;
+            }
+            param.companyId += "," + unit.companyId;
  
-        ids.push(response.result.transportCompanyId);
+            this.companyList.push({
+              id: unit.companyId,
+              name: unit.companyName
+            });
  
-        query.companyID = ids + "";
-        query.valid = 0;
+        }
  
-        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) {
-              this.truckList.push({
-                id: res.result[i].vehicleList[j].id,
-                licenseplateNo: res.result[i].vehicleList[j].licenseplateNo,
-                companyName: res.result[i].companyName
-              });
-            }
+
+        getTruckList(param).then(tres=>{
+          for(let i = 0;i< tres.result.length;i++){;
+              this.truckList.push({licenseplateNo:tres.result[i].licenseplateNo,id:tres.result[i].id,companyName:tres.result[i].companyName});
           }
-          truckList(query).then(res => {
-            for (let i in res.result.list) {
-              this.truckList.push(res.result.list[i]);
-            }
-          });
-        });
+        })
+
+
+
       });
  
     },
@@ -355,33 +389,40 @@ export default {
       window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
     },
     removeImage(index, img) {
-      for(let i=0;i<this.slides[index].length;i++){
-        if(this.slides[index][i].alt == img){
-          this.slides[index].splice(i,1);
+      if(this.slides[index]){
+        for(let i=0;i<this.slides[index].length;i++){
+          if(this.slides[index][i].alt == img){
+            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);
+      if(this.videos[index]){
+        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();
     },
-    removeAttchItem(index, img,index1) {
-      let target = "attchItem" + index;
+    removeAttchItem(index, img) {
+      let target = "attchItem" + (index-90);
       this.form[target].splice(this.form[target].indexOf(img), 1);
-      for(let i=0;i<this.slides[index1].length;i++){
-        if(this.slides[index1][i].alt == img){
-          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);
-        }
-      }
+      if(this.slides[index]){
+        for(let i=0;i<this.slides[index].length;i++){
+          if(this.slides[index][i].alt == img){
+            this.slides[index].splice(i,1);
+          }
+        }}
+      if(this.videos[index]){
+        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();
     },
  
@@ -396,15 +437,16 @@ export default {
           this.form[target] = [];
         }
         this.form[target].push(res);
-        return;
-      }
-      let target = "img" + this.picIndex;
+      }else{
+        let target = "img" + this.picIndex;
+
+        if (!this.form[target]) {
+          this.form[target] = [];
+        }
  
-      if (!this.form[target]) {
-        this.form[target] = [];
+        this.form[target].push(res);
       }
  
-      this.form[target].push(res);
       if(file.name.indexOf('.jpg') > -1 ||file.name.indexOf('.png') > -1){
         let url = URL.createObjectURL(file.raw)
         if(!this.slides[this.picIndex]){
@@ -434,7 +476,6 @@ export default {
       this.picIndex = i;
     },
     beforeUpload(file) {
-      console.log(file);
       let isRightSize = file.size / 1024 / 1024 < 20
       if (!isRightSize) {
         this.$message.error('文件大小超过 20MB')
@@ -462,26 +503,21 @@ export default {
     },
     selectType(value) {
  
-        this.rules.companys[0].required = false;
-        this.rules.trucks[0].required = false;
+        // this.rules.companys[0].required = false;
+        // this.rules.trucks[0].required = false;
  
         this.form.name = null;
-        this.bindname = null;
+
+        this.remoteQueryData.name = null;
  
         if (value == "0") {
           this.labelName = "工地名称";
-          constructionsitesList(this.remoteQueryData).then(res => {
-              this.remoteData = res.result.list;
-              this.rules.companys[0].required = true;
-              this.rules.trucks[0].required = true;
-
-          });
         } else {
           this.labelName = "处理场所名称";
-          earthsitesList(this.remoteQueryData).then(res => {
-              this.remoteData = res.result.list;
-          });
         }
+
+        this.remoteData = [];
+        this.getRemoteData();
     },
     getAreaName(code) {
       for (let i = 0; i < this.areas.length; i++) {
@@ -515,15 +551,6 @@ export default {
         })
       }
  
-      let query = {
-        "page": 1,
-        "size": 9999,
-        "auditStatus": 1,
-      };
-
-      contractList(query).then(res => {
-        this.contractList = res.result.list;
-      });
  
       this.loading = true;
       listThreestep(this.queryParams).then(response => {
@@ -556,8 +583,8 @@ export default {
         checkTime: null,
         earthsitesName: null,
         contract: null,
-        companys: null,
-        companyTrucks: null,
+        companys: [],
+        companyTrucks: [],
         img0: null,
         img1: null,
         img2: null,
@@ -574,6 +601,15 @@ export default {
         person: null,
         phone: null
       };
+
+      this.remoteQueryData = {
+        page:1,
+        size:100,
+        auditStatus: 1,
+        creditStatus: 0,
+      }
+
+
       this.videos = [];
       this.slides = [];
       this.resetForm("form");
@@ -613,14 +649,16 @@ export default {
       }
     },
     reSub(row) {
-      this.reset();
+      // this.reset();
  
       this.title = "再次提交";
  
-      this.open = true;
+        this.open = true;
+
       getThreestep(row.id).then(res => {
         this.form = res.data;
-
+        this.form.name = res.data.name;
+        this.form.objectId = res.data.objectId;
         this.form.type = this.form.type + "";
         this.form.place = Number(this.form.place);
         this.bindname = res.data.earthsitesName;
@@ -644,7 +682,6 @@ export default {
           let query = {
             'page': 1,
             'size': 9999,
-            'dishonestState': 0,
             'valid': 0
           }
  
@@ -653,7 +690,6 @@ export default {
           ids.push(response.result.transportCompanyId);
  
           query.companyID = ids + "";
-          query.valid = 0;
  
           getConstructionTruck(this.form.objectId).then(res => {
             for (let i in res.result) {
@@ -666,17 +702,21 @@ export default {
                 });
               }
             }
+
             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);
+                this.truckList.push(res.result.list[i]);
+              }
+              for(let j in this.form.trucks){
+                for (let i in this.truckList) {
+                  console.log(this.form.trucks[j]);
+                  console.log(this.truckList[i].id);
+                  if(this.form.trucks[j] == this.truckList[i].id){
+                    trucks.push(this.truckList[i].licenseplateNo);
                     break;
                   }
                 }
-
-                this.truckList.push(res.result.list[i]);
               }
               this.form.trucks = trucks;
             });
@@ -714,7 +754,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      debugger;
       if(this.form.trucks){
         this.form.companyTrucks = [];
         for(let i in this.form.trucks){
@@ -727,10 +766,32 @@ export default {
         }
       }
  
+      let companyNames = "";
+      for(let i in this.companyList){
+        companyNames += this.companyList[i].name + ",";
+      }
  
  
       this.$refs["form"].validate(valid => {
         if (valid) {
+          let query = {
+            "page": 1,
+            "size": 9999,
+            "auditStatus": 1,
+          };
+
+          this.form.companys = companyNames;
+
+          if(this.form.type == 0){
+
+            query.constructionSiteID = [this.form.objectId];
+
+          }else{
+            query.earthSiteID= [this.form.objectId];
+          }
+
+          contractList(query).then(res => {
+            this.contractList = res.result.list;
  
             let racts = [];
             let ractsName = [];
@@ -773,6 +834,7 @@ export default {
  
           if (this.form.id != null) {
             if (this.queryParams.pageStatus == 1) {
+
               updateThreestep(this.form).then(response => {
                 this.msgSuccess("提交成功");
                 this.open = false;
@@ -793,10 +855,8 @@ export default {
                 }
               });
             } else {
-              this.form.companys = this.form.companys + "";
               this.form.companyTrucks = this.form.companyTrucks + "";
  
-
               for (let i = 0; i < 13; i++) {
                 if (this.form["img" + i]) {
                   this.form["img" + i] = this.form["img" + i] + "";
@@ -851,14 +911,11 @@ export default {
               }
             })
           }
+          });
+
         }
       });
     },
-    loadMore(n) {
-          // n是默认初始展示的条数会在渲染的时候就可以获取,具体可以打log查看
-          // elementui下拉超过7条才会出滚动条,如果初始不出滚动条无法触发loadMore方法
-          return () => (this.rangeNumber += 5); // 每次滚动到底部可以新增条数  可自定义
-        },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -885,26 +942,10 @@ export default {
       }).then(response => {
         this.download(response.message);
       })
+    },
+    checkUpdate(value){
+      this.$forceUpdate();
     }
   },
-  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();
-          });
-        }
-      },
-      }
+
 };
@@ -19,7 +19,8 @@ import {
   mainworkcompany,
   getConstructionTruck,
   constructionById,
-  truckList
+  truckList,
+  getTruckList
 } from "@/api/dict";
  
 export default {
@@ -95,9 +96,16 @@ export default {
       company: null,
       openActivateTime: false,
       isLoading: false,
+      simpleName:null,
     };
   },
   created() {
+
+
+    // if(this.$store.getters.name.indexOf("渣土") == -1){
+    //   this.simpleName = this.$store.getters.name;
+    // }
+
     this.getList(0);
   },
   methods: {
@@ -131,7 +139,6 @@ export default {
     },
     getCompany(value) {
       let item;
-
       for (let i in this.constList) {
         if (this.constList[i].name == value) {
           this.construction = this.constList[i];
@@ -142,43 +149,42 @@ export default {
       this.companyList = [];
       this.truckList = [];
  
+
       constructionById(item.objectId).then(res => {
         this.companyList.push({
           id: res.result.transportCompanyId,
           name: res.result.transportCompany
         });
-        
-        let query = {
-          'page': 1,
-          'size': 9999,
-          'dishonestState': 0,
-          'valid': 0
+
+
+        let param = {
+          companyId:res.result.transportCompanyId,
+          auditStatus:1,
+          dishonestState:0
         }
  
-        let ids = [];
-
-        ids.push(item.transportCompanyId);
-
-        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 i in res.result.unitCompanyList){
+            let unit = res.result.unitCompanyList[i];
+
+            let today = new Date().getTime();
+            if(new Date(unit.startTime).getTime() > today || new Date(unit.endTime).getTime() < today){
+               continue;
             }
+            param.companyId += "," + unit.companyId;
+
+            this.companyList.push({
+              id: unit.companyId,
+              name: unit.companyName
+            });
+
+        }
+
+        getTruckList(param).then(tres=>{
+          for(let i = 0;i< tres.result.length;i++){;
+              this.truckList.push({licenseplateNo:tres.result[i].licenseplateNo,id:tres.result[i].id,companyName:tres.result[i].companyName});
           }
-          truckList(query).then(res => {
-            for (let i in res.result.list) {
-              this.truckList.push(res.result.list[i]);
-            }
-          });
-        });
+        })
       });
  
  
@@ -246,27 +252,30 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-
+          let data = {
+            objectId: "",
+            licensePlate: "",
+            constructionId:this.construction.objectId,
+            construction: this.construction.name,
+            earthsite: this.construction.earthsitesName,
+            status: 0,
+            company: this.form.company,
+          }
           for (var i in this.form.licensePlate) {
             for (let j in this.truckList) {
               if (this.form.licensePlate[i] == this.truckList[j].id) {
  
-                let data = {
-                  objectId: this.form.licensePlate[i],
-                  licensePlate: this.truckList[j].licenseplateNo,
-                  construction: this.construction.name,
-                  earthsite: this.construction.earthsitesName,
-                  status: 0,
-                  company: this.form.company,
-                }
-                addTruckActivate(data).then(response => {
-                  this.msgSuccess("新增成功");
-                  this.open = false;
-                  this.getList();
-                });
+                  data.objectId += this.form.licensePlate[i] + ",";
+                  data.licensePlate += this.truckList[j].licenseplateNo + ",";
+
               }
             }
           }
+          addTruckActivate(data).then(response => {
+            this.msgSuccess("新增成功");
+            this.open = false;
+            this.getList();
+          });
         }
       });
     },
@@ -77,9 +77,25 @@ export default {
         violationType: [
           {required: true, message: "必填", trigger: "blur"}
         ],
+        projectName: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
+        describe: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
+        companyName: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
       },
       caseType: [{code: 0, name: "进入非专用车辆"},
-        {code: 1, name: "三无车辆运输"},
+        {code: 1, name: "无许可手续（工）"},
+        {code: 2, name: "无许可手续（消）"},
         {code: 3, name: "黄土覆盖情况"},
         {code: 4, name: "出入口路面污染"},
         {code: 5, name: "出入口道路硬化"},
@@ -114,7 +130,7 @@ export default {
       companyList: [],
       remoteQueryData: {
         "page": 1,
-        "size": 9999
+        "size": 100
       },
       areas: [],
       data: {},
@@ -175,6 +191,18 @@ export default {
     this.getList();
   },
   methods: {
+    getRemoteDate(value){
+      this.remoteQueryData.name =value;
+      constructionsitesList(this.remoteQueryData).then(res => {
+        this.projectNameList = res.result.list;
+        earthsitesList(this.remoteQueryData).then(res => {
+          for (var i in res.result.list) {
+            this.projectNameList.push(res.result.list[i]);
+          }
+        });
+      });
+
+    },
     selectArea(item) {
  
       this.form.owningRegion = item.name;
@@ -369,6 +397,18 @@ export default {
         this.isLoading = false
       }, 200)
     },
+    getCompanys(value){
+
+      let query  = {
+        name:value,
+        page:1,
+        size:100
+      };
+
+      companyList(query).then(res => {
+        this.companyList = res.result.list;
+      });
+    },
     companyLoadOptions(query) {
       // 根据输入的关键字query异步加载选项数据
       this.isLoadingCompany = true
@@ -102,6 +102,21 @@ export default {
           message: "必填",
           trigger: "blur"
         }],
+        projectName: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
+        describe: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
+        companyName: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
       },
       caseType: [{
           code: 0,
@@ -416,6 +431,17 @@ export default {
       const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`;
       return code;
     },
+    getCompanys(value){
+      let query  = {
+        name:value,
+        page:1,
+        size:100
+      };
+
+      companyList(query).then(res => {
+        this.companyList = res.result.list;
+      });
+    },
     projectNameLoadOptions(query) {
       // 根据输入的关键字query异步加载选项数据
       this.isLoading = true
@@ -37,6 +37,9 @@ Vue.prototype.handleTree = handleTree
 Vue.prototype.parseStatus = parseStatus
 Vue.prototype.checkPer = checkPermi
  
+Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
+// Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
+
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
 }
@@ -71,7 +71,7 @@ import store from &quot;@/store&quot;;
           id = this.businessKey;
         }
  
-        let http = "http://183.66.242.6:14601";
+        let http = this.remoteFrame;
  
         if(this.businessType == 0){
           this.src = http + "/single/#/enterprise-information/information-detail?id=" + id;
@@ -11,19 +11,16 @@
       </el-option>
     </el-select>
  
-    <el-select v-model="queryParams.name" filterable reserve-keyword  placeholder="名称">
-      <el-option label="全部" value=""/>
+    <el-select v-model="queryParams.name" filterable allow-create reserve-keyword :filter-method="remoteName"  placeholder="名称">
       <el-option v-for="item in names" :label="item" :value="item">
       </el-option>
     </el-select>
  
     <el-select v-model="queryParams.prev" filterable reserve-keyword  placeholder="上一节点">
-      <el-option label="全部" value=""/>
       <el-option v-for="item in prev" :label="item.name" :value="item.name">
       </el-option>
     </el-select>
     <el-select v-model="queryParams.type" filterable reserve-keyword>
-      <el-option label="全部" value=""/>
       <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
       <el-option label="消纳合同申报备案" value="workflow_conract"/>
       <el-option label="处理场所备案" value="workflow_earthsites"/>
@@ -616,7 +613,7 @@
 </style>
  
 <script>
-import {formDataSave, formDataShow, listTask} from "@/api/activiti/task";
+import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
  
 import {historyFromData} from '@/api/activiti/historyFormdata'
  
@@ -704,6 +701,7 @@ export default {
       taskName: null,
       // 查询参数
       queryParams: {
+        name:null,
         pageNum: 1,
         pageSize: 10,
         role: null,
@@ -795,9 +793,23 @@ export default {
     getDict(role).then(res => {
       this.roles = res.result;
     });
-    this.getList();
+
+    listTask(this.queryParams).then(response => {
+      this.taskList = response.rows;
+      this.names = response.names;
+      this.total = response.total;
+      this.loading = false;
+    });
   },
   methods: {
+    remoteName(value){
+      getNames(value).then(res=>{
+
+        this.names = res.data;
+
+        this.queryParams.name = value;
+      });
+    },
     resetQuery(){
       this.queryParams = {};
       this.queryParams.pageNum=1;
@@ -907,8 +919,6 @@ export default {
       this.loading = true;
       listTask(this.queryParams).then(response => {
         this.taskList = response.rows;
-        if(!this.names)
-          this.names = response.names;
         this.total = response.total;
         this.loading = false;
       });
@@ -929,7 +939,6 @@ export default {
       this.conferenceOpen = false;
       this.construct = false;
       this.leaveApplicationOpen = false;
-
       this.company = false;
       this.driver = false;
       this.vehicle = false;
@@ -1173,20 +1182,7 @@ export default {
         return;
       }
  
-      if (this.definitionKey == "workflow_conract") {
-        formDataSave(this.id, this.form.formData).then(response => {
-          this.msgSuccess("审批成功");
-          this.contract = false;
-          this.getList();
-        });
-      }
-      if (this.definitionKey == "workflow_earthsites") {
-        formDataSave(this.id, this.form.formData).then(response => {
-          this.msgSuccess("审批成功");
-          this.earthsites = false;
-          this.getList();
-        });
-      }
+
       if (this.definitionKey == "workflow_caseoffline") {
  
         let postData = {};
@@ -1300,16 +1296,13 @@ export default {
         });
       }
  
-      if (this.definitionKey.indexOf("supervision") > -1) {
-        formDataSave(this.id, this.form.formData).then(response => {
-          this.msgSuccess("审批成功");
-          this.supervisionOpen = false;
-          this.getList();
-        });
-      }
-      if (this.definitionKey == "workflow_company" ||
+      if (
+      this.definitionKey.indexOf("supervision") > -1 ||
+      this.definitionKey == "workflow_company" ||
         this.definitionKey == "workflow_driver" ||
         this.definitionKey == "workflow_vehicle" ||
+        this.definitionKey == "workflow_earthsites" ||
+        this.definitionKey == "workflow_conract" ||
         this.definitionKey == "workflow_constructsite_edit") {
         formDataSave(this.id, this.form.formData).then(response => {
           this.msgSuccess("审批成功");
@@ -111,13 +111,13 @@
     <!--  平台违规信息  -->
     <el-dialog :title="title" :visible.sync="violationCaseFile" width="850px" append-to-body
                :close-on-click-modal="false">
-      <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
+      <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile" :entryType="0"/>
     </el-dialog>
  
     <!--  违规预警信息  -->
     <el-dialog :title="title" :visible.sync="violationCaseFile1" width="850px" append-to-body
                :close-on-click-modal="false">
-      <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
+      <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1" :entryType="0"/>
     </el-dialog>
  
     <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body
@@ -24,7 +24,7 @@
       </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" :key="item.code" />
+         <el-option v-for="item in areas" :label="item.name" :value="item.code" />
         </el-select>
       </el-form-item>
  
@@ -113,7 +113,7 @@
           <el-col :span="12">
             <el-form-item label="所属区域" prop="place">
               <el-select v-model="form.place" placeholder="请选择所属区域" filterable  reserve-keyword @clear="areaClear" @change="selectArea">
-                <el-option v-for="item in areas" :label="item.name" :value="item.code" :key="item.code">
+                <el-option v-for="item in areas" :label="item.name" :value="item.code" >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -122,20 +122,19 @@
         <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" 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-select v-model="form.name" filterable  reserve-keyword @change="getObjId" :filter-method="getObjId">
+                <el-option v-for="item in remoteData" :label="item.name"
+                  :value="item.name" v-if="!form.place || item.areaCode == form.place">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row type="flex" justify="center" v-if="form.type == 0" >
+        <!-- <el-row type="flex" justify="center" v-if="form.type == 0" >
           <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"
-                />
+                <el-option  v-for="item in companyList" :label="item.name" :value="item.name"  />
               </el-select>
             </el-form-item>
           </el-col>
@@ -144,12 +143,13 @@
         <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-input v-model="truckName" />
+              <el-checkbox-group v-model="form.trucks" style="max-height: 200px;overflow: auto;" @change="checkUpdate">
+                <el-checkbox :label="item.licenseplateNo" v-for="item in truckList"  v-if="(!truckName || item.licenseplateNo.indexOf(truckName) > -1) &&form.companys && (form.companys.indexOf(item.companyName) > -1)" />
               </el-checkbox-group>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row type="flex" justify="center"  v-if="form.type != null">
           <el-col :span="12">
             <el-form-item label="现场负责人" prop="person">
@@ -416,7 +416,7 @@
               <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>
+            <p v-for="(img,index) in form.attchItem1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(91,img)" style="color:red"> x</a></p>
           </el-col>
           <el-col :span="8">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(92)">附件2</a>
@@ -432,7 +432,7 @@
               <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>
+            <p v-for="(img,index) in form.attchItem2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(92,img)" style="color:red"> x</a></p>
           </el-col>
           <el-col :span="8">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(93)">附件3</a>
@@ -448,7 +448,7 @@
               <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>
+            <p v-for="(img,index) in form.attchItem3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(93,img)" style="color:red"> x</a></p>
           </el-col>
         </el-row>
       </el-form>
@@ -45,7 +45,8 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          v-if="this.queryParams.status==0 && checkPer(['business.supervision.truckActivate.active'])"
+          v-if="this.queryParams.status==0 && checkPer(['business.supervision.truckActivate.active'])
+          && new Date().getHours() > 7 && new Date().getHours() < 24"
           type="primary"
           size="mini"
           @click="handleAdd"
@@ -93,18 +94,20 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="所属工地" prop="construction">
-          <el-select v-model="form.construction" placeholder="请选择所属工地" @change="getCompany">
+          <el-select v-model="form.construction" placeholder="请选择所属工地" filterable reserve-keyword @change="getCompany">
             <el-option v-for="item in constList" :label="item.name" :value="item.name" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="所属企业" prop="company">
             <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck">
-              <el-option v-for="item in companyList" :label="item.name" :value="item.name" />
+              <el-option v-for="item in companyList" :label="item.name" :value="item.name"
+                v-if="!simpleName || item.name.indexOf(simpleName) > -1"
+              />
             </el-select>
         </el-form-item>
         <el-form-item label="车牌号" prop="licensePlate">
             <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable>
-              <el-option  v-if="!form.company || form.company == item.companyName"
+              <el-option  v-if="(form.company && form.company == item.companyName)"
                         v-for="item in truckList"
                         :label="item.licenseplateNo"
                         :value="item.id"/>
@@ -97,9 +97,8 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
-          <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 v-model="form.siteName" placeholder="请选择类型" allow-create  filterable @change="getSite(item)">
+            <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name"/>
           </el-select>
         </el-form-item>
         <el-form-item label="问题描述" prop="caseDec">
@@ -54,7 +54,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['casefile:violationCaseFile:add']"
-          
+
           v-if="checkPer(['intelligencecontrols.messagemanage.enter'])"
         >违规案卷录入</el-button>
       </el-col>
@@ -174,7 +174,9 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="违规对象" prop="projectName">
-                <el-select v-model="form.projectName" :filterable="true" :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;">
+                <el-select v-model="form.projectName" :filterable="true"
+                :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;"
+                 :filter-method="getRemoteDate">
                   <el-option v-for="item in projectNameList" :key="item.name" :label="item.name" :value="item.name"></el-option>
                 </el-select>
             </el-form-item>
@@ -183,7 +185,9 @@
         <el-row :gutter="2">
           <el-col :span="11">
             <el-form-item label="公司" prop="companyName">
-              <el-select v-model="form.companyName" :filterable="true" :remote-method="companyLoadOptions" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;">
+              <el-select v-model="form.companyName" :filterable="true"
+              :filter-method="getCompanys" :loading="isLoadingCompany"
+              placeholder="请输入项目名称" style="width: 100%;">
                 <el-option v-for="item in companyList" :key="item.name" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
@@ -177,7 +177,8 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="企业名称" prop="companyName">
-              <el-select v-model="form.companyName" :filterable="true" :remote-method="companyLoadOptions" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;">
+              <el-select v-model="form.companyName" :filterable="true"
+              :filter-method="getCompanys" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;">
                 <el-option v-for="item in companyList" :key="item.name" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
@@ -134,7 +134,7 @@
           <editor v-model="form.numberOfVehicles" :min-height="192"/>
         </el-form-item>
  
-        <el-form-item label="平台各类预警值息(案卷情况)" prop="numberOfVehicles">
+        <el-form-item label="平台各类预警值信息(案卷情况)" prop="numberOfVehicles">
           <editor v-model="form.caseFileInfo" :min-height="192"/>
         </el-form-item>
  
@@ -184,8 +184,8 @@
            </el-row>
            <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
                  <el-col :span="4"> <p >3</p></el-col>
-                 <el-col :span="6" class="bd_left bd_right"> <p >平台各类预警值息(案卷情况)</p></el-col>
-                 <el-col :span="14"> <editor v-model="form.consumptionSiteSituation" disabled/></el-col>
+                 <el-col :span="6" class="bd_left bd_right"> <p >平台各类预警值信息(案卷情况)</p></el-col>
+                 <el-col :span="14"> <editor v-model="form.caseFileInfo" disabled/></el-col>
            </el-row>
            <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
                  <el-col :span="4"> <p >4</p></el-col>
@@ -206,7 +206,7 @@
            <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
                  <el-col :span="4"> <p >7</p></el-col>
                  <el-col :span="6" class="bd_left bd_right"> <p >突发事件处置等其他情况</p></el-col>
-                 <el-col :span="14"> <editor v-model="form.desc2" disabled/></el-col>
+                 <el-col :span="14"> <editor v-model="form.desc3" disabled/></el-col>
            </el-row>
  
          <div slot="footer" class="dialog-footer" >
@@ -95,8 +95,8 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
-          <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 v-model="form.siteName" placeholder="请选择类型" allow-create  filterable @change="getSite(item)">
+              <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" />
           </el-select>
         </el-form-item>
         <el-form-item label="问题描述" prop="caseDec">
@@ -71,27 +71,26 @@ import store from &quot;@/store&quot;;
           id = this.businessKey;
         }
  
-        let http = "http://183.66.242.6:14601";
+        let http = this.remoteFrame;
  
         if(this.businessType == 0){
-          this.src = http + "/single/#/enterprise-information/information-detail?id=" + id;
+          this.src = http + "/h5/#/enterpriseInfo?enterpriseId=" + id;
         }
         if(this.businessType == 1){
-          this.src = http + "/single/#/vehicleInformation/information-detail?id=" + id;
+          this.src = http + "/h5/#/vehicleDetail?id=" + id;
         }
         if(this.businessType == 2){
-          this.src = http + "/single/#/constructionInfo/detail?id="+id+"&type=detail";
+          this.src = http + "/h5/#/constructionInfo?id="+id;
         }
         if(this.businessType == 3){
-          this.src = http + "/single/#/absorptionsitedetail?absorptionId=" + id;
+          this.src = http + "/h5/#/digestionSite?digestionId=" + id;
         }
         if(this.businessType == 4){
-          this.src = http + "/single/#/contractInfo/detail?id=" + id;
+          this.src = http + "/h5/#/contractDetail?id=" + id;
         }
         if(this.businessType == 5){
-          this.src = http + "/single/#/driverdetail?driverId=" + id;
+          this.src = http + "/h5/#/driverDetail?id=" + id;
         }
-
     },
  
   }
@@ -52,12 +52,32 @@
         <el-row el-row style="margin-top: 20px;">
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
+            <el-image v-for="item in slides[0]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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.sub_img0" type="hidden"></el-input>
             <p v-for="img in form.sub_img0">{{img.split(":")[0]}}<a @click="removeImage(0,img)" style="color:red"> x</a>
             </p>
           </el-col>
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
+            <el-image v-for="item in slides[1]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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.sub_img1" type="hidden"></el-input>
             <p v-for="img in form.sub_img1">{{img.split(":")[0]}}<a @click="removeImage(1,img)" style="color:red"> x</a>
             </p>
@@ -66,12 +86,32 @@
           <el-row>
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">照明照片</a>
+            <el-image v-for="item in slides[2]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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.sub_img2" type="hidden"></el-input>
             <p v-for="img in form.sub_img2">{{img.split(":")[0]}}<a @click="removeImage(2,img)" style="color:red"> x</a>
             </p>
           </el-col>
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
+            <el-image v-for="item in slides[3]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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.sub_img3" type="hidden"></el-input>
             <p v-for="img in form.sub_img3">{{img.split(":")[0]}}<a @click="removeImage(3,img)" style="color:red"> x</a>
             </p>
@@ -81,6 +121,16 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
             <el-input v-model="form.sub_img4" type="hidden"></el-input>
+            <el-image v-for="item in slides[4]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img4">{{img.split(":")[0]}}<a @click="removeImage(4,img)" style="color:red"> x</a>
             </p>
           </el-col>
@@ -88,6 +138,16 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">摄像头视频截图1</a>
             <el-input v-model="form.sub_img5" type="hidden"></el-input>
+            <el-image v-for="item in slides[5]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img5">{{img.split(":")[0]}}<a @click="removeImage(5,img)" style="color:red"> x</a>
             </p>
           </el-col>
@@ -96,12 +156,32 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">摄像头视频截图2</a>
             <el-input v-model="form.sub_img6" type="hidden"></el-input>
+            <el-image v-for="item in slides[6]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img6">{{img.split(":")[0]}}<a @click="removeImage(6,img)" style="color:red"> x</a>
             </p>
           </el-col>
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">摄像头视频截图3</a>
             <el-input v-model="form.sub_img7" type="hidden"></el-input>
+            <el-image v-for="item in slides[7]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img7">{{img.split(":")[0]}}<a @click="removeImage(7,img)" style="color:red"> x</a>
             </p>
           </el-col>
@@ -110,6 +190,16 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(8)">其他1</a>
             <el-input v-model="form.sub_img8" type="hidden"></el-input>
+            <el-image v-for="item in slides[8]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img8">{{img.split(":")[0]}}<a @click="removeImage(8,img)" style="color:red"> x</a>
             </p>
           </el-col>
@@ -117,6 +207,16 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(9)">其他2</a>
             <el-input v-model="form.sub_img9" type="hidden"></el-input>
+            <el-image v-for="item in slides[9]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img9">{{img.split(":")[0]}}<a @click="removeImage(9,img)" style="color:red"> x</a>
             </p>
           </el-col>
@@ -125,6 +225,16 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(10)">其他3</a>
             <el-input v-model="form.sub_img10" type="hidden"></el-input>
+            <el-image v-for="item in slides[10]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img10">{{img.split(":")[0]}}<a @click="removeImage(10,img)" style="color:red">
                 x</a>
             </p>
@@ -132,6 +242,16 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(11)">其他4</a>
             <el-input v-model="form.sub_img11" type="hidden"></el-input>
+            <el-image v-for="item in slides[11]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img11">{{img.split(":")[0]}}<a @click="removeImage(11,img)" style="color:red">
                 x</a>
             </p>
@@ -140,6 +260,16 @@
           <el-col :span="12">
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(12)">其他5</a>
             <el-input v-model="form.sub_img12" type="hidden"></el-input>
+            <el-image v-for="item in slides[12]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :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>
             <p v-for="img in form.sub_img12">{{img.split(":")[0]}}<a @click="removeImage(12,img)" style="color:red">
                 x</a>
             </p>
@@ -292,7 +422,27 @@
   <!--  线下案卷交办  -->
   <el-dialog :title="title" :visible.sync="caseOffline" width="300px" append-to-body :close-on-click-modal="false">
     <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
-    <el-input v-model="form.advice" placeholder="请填写审批意见" type="textarea" :rows="3"/>
+    <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
+    </el-input>
+    <el-upload multiple :headers="upload.headers" :action="upload.url"
+               accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
+               :show-file-list="false"
+               :on-success="uploadSuccess1" :before-upload="beforeUpload">
+      <el-button size="small" type="primary">选择附件</el-button>
+      <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
+    </el-upload>
+    <el-image v-for="item in slides1"
+              style="width: 150px; height: 100px; margin: 5px;"
+              :src="item.url"
+              :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 videoSrc1">
+      <video width="100%" controls="controls" height="100%" :src="item.url"></video>
+    </div>
+    <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
+      @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
     <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>
@@ -302,23 +452,28 @@
   <!--  平台违规信息  -->
   <el-dialog :title="title" :visible.sync="violationCaseFile" width="300px" append-to-body :close-on-click-modal="false">
     <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
-    <el-form v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员' && violationCaseFile" :rules="rules" label-width="120px" >
-      <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
-      </el-input>
-      <el-upload
-        list-type="picture"
-        action=''
-        accept=".jpg, .png , .bmp"
-        :limit="1"
-        :auto-upload="false"
-        :file-list="form.replyImg"
-        :on-change="getFile"
-        :on-preview="handlePictureCardPreview"
-        :on-remove="handleUploadRemove"
-      >
-        <el-button size="small" type="primary" @click="uploadimg" v-if="form.replyImg == null">选择图片上传</el-button>
-        <div slot="tip" class="el-upload__tip" v-if="form.replyImg== null">只能上传一张图片文件</div>
-      </el-upload>
+    <el-form  label-width="120px" >
+        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
+        </el-input>
+        <el-upload multiple :headers="upload.headers" :action="upload.url"
+                   accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
+                   :show-file-list="false"
+                   :on-success="uploadSuccess1" :before-upload="beforeUpload">
+          <el-button size="small" type="primary">选择附件</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
+        </el-upload>
+        <el-image v-for="item in slides1"
+                  style="width: 150px; height: 100px; margin: 5px;"
+                  :src="item.url"
+                  :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 videoSrc1">
+          <video width="100%" controls="controls" height="100%" :src="item.url"></video>
+        </div>
+        <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
+          @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
  
     </el-form>
  
@@ -332,23 +487,28 @@
   <!--  违规预警信息  -->
   <el-dialog :title="title" :visible.sync="violationCaseFile1" width="300px" append-to-body :close-on-click-modal="false">
     <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
-    <el-form v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员' && violationCaseFile1" :rules="rules" label-width="120px" >
-      <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
-      </el-input>
-      <el-upload
-        list-type="picture"
-        action=''
-        accept=".jpg, .png , .bmp"
-        :limit="1"
-        :auto-upload="false"
-        :file-list="form.replyImg"
-        :on-change="getFile"
-        :on-preview="handlePictureCardPreview"
-        :on-remove="handleUploadRemove"
-      >
-        <el-button size="small" type="primary" @click="uploadimg" v-if="form.replyImg == null">选择图片上传</el-button>
-        <div slot="tip" class="el-upload__tip" v-if="form.replyImg== null">只能上传一张图片文件</div>
-      </el-upload>
+    <el-form label-width="120px" >
+     <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
+     </el-input>
+     <el-upload multiple :headers="upload.headers" :action="upload.url"
+                accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
+                :show-file-list="false"
+                :on-success="uploadSuccess1" :before-upload="beforeUpload">
+       <el-button size="small" type="primary">选择附件</el-button>
+       <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
+     </el-upload>
+     <el-image v-for="item in slides1"
+               style="width: 150px; height: 100px; margin: 5px;"
+               :src="item.url"
+               :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 videoSrc1">
+       <video width="100%" controls="controls" height="100%" :src="item.url"></video>
+     </div>
+     <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
+       @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
  
     </el-form>
  
@@ -373,9 +533,9 @@
        <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"/>
@@ -432,9 +592,11 @@
 import {
   listTask,
   formDataShow,
-  formDataSave
+  formDataSave,
 } from "@/api/activiti/task";
  
+import {historyFromData} from '@/api/activiti/historyFormdata'
+
  
 import {getSignByObjId, addSign, updateSign} from "@/api/sign/sign";
  
@@ -461,7 +623,7 @@ import {updateHandleAffairs} from &quot;@/api/office/handle&quot;;
 import Treeselect from "@riophae/vue-treeselect";
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
  
-import pagination from '../Pagination';
+import h5Page from '@/views/h5/Pagination';
  
 import threestepInfo from "@/views/h5/task/threestepInfo";
 import taskCard from "@/views/h5/task/taskCard";
@@ -476,7 +638,7 @@ import caseOfflineInfo from &quot;@/views/h5/caseOffline/caseOfflineInfo&quot;;
 import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
 import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
 import supervisionInfo from "@/views/h5/task/SupervisionInfo";
-import companyInfo from "@/views/activiti/task/companyInfo";
+import companyInfo from "@/views/h5/task/companyInfo";
 import driverInfo from "@/views/activiti/task/driverInfo";
 import vehicleInfo from "@/views/activiti/task/vehicleInfo";
  
@@ -500,7 +662,7 @@ export default {
     companyInfo,
     driverInfo,
     vehicleInfo,
-    pagination,
+    h5Page
   },
   data() {
     return {
@@ -588,9 +750,18 @@ export default {
       usersName: [],
       deptName:null,
  
+      slides: [],
+      slidesArys: [],
+      videos:[],
       company:false,
       driver:false,
       vehicle:false,
+      hisfromData:[],
+
+      slides: [],
+      slidesArys: [],
+      slides1: [],
+      videoSrc1: [],
     };
   },
   created() {
@@ -614,40 +785,114 @@ export default {
       this.fileList = [];
     },
     removeImage(index, img) {
-      let target = "sub_img" + this.picIndex;
-      this.form[target].splice(this.form[target].indexOf(img), 1);
+     if(this.slides[index]){
+       for(let i=0;i<this.slides[index].length;i++){
+         if(this.slides[index][i].alt == img){
+           this.slides[index].splice(i,1);
+         }
+       }
+     }
+     if(this.videos[index]){
+       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 = "sub_img" + index;
+     this.form[target].splice(this.form[target].indexOf(img), 1);
+     this.$forceUpdate();
     },
     uploadSuccess(res, file, fileList) {
-		if(res.code){
-			this.$message(res.message);
-			return;
+      debugger;
+		if (res.code) {
+		  this.$message(res.message);
+		  return;
 		}
-      let target = "sub_img" + this.picIndex;
-      if (!this.form[target]) {
-        this.form[target] = [];
-      }
+
+		  let target = "sub_img" + this.picIndex;
+
+		  if (!this.form[target]) {
+		    this.form[target] = [];
+		  }
+
       this.form[target].push(file.name + ':' + res);
  
+      if(file.name.indexOf('.jpg') > -1 ||file.name.indexOf('.png') > -1){
+        let url = URL.createObjectURL(file.raw)
+        if(!this.slides[this.picIndex]){
+          this.slides[this.picIndex] = [];
+        }
+
+        this.slides[this.picIndex].push({
+          url:url,
+          alt:res
+        })
+      }
+      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
+        });
+      }
+
+      this.$forceUpdate();
     },
     showFileUpload(i) {
       this.uploadImageDialog = true;
       this.picIndex = i;
     },
-    beforeUpload(file) {
-      let isRightSize = file.size / 1024 / 1024 < 20
-      if (!isRightSize) {
-        this.$message.error('文件大小超过 20MB')
-        return isRightSize;
+    uploadSuccess1(res, file, fileList) {
+      if (res.code) {
+        this.$message(res.message);
+        return;
       }
-      let isAccept = false;
-      if (file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file
-        .name.indexOf('.pdf') > -1) {
-        isAccept = true;
+      if (!this.form.replyImg) {
+        this.form.replyImg = [];
       }
-      if (!isAccept) {
-        this.$message.error('应该选择PDF、JPG、WORD类型的文件')
-        return isAccept;
+      this.form.replyImg.push(res);
+      if (file.name.indexOf('.jpg') > -1 || file.name.indexOf('.png') > -1 || file.name.indexOf('.gif') > -1 || file.name.indexOf('.jpeg') > -1) {
+        let url = URL.createObjectURL(file.raw)
+        this.slides1.push({
+          url: url,
+          alt: res
+        })
+      }
+      if (file.name.indexOf('.avi') > -1 || file.name.indexOf('.mp4') > -1) {
+        let url = URL.createObjectURL(file.raw)
+        this.videoSrc1.push({
+          url: url,
+          alt: res
+        });
       }
+      this.$forceUpdate();
+    },
+    beforeUpload(file) {
+     let isRightSize = file.size / 1024 / 1024 < 20
+     if (!isRightSize) {
+       this.$message.error('文件大小超过 20MB')
+       return isRightSize;
+     }
+
+     let isAccept = false;
+     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、MP4,AVI,WORD类型的文件')
+       return isAccept;
+     }
+
     },
     getList() {
       this.reset();
@@ -677,6 +922,8 @@ export default {
       this.company=false;
       this.driver=false;
       this.vehicle=false;
+
+
       this.reset();
     },
     // 表单重置
@@ -686,6 +933,9 @@ export default {
         this.form = {
           formData: [],
         };
+        this.videoSrc1 = [];
+        this.slides1 = [];
+
       this.resetForm("form");
     },
     showTask(row, idx) {
@@ -694,6 +944,15 @@ export default {
       this.businessKey = row.businessKey;
       this.id = row.id;
       this.taskName = row.name;
+      historyFromData(this.businessKey).then(response => {
+        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 = []
@@ -806,7 +1065,7 @@ export default {
  
     /** 提交按钮 */
     submitForm(formid, value) {
-      this.form.formData[0].controlValue = value;
+this.form.formData[0].controlValue = value;
       this.form.formData[0].controlId = formid;
       this.form.id = this.businessKey.split(":")[1];
       if (this.form.formData[0].controlValue == 0) {
@@ -828,7 +1087,7 @@ export default {
           }
         }
  
-        if (this.form.status == 1 ) {
+        if (this.form.status == 1) {
           activeThreestep(this.form).then(res => {
             formDataSave(this.id, this.form.formData).then(response => {
               this.msgSuccess("审批成功");
@@ -838,12 +1097,12 @@ export default {
             });
           });
         } else {
-            formDataSave(this.id, this.form.formData).then(response => {
-              this.msgSuccess("审批成功");
-              this.open2 = false;
-              this.taskList = [];
-              this.getList();
-            });
+          formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.open2 = false;
+            this.taskList = [];
+            this.getList();
+          });
         }
         return;
       }
@@ -854,18 +1113,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 => {
@@ -903,6 +1172,24 @@ export default {
         });
       }
       if (this.definitionKey == "workflow_caseoffline") {
+
+        let postData = {};
+
+        postData.tableName = this.businessKey;
+        postData.replyImg = this.form.replyImg + "";
+        postData.reply = this.form.reply;
+        if(postData.reply==null || postData.reply==""){
+          if(value==0){
+            postData.reply = "通过";
+          }else{
+            postData.reply = "驳回";
+          }
+        }
+
+        addReplyApprovalProcess(postData).then(res => {
+          this.videoSrc1 = [];
+          this.slides1 = [];
+        });
         let id = this.businessKey.split(":")[1];
         let query = {
           id: id,
@@ -935,113 +1222,79 @@ export default {
             this.getList();
           });
         })
-
-
         return;
       }
  
-
-      if (this.definitionKey == "workflow_caseoffline") {
-        let id = this.businessKey.split(":")[1];
-        let query = {
-          id: id,
-        };
-        let adv = this.form.advice;
-        if (!adv) {
-          if (value == 0) {
-            adv = "审批通过";
-          } else {
-            adv = "审批驳回";
+      if (this.definitionKey == "workflow_casefile") {
+        let postData = {};
+
+        postData.tableName = this.businessKey;
+        postData.replyImg = this.form.replyImg + "";
+        postData.reply = this.form.reply;
+        if(postData.reply==null || postData.reply==""){
+          if(value==0){
+            postData.reply = "通过";
+          }else{
+            postData.reply = "驳回";
           }
         }
-        if (this.taskName == "渣土办科员") {
-          query.advice1 = adv;
-        } else if (this.taskName == "渣土办分管领导") {
-          query.advice2 = adv;
-        } else if (this.taskName == "治理部部长") {
-          query.advice3 = adv;
-        } else if (this.taskName == "治理部分管领导") {
-          query.advice4 = adv;
-        }
-        updateCaseOffline(query).then(res => {
-          formDataSave(this.id, this.form.formData).then(response => {
-            this.msgSuccess("审批成功");
-            this.caseOffline = false;
-            this.getList();
-          });
-        })
-        return;
-      }
-      if (this.definitionKey == "workflow_casefile") {
-
         if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
           console.log(this.businessKey);
           let objId = this.businessKey.split(":")[1];
           updateViolationCaseFileReader({id: objId}).then(res => {
-            formDataSave(this.id, this.form.formData).then(response => {
-              this.msgSuccess("审批成功");
-              this.violationCaseFile = false;
-              this.getList();
-            });
           })
-          return;
-        } else {
-            let postData = {};
-
-            postData.tableName = this.businessKey;
-            postData.replyImg = this.form.replyImg;
-            postData.reply = this.form.reply;
-            addReplyApprovalProcess(postData).then(res => {
-              formDataSave(this.id, this.form.formData).then(response => {
-                this.msgSuccess("审批成功");
-                this.violationCaseFile = false;
-                this.getList();
-              });
-            });
-
         }
+        addReplyApprovalProcess(postData).then(res => {
+          this.videoSrc1 = [];
+          this.slides1 = [];
+          formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.violationCaseFile = false;
+            this.getList();
+          });
+        });
       }
       if (this.definitionKey == "violation_warning") {
+        let postData = {};
+        postData.tableName = this.businessKey;
+        postData.replyImg = this.form.replyImg + "";
+        postData.reply = this.form.reply;
+        if(postData.reply==null || postData.reply==""){
+          if(value==0){
+            postData.reply = "通过";
+          }else{
+            postData.reply = "驳回";
+          }
+        }
+
+
         if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
-          console.log(this.businessKey);
           let objId = this.businessKey.split(":")[1];
           updateViolationCaseFileReader1({id: objId}).then(res => {
-            formDataSave(this.id, this.form.formData).then(response => {
-              this.msgSuccess("审批成功");
-              this.violationCaseFile1 = false;
-              this.getList();
-            });
           })
-          return;
-        } else {
-
-            let postData = {};
-            postData.tableName = this.businessKey;
-            postData.replyImg = this.form.replyImg;
-            postData.reply = this.form.reply;
-            addReplyApprovalProcess(postData).then(res => {
-              formDataSave(this.id, this.form.formData).then(response => {
-                this.msgSuccess("审批成功");
-                this.violationCaseFile1 = false;
-                this.getList();
-              });
-            });
-
-
         }
+        addReplyApprovalProcess(postData).then(res => {
+          this.videoSrc1 = [];
+          this.slides1 = [];
+          formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.violationCaseFile1 = false;
+            this.getList();
+          });
+        });
       }
  
-      if(this.definitionKey.indexOf("supervision")>-1){
+      if (this.definitionKey.indexOf("supervision") > -1) {
         formDataSave(this.id, this.form.formData).then(response => {
           this.msgSuccess("审批成功");
           this.supervisionOpen = false;
           this.getList();
         });
       }
-      if(this.definitionKey  == "workflow_company" ||
-        this.definitionKey  == "workflow_driver" ||
-        this.definitionKey  == "workflow_vehicle" ||
-        this.definitionKey == "workflow_constructsite_edit"){
+      if (this.definitionKey == "workflow_company" ||
+        this.definitionKey == "workflow_driver" ||
+        this.definitionKey == "workflow_vehicle" ||
+        this.definitionKey == "workflow_constructsite_edit") {
         formDataSave(this.id, this.form.formData).then(response => {
           this.msgSuccess("审批成功");
           this.cancel();
@@ -1064,6 +1317,9 @@ export default {
         this.getList();
       });
     },
+    downloadFile(path) {
+      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
+    },
     leaveApplicationSubmitForm(value) {
       if (value == 0) {
         this.form.status = 1;
 <template>
    <a @click="sendToParent(task)"><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>
+    <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">
       <div class="card_title">{{task.instanceName}}</div>
@@ -79,7 +79,7 @@
     <el-row>
       <el-col :offset="3"><el-button type="primary" @click="open = true">查看附件({{fileEntityList.length}})</el-button></el-col>
     </el-row>
-    <el-table :data="replyApprovalProcessList" v-if="entryType==0">
+    <el-table :data="replyApprovalProcessList" >
       <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
       <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
       <el-table-column property="replyTime" label="操作时间" header-align="center" align="center"></el-table-column>
@@ -90,6 +90,7 @@
             type="text"
             icon="el-icon-view"
             @click="openImage(scope.row.replyImg)"
+            v-if="scope.row.replyImg!=null && scope.row.replyImg!='undefined'"
             v-hasPermi="['casefile:violationWarningInformation:view']"
           >查看</el-button>
         </template>
@@ -124,12 +125,20 @@
         <el-button @click="open = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0" width="300px">
-      <el-image style="width: 250px; height: 250px; margin: 5px;"
-                :src="img[0]"
-                :preview-src-list="img"
-                :z-index="2000">
-      </el-image>
+    <el-dialog title="预览" :visible.sync="openImg" append-to-body width="300px">
+      <div v-for="item in img" style="border: 1px black solid;text-align: center;">
+
+        <el-image style="width: 250px; height: 250px; margin: 5px;"
+                  v-if="item.indexOf('.jpg')>-1||item.indexOf('.png')>-1||item.indexOf('.jpeg')>-1||item.indexOf('.gif')>-1"
+                  :src="showFile(item)"
+                  :preview-src-list="[showFile(item)]"
+                  :z-index="2000">
+        </el-image>
+        <div style="display: inline-block;margin: 5px;position: relative; width: 250px;height: 250px;overflow:hidden;" v-if="item.indexOf('.mp4')>-1||item.indexOf('.avi')>-1">
+          <video width="100%" controls="controls" height="100%" :src="showFile(item)"></video>
+        </div>
+        <a @click="downloadFile(item);" style="color: blue;"> 下载: {{ item.split("/")[item.split("/").length - 1] }}  </a>
+      </div>
     </el-dialog>
  
   </el-form>
@@ -138,6 +147,7 @@
 <script>
 import {getViolationCaseFile} from "@/api/casefile/violationCaseFile";
 import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+
 export default {
   name: "violationWarningInformationInfo",
   props: {
@@ -156,9 +166,9 @@ export default {
       form: {},
       fileEntityList: [],
       open: false,
-      replyApprovalProcessList:[],
-      openImg:false,
-      img:null,
+      replyApprovalProcessList: [],
+      openImg: false,
+      img: [],
       showPic: null,
       picImage: null,
       slide1: [],
@@ -168,19 +178,17 @@ export default {
   created() {
     let id = this.idInfo.split(":");
  
-    if(id.length == 2){
+    if (id.length == 2) {
       this.idInfo = id[1];
-    }else{
+    } else {
       this.idInfo = id;
     }
  
  
-
-
     this.init();
   },
-  methods:{
-    init(){
+  methods: {
+    init() {
       getViolationCaseFile(this.idInfo).then(response => {
         this.form = response.data.violationCaseFile;
         let files = JSON.stringify(response.data.uploadFiles);
@@ -196,7 +204,7 @@ export default {
       });
  
  
-      listReplyApprovalProcess({tableName:"workflow_casefile" + ":" +  this.idInfo}).then(response => {
+      listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
         this.replyApprovalProcessList = response.rows;
       });
     },
@@ -210,10 +218,20 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
       a.click()
     },
-    openImage(img) {
+    openImage(path) {
+      debugger;
       this.img = [];
       this.openImg = true;
-      this.img.push(img);
+      let files = path.split(",");
+      for(let i=0;i<files.length;i++){
+        this.img.push(files[i]);
+      }
+    },
+    downloadFile(path) {
+      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
+    },
+    showFile(path) {
+      return process.env.VUE_APP_BASE_API + path;
     },
   }
 }
@@ -75,7 +75,7 @@
     </el-form-item>
         <el-button type="primary" @click="open = true">查看附件({{ fileEntityList.length }})</el-button>
  
-    <el-table :data="replyApprovalProcessList" v-if="entryType==0">
+    <el-table :data="replyApprovalProcessList" >
       <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
       <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
       <el-table-column property="replyTime" label="操作时间" header-align="center" align="center"></el-table-column>
@@ -120,12 +120,20 @@
         <el-button @click="open = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0" width="300px">
-      <el-image style="width: 250px; height: 250px; margin: 5px;"
-                :src="img[0]"
-                :preview-src-list="img"
-                :z-index="2000">
-      </el-image>
+    <el-dialog title="预览" :visible.sync="openImg" append-to-body width="300px">
+      <div v-for="item in img" style="border: 1px black solid;text-align: center;">
+      
+        <el-image style="width: 250px; height: 250px; margin: 5px;"
+                  v-if="item.indexOf('.jpg')>-1||item.indexOf('.png')>-1||item.indexOf('.jpeg')>-1||item.indexOf('.gif')>-1"
+                  :src="showFile(item)"
+                  :preview-src-list="[showFile(item)]"
+                  :z-index="2000">
+        </el-image>
+        <div style="display: inline-block;margin: 5px;position: relative; width: 250px;height: 250px;overflow:hidden;" v-if="item.indexOf('.mp4')>-1||item.indexOf('.avi')>-1">
+          <video width="100%" controls="controls" height="100%" :src="showFile(item)"></video>
+        </div>
+        <a @click="downloadFile(item);" style="color: blue;"> 下载: {{ item.split("/")[item.split("/").length - 1] }}  </a>
+      </div>
     </el-dialog>
   </el-form>
 </template>
@@ -133,6 +141,7 @@
 <script>
 import {getViolationWarningInformation} from "@/api/casefile/violationWarningInformation";
 import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+
 export default {
   name: "violationWarningInformationInfo",
   props: {
@@ -150,10 +159,10 @@ export default {
     return {
       form: {},
       fileEntityList: [],
-      open:false,
-      replyApprovalProcessList:[],
-      openImg:false,
-      img:null,
+      open: false,
+      replyApprovalProcessList: [],
+      openImg: false,
+      img: [],
       showPic: null,
       picImage: null,
       slide1: [],
@@ -163,9 +172,9 @@ export default {
   created() {
     let id = this.idInfo.split(":");
  
-    if(id.length == 2){
+    if (id.length == 2) {
       this.idInfo = id[1];
-    }else{
+    } else {
       this.idInfo = id;
     }
     this.init();
@@ -185,7 +194,7 @@ export default {
           }
         })
       });
-      listReplyApprovalProcess({tableName:"violation_warning" + ":" +  this.idInfo}).then(response => {
+      listReplyApprovalProcess({tableName: "violation_warning" + ":" + this.idInfo}).then(response => {
         this.replyApprovalProcessList = response.rows;
       });
     },
@@ -199,15 +208,23 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
       a.click()
     },
-    openImage(base64){
+    openImage(path) {
       this.img = [];
       this.openImg = true;
-      this.img.push(img);
-    }
+      let files = path.split(",");
+      for(let i=0;i<files.length;i++){
+        this.img.push(files[i]);
+      }
+    },
+    downloadFile(path) {
+      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
+    },
+    showFile(path) {
+      return process.env.VUE_APP_BASE_API + path;
+    },
   }
 }
 </script>
-
 <style scoped>
  
 </style>
@@ -77,12 +77,12 @@
  
     <!--  平台违规信息  -->
     <el-dialog :title="title" :visible.sync="violationCaseFile" width="300px" append-to-body :close-on-click-modal="false">
-      <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
+      <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile" :entryType="0"/>
     </el-dialog>
  
     <!--  违规预警信息  -->
     <el-dialog :title="title" :visible.sync="violationCaseFile1" width="300px" append-to-body :close-on-click-modal="false">
-      <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
+      <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1" :entryType="0"/>
     </el-dialog>
  
   <el-dialog :title="title" :visible.sync="supervisionOpen" width="300px" append-to-body :close-on-click-modal="false">
@@ -90,9 +90,9 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="company" width="300px" 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"/>
         <el-table-column label="审批人" align="center" prop="createName"/>
         <el-table-column label="审批时间" align="center" prop="createTime"/>
@@ -136,7 +136,9 @@
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
  
   import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
-  import pagination from '../Pagination';
+
+
+  import h5Page from '@/views/h5/Pagination';
  
   import threestepInfo from "@/views/h5/task/threestepInfo";
   import taskCard from "@/views/h5/task/taskCard";
@@ -182,7 +184,7 @@
       contractInfo,
       caseOfflineInfo,
       violationCaseFileInfo,
-      pagination,
+      h5Page,
       violationWarningInformationInfo,
       supervisionInfo,
       companyInfo,
@@ -91,15 +91,15 @@
               </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" v-el-select-loadmore="loadMore(rangeNumber)">
-                <el-option v-for="item in remoteData.slice(0, rangeNumber)" :label="item.name"
+              <el-select v-model="form.name" filterable  reserve-keyword @change="getObjId" :filter-method="getObjId">
+                <el-option v-for="item in remoteData" :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="运输企业" prop="companys" v-if="form.type==0">
+            <!-- <el-form-item label="运输企业" prop="companys" v-if="form.type==0">
               <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"
                 />
@@ -107,10 +107,11 @@
             </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-input v-model="truckName" />
+             <el-checkbox-group v-model="form.trucks" style="max-height: 200px;overflow: auto;" @change="checkUpdate">
+               <el-checkbox :label="item.licenseplateNo" v-for="item in truckList"  v-if="(!truckName || item.licenseplateNo.indexOf(truckName) > -1) && form.companys && (form.companys.indexOf(item.companyName) > -1)"/>
              </el-checkbox-group>
-           </el-form-item>
+           </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  />
@@ -95,18 +95,20 @@
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="所属工地" prop="construction">
-          <el-select v-model="form.construction" placeholder="请选择所属工地" @change="getCompany">
+          <el-select v-model="form.construction" placeholder="请选择所属工地" filterable reserve-keyword  @change="getCompany">
             <el-option v-for="item in constList" :label="item.name" :value="item.name" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="所属企业" prop="company">
-            <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck">
-              <el-option v-for="item in companyList" :label="item.name" :value="item.name" />
-            </el-select>
+           <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck">
+             <el-option v-for="item in companyList" :label="item.name" :value="item.name"
+               v-if="!simpleName || item.name.indexOf(simpleName) > -1"
+             />
+           </el-select>
         </el-form-item>
         <el-form-item label="车牌号" prop="licensePlate">
             <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable>
-              <el-option  v-if="!form.company || form.company == item.companyName"
+              <el-option  v-if="(form.company && form.company == item.companyName)"
                         v-for="item in truckList"
                         :label="item.licenseplateNo"
                         :value="item.id"/>
@@ -139,8 +139,9 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="违规对象" prop="projectName">
-              <el-select v-model="form.projectName" :filterable="true"  placeholder="请输入项目名称" style="width: 100%;">
-                <el-option v-for="item in data" :key="item.name" :label="item.name" :value="item.name" @click.native="getObjId(item)"
+              <el-select v-model="form.projectName" :filterable="true"  
+              placeholder="请输入项目名称" style="width: 100%;" @change="getRemoteDate">
+                <el-option v-for="item in data" :key="item.name" :label="item.name" :value="item.name"
                   v-if="form.place == item.areaCode" />
                 </el-select>
             </el-form-item>
@@ -149,7 +150,7 @@
         <el-row :gutter="2">
           <el-col :span="11">
             <el-form-item label="公司" prop="violationGrade">
-              <el-select v-model="form.companyName" placeholder="请选择公司" style="width: 100%;">
+              <el-select v-model="form.companyName" placeholder="请选择公司" style="width: 100%;" :filter-method="getCompanys">
                   <el-option  v-for="item in companyList" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -308,6 +308,8 @@ export default {
         type: null,
         sendPerson: null,
         sendDate:null,
+        orderByColumn:"receiveTime",
+        isAsc:"DESC"
       },
       // 表单参数
       form: {},
@@ -106,7 +106,6 @@ public class SupervisionThreestepController extends BaseController
 	            		}
 	            	}
 	        	}
-	        	
 	        }
         }
  
@@ -252,6 +251,40 @@ public class SupervisionThreestepController extends BaseController
     @PostMapping("/todayDataList")
     public List<SupervisionThreestep> todayDataList(@RequestBody SupervisionThreestep supervisionThreestep)
     {        
+    	
+    	 Map<String, String> map = new HashMap<String, String>();
+         map.put("type", "CSUserDepartmentType");
+         JSONArray depts = RemoteServerUtils.getDict(map);
+         
+         for(Object object :depts){
+         	JSONObject dept = (JSONObject) object;
+         	List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
+         	
+         	for(String role:roles){
+             	if(dept.getString("code").equals(role)){
+             		if(dept.getString("name").contains("渣土办")){
+             			String areaCode = dept.getString("code");
+             			if(!areaCode.isEmpty()){
+             				supervisionThreestep.setPlace(areaCode);
+             				supervisionThreestep.setCreateBy(null);
+             				supervisionThreestep.setType(0L);
+             				supervisionThreestep.setStatus(1L);
+             				
+             				
+             				List<SupervisionThreestep> threesteps = supervisionThreestepService.selectTodayDataList(supervisionThreestep);
+             				
+             		        return supervisionThreestepService.selectTodayDataList(supervisionThreestep);
+             			}
+             		}
+             	}
+         	}
+         }
+      supervisionThreestep.setCompanys(SecurityUtils.getUsername());
+    	
+    	
+         
+         
+    	
         return supervisionThreestepService.selectTodayDataList(supervisionThreestep);
     }
  
 package com.trash.business.controller;
  
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
@@ -19,8 +21,16 @@ import com.trash.common.annotation.Log;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.domain.TruckActivate;
+import com.trash.business.mapper.SupervisionThreestepMapper;
+import com.trash.business.mapper.TruckActivateMapper;
+import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.ITruckActivateService;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
  
@@ -37,6 +47,11 @@ public class TruckActivateController extends BaseController
     @Autowired
     private ITruckActivateService truckActivateService;
  
+    @Autowired
+    private ISupervisionThreestepService threestepService;
+    
+    @Autowired
+    private TruckActivateMapper truckActivateMapper;
     /**
      * 查询车辆激活列表
      */
@@ -44,7 +59,65 @@ public class TruckActivateController extends BaseController
     public TableDataInfo list(TruckActivate truckActivate)
     {
         startPage();
-        List<TruckActivate> list = truckActivateService.selectTruckActivateList(truckActivate);
+        
+        List<TruckActivate> list = new ArrayList<>();
+        
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("type", "CSUserDepartmentType");
+        JSONArray depts = RemoteServerUtils.getDict(map);
+        
+        for(Object object :depts){
+        	JSONObject dept = (JSONObject) object;
+        	List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
+        	
+        	for(String role:roles){
+            	if(dept.getString("code").equals(role)){
+
+//        			if(dept.getString("name").equals("事务中心")){
+//        				list = truckActivateService.selectTruckActivateList(truckActivate);
+//        		        return getDataTable(list);
+//        			}
+            		
+            		if(dept.getString("name").contains("渣土办")){
+            			String areaCode = dept.getString("code");
+            			if(!areaCode.isEmpty()){
+            				SupervisionThreestep supervisionThreestep = new SupervisionThreestep();
+            				supervisionThreestep.setPlace(areaCode);
+            				supervisionThreestep.setCreateBy(null);
+            				supervisionThreestep.setType(0L);
+            				supervisionThreestep.setStatus(1L);
+            				
+            				
+            				List<SupervisionThreestep> threesteps = threestepService.selectTodayDataList(supervisionThreestep);
+            				String names = null;
+            				for(SupervisionThreestep three :threesteps){
+            					if(names == null){
+            						names = three.getName();
+            					}else{
+            						names += "," + three.getName();
+            					}
+            				}
+            				
+            				if(names == null){
+            					return getDataTable(list);
+            				}
+            				
+            				truckActivate.setcIds(names.split(","));
+            				
+            				list = truckActivateMapper.selectTruckActivateListByConstructions(truckActivate);
+            				
+            				return getDataTable(list);
+            				
+            			}
+            		}
+            	}
+        	}
+        }
+        
+        truckActivate.setCompany(SecurityUtils.getUsername());
+
+      
+        list = truckActivateService.selectTruckActivateList(truckActivate);
         return getDataTable(list);
     }
  
@@ -136,11 +209,13 @@ public class TruckActivateController extends BaseController
     public AjaxResult getConractByObjectId(@PathVariable("id") String id)
     {
  
-    	
-    	
     	AjaxResult ajaxResult = AjaxResult.success();
+    	try {
+        	ajaxResult.put("result", truckActivateService.getConractByObjectId(id));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
  
-    	ajaxResult.put("result", truckActivateService.getConractByObjectId(id));
  
  
         return ajaxResult;
@@ -25,6 +25,7 @@ public class TruckActivate extends BaseEntity
     @Excel(name = "工地名称")
     private String construction;
  
+    private String constructionId;
     /** 车牌号
  */
     @Excel(name = "车牌号")
@@ -66,7 +67,27 @@ public class TruckActivate extends BaseEntity
  
     private String activateStatus;
  
-    public String getActivateStatus() {
+    private String[] cIds;
+    
+    
+    
+    public String getConstructionId() {
+		return constructionId;
+	}
+
+	public void setConstructionId(String constructionId) {
+		this.constructionId = constructionId;
+	}
+
+	public String[] getcIds() {
+		return cIds;
+	}
+
+	public void setcIds(String[] cIds) {
+		this.cIds = cIds;
+	}
+
+	public String getActivateStatus() {
 		return activateStatus;
 	}
  
@@ -60,6 +60,8 @@ public interface TruckActivateMapper
      * @return 结果
      */
     public int deleteTruckActivateByIds(Long[] ids);
+    
+    public List<TruckActivate> selectTruckActivateListByConstructions(TruckActivate truckActivate);
  
 	public void endAllTurckUnActive();
  
@@ -25,6 +25,7 @@ import com.trash.business.mapper.TruckActivateMapper;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.ITruckActivateService;
 import com.trash.common.config.trashConfig;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -220,12 +221,22 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			}
 		}
  
-		Map param = new HashMap<>();
  
-		param.put("page", 1);
-		param.put("size", 99999);
-				
-		JSONArray contracts = RemoteServerUtils.getContractList(param);
+		JSONArray contracts = redis.getCacheObject("contractList");
+		
+		if(contracts == null){
+			Map param = new HashMap<>();
+			
+			param.put("page", 1);
+			param.put("size", 99999);
+			param.put("contractStatus", 1);
+			param.put("auditStatus", 1);
+			
+			
+			contracts = RemoteServerUtils.getContractList(param);
+			redis.setCacheObject("contractList",contracts);
+		}
+		
  
 		List<SupervisionThreestep> allList = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep);
  
@@ -290,6 +301,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 							continue;
 						}
  
+						
 						Map<String,String> map = new HashMap<String, String>();
 						map.put("id", s.getId() + "");
 						map.put("createTime", yearFomat.format(s.getCreateTime()));
@@ -398,8 +410,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		 List<Map> list = new ArrayList<>();
  
 		 for(Map m : map){
-			 
-			 
 			if(supervisionThreestep.getType() == 0){
 				JSONObject object = RemoteServerUtils.getConstructionInfo(m.get("id").toString());
  
@@ -791,15 +801,13 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		}
 		return null;
 	}
+	
+	@Autowired
+	RedisCache redis;
  
 	@Override
 	public void updateTodayData(String token){
-		Map param = new HashMap<>();
-		
-		param.put("page", 1);
-		param.put("size", 99999);
-		
-		JSONArray contracts = RemoteServerUtils.getContractList(param,token);
+
  
 		SupervisionThreestep supervisionThreestep = new SupervisionThreestep();
  
@@ -826,48 +834,70 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
  
 			List<SupervisionThreestep> list = supervisionThreestepMapper.selectSupervisionThreestepList(supervisionThreestep);
  
+
+			
+			JSONArray contracts = redis.getCacheObject("contractList");
  
+			if(contracts == null){
+				Map param = new HashMap<>();
+				
+				param.put("page", 1);
+				param.put("size", 99999);
+				param.put("contractStatus", 1);
+				param.put("auditStatus", 1);
+				
+				contracts = RemoteServerUtils.getContractList(param,token);
+				redis.setCacheObject("contractList",contracts);
+			}
  
  
-			for(SupervisionThreestep s: list){
-				String cid = "";
-				String cname = "";
-				String eid = "";
-				String ename = "";
+			
+			
+			if(list.size() > 0){
+				
+			
+				
  
-				for(Object object : contracts){
-					JSONObject jsonObject = (JSONObject) object;
+				
+				for(SupervisionThreestep s: list){
+					String cid = "";
+					String cname = "";
+					String eid = "";
+					String ename = "";
  
-					if(s.getObjectId().equals(jsonObject.getString("constructionSiteID"))){
-						cid += jsonObject.getString("id") + ",";
-						cname += jsonObject.getString("contractNo")+ ",";
-						eid += jsonObject.getString("earthSiteID")+ ",";
-						ename += jsonObject.getString("earthSiteName")+ ",";
+					for(Object object : contracts){
+						JSONObject jsonObject = (JSONObject) object;
+						
+						if(s.getObjectId().equals(jsonObject.getString("constructionSiteID"))){
+							cid += jsonObject.getString("id") + ",";
+							cname += jsonObject.getString("contractNo")+ ",";
+							eid += jsonObject.getString("earthSiteID")+ ",";
+							ename += jsonObject.getString("earthSiteName")+ ",";
+						}
+						
+					}
+					if(cid.length() > 0){
+						cid = cid.substring(0,cid.length()-1);
 					}
+					if(cname.length() > 0){
+						cname = cname.substring(0,cname.length()-1);
+					}
+					if(eid.length() > 0){
+						eid = eid.substring(0,eid.length()-1);
+					}
+					if(ename.length() > 0){
+						ename = ename.substring(0,ename.length()-1);
+					}
+					s.setContractId(cid);
+					s.setContract(cname);
+					s.setEarthsitesId(eid);
+					s.setEarthsitesName(ename);
  
+					supervisionThreestepMapper.updateSupervisionThreestep(s);
 				}
-				if(cid.length() > 0){
-					cid = cid.substring(0,cid.length()-1);
-				}
-				if(cname.length() > 0){
-					cname = cid.substring(0,cname.length()-1);
-				}
-				if(eid.length() > 0){
-					eid = cid.substring(0,eid.length()-1);
-				}
-				if(ename.length() > 0){
-					ename = cid.substring(0,ename.length()-1);
-				}
-				s.setContractId(cid);
-				s.setContract(cname);
-				s.setEarthsitesId(eid);
-				s.setEarthsitesName(ename);
  
-				supervisionThreestepMapper.updateSupervisionThreestep(s);
 			}
  
-			
-			
 	}
  
 	@Override
@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
  
@@ -38,6 +39,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService
  
     @Autowired
     SupervisionThreestepMapper threestepMapper;
+    
+    
     /**
      * 查询车辆激活
      * 
@@ -96,117 +99,135 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 		end += " 4:00:00";
 		start += " 8:00:00";
  
-    	
-        truckActivate.setCreateTime(DateUtils.getNowDate());
-    	
-    	
-    	TruckActivate oldDate = truckActivateMapper.selectTodayTruckByObjId(truckActivate.getObjectId());
-    	
-    	if(oldDate != null){
-    		
-    		SupervisionThreestep threestep = new SupervisionThreestep();
-        	
-        	threestep.setName(oldDate.getConstruction());
-        	threestep.setEarthsitesName(oldDate.getEarthsite());
-        	threestep.setCompanyTrucks(oldDate.getObjectId());
-        	
-    		try {
-    			threestep.setWorkStartTime(DateUtils.parseDate(start));
-    			threestep.setWorkEndTime(DateUtils.parseDate(end));
-    		} catch (Exception e) {
-    			// TODO Auto-generated catch block
-    			e.printStackTrace();
-    		}
-    		
-    		threestep = threestepMapper.selectThreestepByTruckDate(threestep);
-    		
-    		if(threestep == null){
-    			truckActivate.setId(oldDate.getId());
-				return truckActivateMapper.updateTruckActivate(truckActivate);
-    			
-    		}
-    		
-			if(threestep.getName().equals(truckActivate.getConstruction())){
-				truckActivate.setId(oldDate.getId());
-				return truckActivateMapper.updateTruckActivate(truckActivate);
+		String[] objs = truckActivate.getObjectId().split(",");
+		String[] nos = truckActivate.getLicensePlate().split(",");
+		
+		for(int i =0 ;i<objs.length;i++){
+			
+			TruckActivate active = new TruckActivate();
+			
+			active.setObjectId(objs[i]);
+			active.setLicensePlate(nos[i]);
+			active.setConstruction(truckActivate.getConstruction());
+			active.setConstructionId(truckActivate.getConstructionId());
+			active.setEarthsite(truckActivate.getEarthsite());
+			active.setCompany(truckActivate.getCompany());
+//			active.setCreateBy(Secr);
+			
+			active.setCreateTime(DateUtils.getNowDate());
+	    	
+	    	TruckActivate oldDate = truckActivateMapper.selectTodayTruckByObjId(active.getObjectId());
+	    	
+	    	if(oldDate != null){
+	    		
+	    		SupervisionThreestep threestep = new SupervisionThreestep();
+	        	
+	        	threestep.setName(oldDate.getConstruction());
+	        	threestep.setObjectId(oldDate.getConstructionId());
+	        	
+	    		try {
+	    			threestep.setWorkStartTime(DateUtils.parseDate(start));
+	    			threestep.setWorkEndTime(DateUtils.parseDate(end));
+	    		} catch (Exception e) {
+	    			// TODO Auto-generated catch block
+	    			e.printStackTrace();
+	    		}
+	    		
+	    		threestep = threestepMapper.selectThreestepByTruckDate(threestep);
+	    		
+	    		if(threestep == null || threestep.getName().equals(truckActivate.getConstruction())){
+	    			active.setId(oldDate.getId());
+					truckActivateMapper.updateTruckActivate(active);
+	    		}else{
+					Long threeId = threestep.getId();
+					String trucks = threestep.getCompanyTrucks();
+					
+					threestep = new SupervisionThreestep();
+					
+					threestep.setId(threeId);
+					
+					trucks = trucks.replace(oldDate.getObjectId(), "").replace(",,", ",");
+					
+					if(trucks.length() == 1){
+						trucks = "";
+					}
+					
+					threestep.setCompanyTrucks(trucks);
+					
+					//去除已有三查数据的车辆绑定
+					threestepMapper.updateSupervisionThreestep(threestep);
+	    		}
+					
+					//更新绑定的三查数据
+					threestep = new SupervisionThreestep();
+
+		        	threestep.setObjectId(active.getConstructionId());
+			        
+					try {
+						threestep.setWorkStartTime(DateUtils.parseDate(start));
+						threestep.setWorkEndTime(DateUtils.parseDate(end));
+					} catch (Exception e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+
+					threestep = threestepMapper.selectThreestepByTruckDate(threestep);
+					
+					String trucks = threestep.getCompanyTrucks();
+					
+					if(trucks == null || trucks.isEmpty()){
+						trucks = active.getObjectId();
+					}else{
+						if(!trucks.contains(active.getObjectId())){
+							trucks += "," + active.getObjectId();
+						}
+					}
+					
+					threestep.setCompanyTrucks(trucks);
+					
+					threestepMapper.updateSupervisionThreestep(threestep);
+					
+					active.setId(oldDate.getId());//更新已有车辆激活数据
+					
+					truckActivateMapper.updateTruckActivate(active);
+					continue;
 			}else{
-				Long threeId = threestep.getId();
-				String trucks = threestep.getCompanyTrucks();
-				
-				threestep = new SupervisionThreestep();
-				
-				threestep.setId(threeId);
-				
-				trucks = trucks.replace(oldDate.getObjectId(), "").replace(",,", ",");
-				
-				threestep.setCompanyTrucks(trucks);
-				
-				//去除已有三查数据的车辆绑定
-				threestepMapper.updateSupervisionThreestep(threestep);
-				
-				//更新绑定的三查数据
-				threestep = new SupervisionThreestep();
-		        	
-		        threestep.setName(truckActivate.getConstruction());
-		        threestep.setEarthsitesName(truckActivate.getEarthsite());
-				try {
-					threestep.setWorkStartTime(DateUtils.parseDate(start));
-					threestep.setWorkEndTime(DateUtils.parseDate(end));
-				} catch (Exception e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
  
-				threestep = threestepMapper.selectThreestepByTruckDate(threestep);
-				
-				trucks = threestep.getCompanyTrucks();
+	    		SupervisionThreestep threestep = new SupervisionThreestep();
+	        	
+//	        	threestep.setName(truckActivate.getConstruction());
+//		        threestep.setCompanys(truckActivate.getCompany());
+	        	threestep.setObjectId(active.getConstructionId());
+	        	
+	    		try {
+	    			threestep.setWorkStartTime(DateUtils.parseDate(start));
+	    			threestep.setWorkEndTime(DateUtils.parseDate(end));
+	    		} catch (Exception e) {
+	    			// TODO Auto-generated catch block
+	    			e.printStackTrace();
+	    		}
+	    		
+	    		threestep = threestepMapper.selectThreestepByTruckDate(threestep);
+	    		
+	    		String trucks = threestep.getCompanyTrucks();
  
 				if(trucks == null || trucks.isEmpty()){
-					trucks = truckActivate.getObjectId();
+					trucks = active.getObjectId();
 				}else{
-					trucks += "," + truckActivate.getObjectId();
+					trucks += "," + active.getObjectId();
 				}
  
 				threestep.setCompanyTrucks(trucks);
  
 				threestepMapper.updateSupervisionThreestep(threestep);
-				
-				truckActivate.setId(oldDate.getId());//更新已有车辆激活数据
-				
-				return truckActivateMapper.updateTruckActivate(truckActivate);
-			}
-    	}else{
-
-    		SupervisionThreestep threestep = new SupervisionThreestep();
-        	
-        	threestep.setName(truckActivate.getConstruction());
-        	threestep.setEarthsitesName(truckActivate.getEarthsite());
-        	
-    		try {
-    			threestep.setWorkStartTime(DateUtils.parseDate(start));
-    			threestep.setWorkEndTime(DateUtils.parseDate(end));
-    		} catch (Exception e) {
-    			// TODO Auto-generated catch block
-    			e.printStackTrace();
-    		}
-    		
-    		threestep = threestepMapper.selectThreestepByTruckDate(threestep);
-    		
-    		String trucks = threestep.getCompanyTrucks();
-			
-			if(trucks == null || trucks.isEmpty()){
-				trucks = truckActivate.getObjectId();
-			}else{
-				trucks += "," + truckActivate.getObjectId();
-			}
-			
-			threestep.setCompanyTrucks(trucks);
-			
-			threestepMapper.updateSupervisionThreestep(threestep);
-    		
-    		return truckActivateMapper.insertTruckActivate(truckActivate);
-    	}
+	    		
+	    		truckActivateMapper.insertTruckActivate(active);
+				continue;
+	    	}
+		}
  
+        
+    	return objs.length;
  
  
     }
@@ -250,7 +271,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService
         return truckActivateMapper.deleteTruckActivateById(id);
     }
  
-
+    @Autowired
+    RedisCache redis;
+    
     @Override
 	public String getConractByObjectId(String id){
  
@@ -297,13 +320,27 @@ public class TruckActivateServiceImpl implements ITruckActivateService
  
 		List<String> ids =new ArrayList<>();
  
-		ids.add(m.get("object_id"));
+		if(m == null)return null;
  
-		param.put("constructionSiteID", ids);
-		param.put("page", 1);
-		param.put("size", 99999);
  
-		JSONArray array = RemoteServerUtils.getContractList(param);
+		JSONArray contracts = redis.getCacheObject("contractList");
+		
+		if(contracts == null){			
+			param.put("page", 1);
+			param.put("size", 99999);
+			
+			contracts = RemoteServerUtils.getContractList(param);
+			redis.setCacheObject("contractList",contracts);
+		}
+		
+		JSONArray array = new JSONArray();
+		for(Object obj :array){
+			JSONObject jsonObject = (JSONObject)obj;
+			
+			if(m.get("object_id").equals(jsonObject.getString("constructionSiteID"))){
+				array.add(obj);
+			}
+		}
  
 		if(array == null || m.size() == 0){
 			return null;
@@ -325,7 +362,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 			}
 		}
  
-		
+		if(conractIds.length() == 0){
+			return conractIds;
+		}
     	return conractIds.substring(0,conractIds.length()-1);
     }
  
@@ -30,7 +30,7 @@ public class CaseOffline extends BaseEntity
     		+ "车轮带泥,1=未洗车出场或者出场清洁不彻底,2=渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场,"
     		+ "3=非核准车辆进入渣土处置工地运输渣土,4=渣土处置工地未按规定时间开停工,"
     		+ "5=渣土处置工地洗车设施等破损、未正常使用及措施不到位的,6=渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"
-    		+ "7=无许可消纳（工）,8=无许可消纳（消）,9=其他3")
+    		+ "7=无许可消纳（工）,8=无许可消纳（消）,9=使用非专用车辆")
     private String type;
  
  
@@ -57,7 +57,10 @@ public class Consumer {
     RedisCache redisCache;
  
     public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
-
+    	
+    	if(1==1)
+    		return;
+    	
         String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警-未按时间作业",
                 "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
                 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
@@ -47,8 +47,11 @@ public class baseDataListener implements ExecutionListener {
         	if(delegateExecution.getProcessInstanceBusinessKey().contains("driver")){
         		object =  (boolean)RemoteServerUtils.updateDriverAudit(list);
         	}
+        	
+		    log.info("baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1] + "" + object);
+				
 		} catch (Exception e) {
-			// TODO: handle exception
+			e.printStackTrace();
 		}
  
  
@@ -59,30 +62,33 @@ public class baseDataListener implements ExecutionListener {
     			@Override
     			public void run() {
     				while(true){
-    					
-    					boolean object = false;
-    			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("company")){
-    			    		object = (boolean)RemoteServerUtils.updateCompanyAudit(list,token);
-    			    	}
-    			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("vehicle")){
-    			    		object = (boolean)RemoteServerUtils.updateTruckAudit(list,token);
-    			    	}
-    			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("driver")){
-    			    		object = (boolean)RemoteServerUtils.updateDriverAudit(list,token);
-    			    	}
-    			    	
-    			    	
-    			    	if(object){
-    			    		break;
-    			    	}
-    			    	
-    			    	try {
-    				          log.info("baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1] + "" + object);
-    						Thread.sleep(3000);
-    					} catch (InterruptedException e) {
-    						// TODO Auto-generated catch block
+    					try {
+						
+	    					boolean object = false;
+	    			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("company")){
+	    			    		object = (boolean)RemoteServerUtils.updateCompanyAudit(list,token);
+	    			    	}
+	    			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("vehicle")){
+	    			    		object = (boolean)RemoteServerUtils.updateTruckAudit(list,token);
+	    			    	}
+	    			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("driver")){
+	    			    		object = (boolean)RemoteServerUtils.updateDriverAudit(list,token);
+	    			    	}
+	    			    	
+	    			    	try {
+	  				          log.info("baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1] + "" + object);
+		  						Thread.sleep(3000);
+		  					} catch (InterruptedException e) {
+		  						// TODO Auto-generated catch block
+		  						e.printStackTrace();
+		  					}
+	    			    	if(object){
+	    			    		break;
+	    			    	}
+	    			    	
+    					} catch (Exception e) {
     						e.printStackTrace();
-    					}
+						}
  
     				}
  
@@ -84,7 +84,8 @@ public class WorkflowServiceImpl implements IWorkflowService {
  
 	String siteType[] = { "消纳场", "建筑垃圾资源化处置场", "盾构土环保处置场", "盾构土应急消纳场", "回填场" };
  
-	String outArea = "430201,430302,430624,430681";
+	String outArea = "株洲市,湘潭市,汨罗市,湘阴县";
+	
  
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  
@@ -115,12 +116,19 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		String endTime = map.get("endTime").toString();
 		String areaCode = null;
 		int index = 0;
+		JSONArray areas = RemoteServerUtils.getAreas();
 		if (map.get("area") != null){
 			areaCode = map.get("area").toString();
-			
-			if(outArea.contains(areaCode)){
-				index = 1;
+			for(Object obj : areas){
+				JSONObject jsonObject = (JSONObject) obj;
+				if(areaCode.equals(jsonObject.getString("code"))){
+					if(outArea.contains(jsonObject.getString("name"))){
+						index = 1;
+					}
+					break;
+				}
 			}
+			
 		}
  
 		ProcessInstance processInstance = null;
@@ -253,7 +261,11 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		String title = "案卷号:" + caseFile.getNumber();
 		String flowType = "workflow_casefile";
 		try {
-
+			
+			if(caseFile.getOwningRegion().contains("湘江新区")){
+				index += 3;
+			}
+			
 			processInstance = processRuntime
 					.start(ProcessPayloadBuilder.start().withProcessDefinitionKey(flowType).withName(title)
 							.withBusinessKey(flowType + ":" + caseFile.getId()).withVariable("route", index).build());
@@ -304,6 +316,11 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		org.activiti.engine.runtime.ProcessInstance instance = null;
 		String title = "案卷号:" + caseFile.getNumber();
 		String flowType = "violation_warning";
+		
+		if(caseFile.getOwningRegion().contains("湘江新区")){
+			index += 3;
+		}
+		
 		try {
 			Map map = new HashedMap<>();
  
@@ -222,6 +222,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<where>
 			<if test="type != null"> and type = #{type} </if>
 			<if test="objectId != null  and objectId != ''"> and object_id = #{objectId} </if>
+			<if test="companyTrucks != null">
+			and company_trucks like concat('%', #{companyTrucks}, '%')
+			</if>
 			and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
 			and status = 1
 		</where>
@@ -230,11 +233,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  
 	<select id="selectThreestepByTruckDate" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
 		select * from supervision_threestep
-		where name = #{name}
-		and earthsites_name = #{earthsitesName}
-		<if test="companyTrucks != null">
-			and company_trucks like concat('%', #{companyTrucks}, '%')
-		</if>
+		where object_id = #{objectId}
 		and type = 0
 		and status = 1
 		and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
@@ -263,7 +262,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		resultMap="SupervisionThreestepResult">
 		<include refid="selectSupervisionThreestepVo" />
 		<where>
-			<if test="status != null"> status = #{status}</if>
+			<if test="companys != null">and companys like concat('%', #{companys}, '%')</if>
+			<if test="place != null  and place != ''"> and place = #{place}</if>
+			<if test="status != null">and status = #{status}</if>
 			and type = #{type}
 			and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
 		</where>
@@ -10,6 +10,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="licensePlate"    column="license_plate"    />
         <result property="time"    column="time"    />
         <result property="construction"    column="construction"    />
+        <result property="constructionId"    column="construction_id"    />
         <result property="status"    column="status"    />
         <result property="earthsite"    column="earthsite"    />
         <result property="objectId"    column="object_id"    />
@@ -20,7 +21,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
  
     <sql id="selectTruckActivateVo">
-        select id, company, license_plate, time, construction, status, earthsite, object_id, create_by, create_type, activate_time, create_time from truck_activate
+        select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, create_by, create_type, activate_time, create_time from truck_activate
     </sql>
  
     <select id="selectTruckActivateList" parameterType="TruckActivate" resultMap="TruckActivateResult">
@@ -30,6 +31,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="licensePlate != null  and licensePlate != ''"> and license_plate like concat('%', #{licensePlate}, '%')</if>
             <if test="time != null "> and time = #{time}</if>
             <if test="construction != null  and construction != ''"> and construction = #{construction}</if>
+            <if test="constructionId != null  and constructionId != ''"> and construction_id = #{constructionId}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="earthsite != null  and earthsite != ''"> and earthsite = #{earthsite}</if>
             <if test="objectId != null  and objectId != ''"> and object_id = #{objectId}</if>
@@ -42,6 +44,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </where>
     </select>
  
+        <select id="selectTruckActivateListByConstructions" parameterType="TruckActivate" resultMap="TruckActivateResult">
+        <include refid="selectTruckActivateVo"/>
+        <where> construction in 
+	        <foreach item="id" collection="cIds" open="(" separator="," close=")">
+	            #{id}
+	        </foreach>
+	        <if test="activateStatus == 0 "> and activate_time is null</if>
+            <if test="activateStatus == 1 "> and activate_time is not null</if>
+            <if test="status != null "> and status = #{status}</if>
+	    </where>
+    </select>
+    
      <select id="getActivedTruckList" parameterType="TruckActivate" resultMap="TruckActivateResult">
      	select object_id,create_time,activate_time from truck_activate
         <where>    
@@ -97,6 +111,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="licensePlate != null">license_plate,</if>
             <if test="time != null">time,</if>
             <if test="construction != null">construction,</if>
+            <if test="constructionId != null  and constructionId != ''">construction_id,</if>
             <if test="status != null">status,</if>
             <if test="earthsite != null">earthsite,</if>
             <if test="objectId != null">object_id,</if>
@@ -110,6 +125,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="licensePlate != null">#{licensePlate},</if>
             <if test="time != null">#{time},</if>
             <if test="construction != null">#{construction},</if>
+            <if test="constructionId != null  and constructionId != ''"> #{constructionId},</if>
             <if test="status != null">#{status},</if>
             <if test="earthsite != null">#{earthsite},</if>
             <if test="objectId != null">#{objectId},</if>
@@ -127,6 +143,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="licensePlate != null">license_plate = #{licensePlate},</if>
             <if test="time != null">time = #{time},</if>
             <if test="construction != null">construction = #{construction},</if>
+            <if test="constructionId != null  and constructionId != ''"> construction_id = #{constructionId},</if>
             <if test="status != null">status = #{status},</if>
             <if test="earthsite != null">earthsite = #{earthsite},</if>
             <if test="objectId != null">object_id = #{objectId},</if>